[chronojump] Fixed mouse click on Cairo: JumpsRjFatigueGraph



commit 87184092bbef155293f3b00060c40c64830c1747
Author: Xavier de Blas <xaviblas gmail com>
Date:   Tue May 17 10:02:56 2022 +0200

    Fixed mouse click on Cairo: JumpsRjFatigueGraph

 src/gui/app1/jumpsRjFatigue.cs  | 8 +-------
 src/gui/cairo/jumpsRjFatigue.cs | 7 +++++++
 2 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/src/gui/app1/jumpsRjFatigue.cs b/src/gui/app1/jumpsRjFatigue.cs
index 3771fecf3..bf4be7575 100644
--- a/src/gui/app1/jumpsRjFatigue.cs
+++ b/src/gui/app1/jumpsRjFatigue.cs
@@ -211,13 +211,8 @@ public partial class ChronoJumpWindow
 
        private void on_drawingarea_jumps_rj_fatigue_expose_event (object o, ExposeEventArgs args)
        {
-               //needed to have mouse clicks at: on_drawingarea_jumps_rj_fatigue_button_press_event ()
-//             drawingarea_jumps_rj_fatigue.AddEvents((int) (Gdk.EventMask.ButtonPressMask | 
Gdk.EventMask.ButtonReleaseMask));
-               drawingarea_jumps_rj_fatigue.AddEvents((int) Gdk.EventMask.ButtonPressMask);
-
                //createComboSelectJumpsRjFatigueNum (false);
                jumpsRjFatigueDo(false);
-
                //data is calculated on switch page (at notebook_capture_analyze) or on change person
        }
 
@@ -230,9 +225,8 @@ public partial class ChronoJumpWindow
                LogB.Information("Button press done!");
 
                //redo the graph to delete previous rectangles of previous mouse clicks
+               jumpsRjFatigueGraph.PassMouseXY (args.Event.X, args.Event.Y);
                jumpsRjFatigueGraph.Do(preferences.fontType.ToString());
-               LogB.Information(string.Format("Mouse X: {0}; Mouse Y: {1}", args.Event.X, args.Event.Y));
-               jumpsRjFatigueGraph.CalculateAndWriteRealXY(args.Event.X, args.Event.Y);
        }
 
        private void on_button_jumps_rj_fatigue_save_image_clicked (object o, EventArgs args)
diff --git a/src/gui/cairo/jumpsRjFatigue.cs b/src/gui/cairo/jumpsRjFatigue.cs
index 1841484fc..6d60345ed 100644
--- a/src/gui/cairo/jumpsRjFatigue.cs
+++ b/src/gui/cairo/jumpsRjFatigue.cs
@@ -73,6 +73,10 @@ public class JumpsRjFatigueGraph : CairoXY
                        yVariable = heightStr + "/" + tcStr;
                        yUnits = "m/s";
                }
+
+               area.AddEvents((int) Gdk.EventMask.ButtonPressMask); //to have mouse clicks
+               mouseX = -1;
+               mouseY = -1;
        }
 
        public override void Do(string font)
@@ -100,6 +104,9 @@ public class JumpsRjFatigueGraph : CairoXY
                writeTitle();
                addClickableMark(g);
 
+               if(mouseX >= 0 && mouseY >= 0)
+                       calculateAndWriteRealXY ();
+
                endGraphDisposing(g, surface, area.GdkWindow);
        }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]