[chronojump] Encoder graph title checks EncoderPhasesEnum to calcule X, XSaved

[Xavier de Blas <xaviblas src gnome org>]

commit b9528a8c2ba51ea8d0ee0758216a95af75fac7f4
Author: Xavier de Blas <xaviblas gmail com>
Date:   Fri Jun 5 11:40:07 2020 +0200

    Encoder graph title checks EncoderPhasesEnum to calcule X, XSaved

 src/gui/encoderGraphObjects.cs | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)
---
diff --git a/src/gui/encoderGraphObjects.cs b/src/gui/encoderGraphObjects.cs
index 8c6dd6c1..c7e84f62 100644
--- a/src/gui/encoderGraphObjects.cs
+++ b/src/gui/encoderGraphObjects.cs
@@ -354,8 +354,8 @@ public class EncoderGraphDoPlot
                        if(eccon == "c" ||
                                        preferences.encoderCaptureFeedbackEccon == 
Preferences.EncoderPhasesEnum.BOTH ||
                                        preferences.encoderCaptureFeedbackEccon == 
Preferences.EncoderPhasesEnum.ECC && ! Util.IsEven(count +1) || //odd (impar)
-                                       preferences.encoderCaptureFeedbackEccon == 
Preferences.EncoderPhasesEnum.CON && Util.IsEven(count +1)   //even (par)
-                                       ) {
+                                       preferences.encoderCaptureFeedbackEccon == 
Preferences.EncoderPhasesEnum.CON && Util.IsEven(count +1) ) //even (par)
+                       {
                                if(d > maxThisSetForCalc)
                                        maxThisSetForCalc = d;
                        }
@@ -366,7 +366,11 @@ public class EncoderGraphDoPlot
                        if( hasInertia && discardFirstN > 0 &&
                                          ((eccon == "c" && count < discardFirstN) || (eccon != "c" && count 
< discardFirstN * 2)) )
                                LogB.Information("Discarded phase");
-                       else {
+                       else if(eccon == "c" ||
+                                       preferences.encoderCaptureFeedbackEccon == 
Preferences.EncoderPhasesEnum.BOTH ||
+                                       preferences.encoderCaptureFeedbackEccon == 
Preferences.EncoderPhasesEnum.ECC && ! Util.IsEven(count +1) || //odd (impar)
+                                       preferences.encoderCaptureFeedbackEccon == 
Preferences.EncoderPhasesEnum.CON && Util.IsEven(count +1) ) //even (par)
+                       {
                                countValid ++;
                                sumValid += d;
                                bool needChangeMin = false;
@@ -795,10 +799,18 @@ public class EncoderGraphDoPlot
                                                d ) );
                        
                        bool curveSaved = false;        
-                       if( iterOk && ((EncoderCurve) encoderCaptureListStore.GetValue (iter, 0)).Record ) {
+                       if( iterOk && ((EncoderCurve) encoderCaptureListStore.GetValue (iter, 0)).Record )
+                       {
                                curveSaved = true;
-                               sumSaved += dFor;
-                               countSaved ++;
+
+                               if(eccon == "c" ||
+                                               preferences.encoderCaptureFeedbackEccon == 
Preferences.EncoderPhasesEnum.BOTH ||
+                                               preferences.encoderCaptureFeedbackEccon == 
Preferences.EncoderPhasesEnum.ECC && ! Util.IsEven(count +1) || //odd (impar)
+                                               preferences.encoderCaptureFeedbackEccon == 
Preferences.EncoderPhasesEnum.CON && Util.IsEven(count +1) ) //even (par)
+                               {
+                                       sumSaved += dFor;
+                                       countSaved ++;
+                               }
                        }
                        
                        //add text on the bottom