[chronojump] ForceSensor select AB in light yellow. Feedback in blue

[Xavier de Blas <xaviblas src gnome org>]

commit 0a46edeb0b74d31aad0b66cf53e4ca1e77d1d671
Author: Xavier de Blas <xaviblas gmail com>
Date:   Sun Feb 16 00:12:30 2020 +0100

    ForceSensor select AB in light yellow. Feedback in blue

 src/gui/app1/forceSensor.cs        | 38 +++++++++++++++++++++++++-------------
 src/gui/app1/forceSensorAnalyze.cs | 15 ++++++++++-----
 2 files changed, 35 insertions(+), 18 deletions(-)
---
diff --git a/src/gui/app1/forceSensor.cs b/src/gui/app1/forceSensor.cs
index e0dfacca..685a8596 100644
--- a/src/gui/app1/forceSensor.cs
+++ b/src/gui/app1/forceSensor.cs
@@ -110,9 +110,11 @@ public partial class ChronoJumpWindow
        Gdk.GC pen_black_force_capture;
        Gdk.GC pen_red_force_capture;
        Gdk.GC pen_white_force_capture;
-       Gdk.GC pen_yellow_force_capture;
+       //Gdk.GC pen_yellow_force_capture;
+       Gdk.GC pen_blue_light_force_capture;
        Gdk.GC pen_yellow_dark_force_capture;
-       Gdk.GC pen_orange_dark_force_capture;
+       //Gdk.GC pen_orange_dark_force_capture;
+       Gdk.GC pen_blue_dark_force_capture;
        Gdk.GC pen_gray_force_capture;
        Gdk.GC pen_gray_force_capture_discont;
        Pango.Layout layout_force_text;
@@ -145,6 +147,8 @@ public partial class ChronoJumpWindow
                colormapForce.AllocColor (ref UtilGtk.YELLOW,true,true);
                colormapForce.AllocColor (ref UtilGtk.YELLOW_DARK,true,true);
                colormapForce.AllocColor (ref UtilGtk.ORANGE_DARK,true,true);
+               colormapForce.AllocColor (ref UtilGtk.BLUE_DARK,true,true);
+               colormapForce.AllocColor (ref UtilGtk.LIGHT_BLUE_PLOTS,true,true);
 
                pen_black_force_capture = new Gdk.GC(force_capture_drawingarea.GdkWindow);
                pen_black_force_capture.Foreground = UtilGtk.BLACK;
@@ -160,17 +164,25 @@ public partial class ChronoJumpWindow
                pen_white_force_capture.Foreground = UtilGtk.WHITE;
                pen_white_force_capture.SetLineAttributes (2, Gdk.LineStyle.Solid, Gdk.CapStyle.NotLast, 
Gdk.JoinStyle.Miter);
 
-               pen_yellow_force_capture = new Gdk.GC(force_capture_drawingarea.GdkWindow);
-               pen_yellow_force_capture.Foreground = UtilGtk.YELLOW;
-               pen_yellow_force_capture.SetLineAttributes (2, Gdk.LineStyle.Solid, Gdk.CapStyle.NotLast, 
Gdk.JoinStyle.Miter);
+               pen_blue_light_force_capture = new Gdk.GC(force_capture_drawingarea.GdkWindow);
+               pen_blue_light_force_capture.Foreground = UtilGtk.LIGHT_BLUE_PLOTS;
+               pen_blue_light_force_capture.SetLineAttributes (2, Gdk.LineStyle.Solid, Gdk.CapStyle.NotLast, 
Gdk.JoinStyle.Miter);
+
+               //pen_yellow_force_capture = new Gdk.GC(force_capture_drawingarea.GdkWindow);
+               //pen_yellow_force_capture.Foreground = UtilGtk.YELLOW;
+               //pen_yellow_force_capture.SetLineAttributes (2, Gdk.LineStyle.Solid, Gdk.CapStyle.NotLast, 
Gdk.JoinStyle.Miter);
 
                pen_yellow_dark_force_capture = new Gdk.GC(force_capture_drawingarea.GdkWindow);
                pen_yellow_dark_force_capture.Foreground = UtilGtk.YELLOW_DARK;
                pen_yellow_dark_force_capture.SetLineAttributes (2, Gdk.LineStyle.Solid, 
Gdk.CapStyle.NotLast, Gdk.JoinStyle.Miter);
 
-               pen_orange_dark_force_capture = new Gdk.GC(force_capture_drawingarea.GdkWindow);
-               pen_orange_dark_force_capture.Foreground = UtilGtk.ORANGE_DARK;
-               pen_orange_dark_force_capture.SetLineAttributes (3, Gdk.LineStyle.OnOffDash, 
Gdk.CapStyle.NotLast, Gdk.JoinStyle.Miter);
+               //pen_orange_dark_force_capture = new Gdk.GC(force_capture_drawingarea.GdkWindow);
+               //pen_orange_dark_force_capture.Foreground = UtilGtk.ORANGE_DARK;
+               //pen_orange_dark_force_capture.SetLineAttributes (3, Gdk.LineStyle.OnOffDash, 
Gdk.CapStyle.NotLast, Gdk.JoinStyle.Miter);
+
+               pen_blue_dark_force_capture = new Gdk.GC(force_capture_drawingarea.GdkWindow);
+               pen_blue_dark_force_capture.Foreground = UtilGtk.BLUE_DARK;
+               pen_blue_dark_force_capture.SetLineAttributes (3, Gdk.LineStyle.OnOffDash, 
Gdk.CapStyle.NotLast, Gdk.JoinStyle.Miter);
 
                pen_gray_force_capture_discont = new Gdk.GC(force_capture_drawingarea.GdkWindow);
                pen_gray_force_capture_discont.Foreground = UtilGtk.GRAY;
@@ -740,7 +752,7 @@ public partial class ChronoJumpWindow
                //draw horizontal rectangle of feedback
                if(preferences.forceSensorCaptureFeedbackActive)
                        forceSensorSignalPlotFeedbackRectangle(fscPoints,
-                                       force_capture_drawingarea, force_capture_pixmap, 
pen_yellow_force_capture);
+                                       force_capture_drawingarea, force_capture_pixmap, 
pen_blue_light_force_capture);
 
 
                event_execute_ButtonFinish.Clicked -= new EventHandler(on_finish_clicked);
@@ -1180,7 +1192,7 @@ LogB.Information(" fs I ");
                                //draw horizontal rectangle of feedback
                                if(preferences.forceSensorCaptureFeedbackActive)
                                        forceSensorSignalPlotFeedbackRectangle(fscPoints,
-                                                       force_capture_drawingarea, force_capture_pixmap, 
pen_yellow_force_capture);
+                                                       force_capture_drawingarea, force_capture_pixmap, 
pen_blue_light_force_capture);
 
                        }
 
@@ -1280,7 +1292,7 @@ LogB.Information(" fs R ");
                UtilGtk.ErasePaint(force_capture_drawingarea, force_capture_pixmap);
                if(preferences.forceSensorCaptureFeedbackActive)
                        forceSensorSignalPlotFeedbackRectangle(fscPoints,
-                                       force_capture_drawingarea, force_capture_pixmap, 
pen_yellow_force_capture);
+                                       force_capture_drawingarea, force_capture_pixmap, 
pen_blue_light_force_capture);
 
                forcePaintHVLines(ForceSensorGraphs.CAPTURE,
                                getForceSensorMaxForceIncludingRectangle(forceSensorValues.ForceMax),
@@ -1899,7 +1911,7 @@ LogB.Information(" fs R ");
                //draw horizontal rectangle of feedback
                if(preferences.forceSensorCaptureFeedbackActive)
                        forceSensorSignalPlotFeedbackRectangle(fscPoints,
-                                       force_capture_drawingarea, force_capture_pixmap, 
pen_yellow_force_capture);
+                                       force_capture_drawingarea, force_capture_pixmap, 
pen_blue_light_force_capture);
 
 
                Gdk.Point [] paintPoints = new Gdk.Point[fscPoints.Points.Count];
@@ -1961,7 +1973,7 @@ LogB.Information(" fs R ");
 
                pixmap.DrawRectangle(pen_rectangle, true, rect);
 
-               pixmap.DrawLine(pen_orange_dark_force_capture,
+               pixmap.DrawLine(pen_blue_dark_force_capture,
                                points.GetTimeInPx(0), fbkGraphCenter, drawingarea.Allocation.Width, 
fbkGraphCenter);
        }
 
diff --git a/src/gui/app1/forceSensorAnalyze.cs b/src/gui/app1/forceSensorAnalyze.cs
index 74b29b25..20eace2b 100644
--- a/src/gui/app1/forceSensorAnalyze.cs
+++ b/src/gui/app1/forceSensorAnalyze.cs
@@ -687,7 +687,8 @@ public partial class ChronoJumpWindow
        Gdk.GC pen_gray_cont_force_ai;          //vertical lines
        Gdk.GC pen_gray_discont_force_ai;       //vertical lines
        Gdk.GC pen_yellow_force_ai;             //0 force
-       Gdk.GC pen_yellow_light_force_ai;       //feedback rectangle on analyze to differentiate from yellow 
AB lines
+       //Gdk.GC pen_yellow_light_force_ai;     //feedback rectangle on analyze to differentiate from yellow 
AB lines
+       Gdk.GC pen_blue_light_force_ai;         //feedback rectangle on analyze to differentiate from yellow 
AB lines
        Gdk.GC pen_white_force_ai;              //white box to ensure yellow text is not overlapped
        Gdk.GC pen_green_force_ai;              //repetitions (vertical lines)
 
@@ -721,6 +722,7 @@ public partial class ChronoJumpWindow
                colormapForceAI.AllocColor (ref UtilGtk.GREEN_PLOTS,true,true);
                bool success = colormapForceAI.AllocColor (ref UtilGtk.YELLOW,true,true);
                colormapForceAI.AllocColor (ref UtilGtk.YELLOW_LIGHT,true,true);
+               colormapForceAI.AllocColor (ref UtilGtk.LIGHT_BLUE_PLOTS,true,true);
                LogB.Information("Yellow success!: " + success.ToString()); //sempre dona success
 
                colormapForceAI.AllocColor (ref UtilGtk.WHITE,true,true);
@@ -734,7 +736,8 @@ public partial class ChronoJumpWindow
                pen_blue_force_ai = new Gdk.GC(force_sensor_ai_drawingarea.GdkWindow);
                pen_red_force_ai = new Gdk.GC(force_sensor_ai_drawingarea.GdkWindow);
                pen_yellow_force_ai = new Gdk.GC(force_sensor_ai_drawingarea.GdkWindow);
-               pen_yellow_light_force_ai = new Gdk.GC(force_sensor_ai_drawingarea.GdkWindow);
+               //pen_yellow_light_force_ai = new Gdk.GC(force_sensor_ai_drawingarea.GdkWindow);
+               pen_blue_light_force_ai = new Gdk.GC(force_sensor_ai_drawingarea.GdkWindow);
                pen_white_force_ai = new Gdk.GC(force_sensor_ai_drawingarea.GdkWindow);
                pen_gray_cont_force_ai = new Gdk.GC(force_sensor_ai_drawingarea.GdkWindow);
                pen_gray_discont_force_ai = new Gdk.GC(force_sensor_ai_drawingarea.GdkWindow);
@@ -744,7 +747,8 @@ public partial class ChronoJumpWindow
                pen_blue_force_ai.Foreground = UtilGtk.BLUE_PLOTS;
                pen_red_force_ai.Foreground = UtilGtk.RED_PLOTS;
                pen_yellow_force_ai.Foreground = UtilGtk.YELLOW;
-               pen_yellow_light_force_ai.Foreground = UtilGtk.YELLOW_LIGHT;
+               //pen_yellow_light_force_ai.Foreground = UtilGtk.YELLOW_LIGHT;
+               pen_blue_light_force_ai.Foreground = UtilGtk.LIGHT_BLUE_PLOTS;
                pen_white_force_ai.Foreground = UtilGtk.WHITE;
                pen_gray_cont_force_ai.Foreground = UtilGtk.GRAY;
                pen_gray_discont_force_ai.Foreground = UtilGtk.GRAY;
@@ -758,7 +762,8 @@ public partial class ChronoJumpWindow
                pen_blue_force_ai.SetLineAttributes (1, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, 
Gdk.JoinStyle.Round);
                pen_red_force_ai.SetLineAttributes (1, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, 
Gdk.JoinStyle.Round);
                pen_yellow_force_ai.SetLineAttributes (2, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, 
Gdk.JoinStyle.Round);
-               pen_yellow_light_force_ai.SetLineAttributes (2, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, 
Gdk.JoinStyle.Round);
+               //pen_yellow_light_force_ai.SetLineAttributes (2, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, 
Gdk.JoinStyle.Round);
+               pen_blue_light_force_ai.SetLineAttributes (2, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, 
Gdk.JoinStyle.Round);
                pen_white_force_ai.SetLineAttributes (1, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, 
Gdk.JoinStyle.Round);
                pen_gray_cont_force_ai.SetLineAttributes(1, Gdk.LineStyle.Solid, Gdk.CapStyle.Butt, 
Gdk.JoinStyle.Round);
                pen_gray_discont_force_ai.SetLineAttributes(1, Gdk.LineStyle.OnOffDash, Gdk.CapStyle.Butt, 
Gdk.JoinStyle.Round);
@@ -1019,7 +1024,7 @@ public partial class ChronoJumpWindow
 
                //draw horizontal rectangle of feedback
                if(preferences.forceSensorCaptureFeedbackActive)
-                       forceSensorSignalPlotFeedbackRectangle(fsAI.FscAIPoints, force_sensor_ai_drawingarea, 
force_sensor_ai_pixmap, pen_yellow_light_force_ai);
+                       forceSensorSignalPlotFeedbackRectangle(fsAI.FscAIPoints, force_sensor_ai_drawingarea, 
force_sensor_ai_pixmap, pen_blue_light_force_ai);
 
                // 1) create paintPoints
                //LogB.Information(string.Format("forceSensorAnalyzeManualGraphDo(): 
fsAI.FscAIPoints.Points.Count: {0}", fsAI.FscAIPoints.Points.Count));