[chronojump] Fixed mouse click on Cairo: JumpsWeightFVProfileGraph
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Fixed mouse click on Cairo: JumpsWeightFVProfileGraph
- Date: Tue, 17 May 2022 08:08:29 +0000 (UTC)
commit 252dab03f1e1c74a02348125cd30900c668a9cad
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue May 17 10:07:59 2022 +0200
Fixed mouse click on Cairo: JumpsWeightFVProfileGraph
src/gui/app1/jumpsDjOptimalFall.cs | 2 +-
src/gui/app1/jumpsRjFatigue.cs | 2 +-
src/gui/app1/jumpsWeightFVProfile.cs | 7 ++-----
src/gui/cairo/jumpsWeightFVProfile.cs | 7 +++++++
4 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/src/gui/app1/jumpsDjOptimalFall.cs b/src/gui/app1/jumpsDjOptimalFall.cs
index a1c9d3257..1035384a0 100644
--- a/src/gui/app1/jumpsDjOptimalFall.cs
+++ b/src/gui/app1/jumpsDjOptimalFall.cs
@@ -119,7 +119,7 @@ public partial class ChronoJumpWindow
//redo the graph to delete previous rectangles of previous mouse clicks
jumpsDjOptimalFallGraph.PassMouseXY (args.Event.X, args.Event.Y);
- jumpsDjOptimalFallGraph.Do(preferences.fontType.ToString());
+ jumpsDjOptimalFallGraph.Do (preferences.fontType.ToString());
}
private void on_button_jumps_dj_optimal_fall_save_image_clicked (object o, EventArgs args)
diff --git a/src/gui/app1/jumpsRjFatigue.cs b/src/gui/app1/jumpsRjFatigue.cs
index bf4be7575..9cfb472bd 100644
--- a/src/gui/app1/jumpsRjFatigue.cs
+++ b/src/gui/app1/jumpsRjFatigue.cs
@@ -226,7 +226,7 @@ public partial class ChronoJumpWindow
//redo the graph to delete previous rectangles of previous mouse clicks
jumpsRjFatigueGraph.PassMouseXY (args.Event.X, args.Event.Y);
- jumpsRjFatigueGraph.Do(preferences.fontType.ToString());
+ jumpsRjFatigueGraph.Do (preferences.fontType.ToString());
}
private void on_button_jumps_rj_fatigue_save_image_clicked (object o, EventArgs args)
diff --git a/src/gui/app1/jumpsWeightFVProfile.cs b/src/gui/app1/jumpsWeightFVProfile.cs
index ba325e508..e47258b4a 100644
--- a/src/gui/app1/jumpsWeightFVProfile.cs
+++ b/src/gui/app1/jumpsWeightFVProfile.cs
@@ -186,11 +186,8 @@ public partial class ChronoJumpWindow
LogB.Information("Button press done!");
//redo the graph to delete previous rectangles of previous mouse clicks
- jumpsWeightFVProfileGraph.Do(preferences.fontType.ToString());
- LogB.Information(string.Format("Mouse X: {0}; Mouse Y: {1}", args.Event.X, args.Event.Y));
- //LogB.Information(string.Format("Real X: {0}; Real Y: {1}",
- // jumpsWeightFVProfileGraph.CalculateAndWriteRealXY(args.Event.X,
args.Event.Y)));
- jumpsWeightFVProfileGraph.CalculateAndWriteRealXY(args.Event.X, args.Event.Y);
+ jumpsWeightFVProfileGraph.PassMouseXY (args.Event.X, args.Event.Y);
+ jumpsWeightFVProfileGraph.Do (preferences.fontType.ToString());
}
private void on_button_jumps_weight_fv_profile_save_image_clicked (object o, EventArgs args)
diff --git a/src/gui/cairo/jumpsWeightFVProfile.cs b/src/gui/cairo/jumpsWeightFVProfile.cs
index f18de3095..8bc20ed5f 100644
--- a/src/gui/cairo/jumpsWeightFVProfile.cs
+++ b/src/gui/cairo/jumpsWeightFVProfile.cs
@@ -106,6 +106,10 @@ public class JumpsWeightFVProfileGraph : CairoXY
LogB.Information(string.Format("sfvOpt: {0}", jwp.SfvOpt));
LogB.Information(string.Format("f0Opt: {0}, v0Opt: {1}", f0Opt, v0Opt));
LogB.Information(string.Format("Imbalance: {0}", imbalance));
+
+ area.AddEvents((int) Gdk.EventMask.ButtonPressMask); //to have mouse clicks
+ mouseX = -1;
+ mouseY = -1;
}
private void plotError()
@@ -170,6 +174,9 @@ public class JumpsWeightFVProfileGraph : CairoXY
writeTitle();
addClickableMark(g);
+ if(mouseX >= 0 && mouseY >= 0)
+ calculateAndWriteRealXY ();
+
if(errorMessage != ErrorAtStart.ALLOK)
plotError();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]