[chronojump] Encoder relative to not need open repetitiveConditions win to be shown



commit f03f05db12937566f9433cc388040ddbe5ac4e9d
Author: Xavier de Blas <xaviblas gmail com>
Date:   Fri Feb 7 18:44:37 2020 +0100

    Encoder relative to not need open repetitiveConditions win to be shown

 src/gui/app1/chronojump.cs     | 1 +
 src/gui/app1/encoder.cs        | 3 +++
 src/gui/encoderGraphObjects.cs | 7 +++++--
 3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 87ba275f..7eacc1b5 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -7045,6 +7045,7 @@ LogB.Debug("mc finished 5");
                                                        configChronojump.PlaySoundsFromFile,
                                                        captureCurvesBarsData,
                                                        encoderCaptureListStore,
+                                                       
preferences.encoderCaptureMainVariableThisSetOrHistorical,
                                                        sendMaxPowerSpeedForceIntersession(mainVariable));
                                } else
                                        UtilGtk.ErasePaint(encoder_capture_curves_bars_drawingarea, 
encoder_capture_curves_bars_pixmap);
diff --git a/src/gui/app1/encoder.cs b/src/gui/app1/encoder.cs
index a3c0c755..eeeee3d7 100644
--- a/src/gui/app1/encoder.cs
+++ b/src/gui/app1/encoder.cs
@@ -5340,6 +5340,7 @@ public partial class ChronoJumpWindow
                                        configChronojump.PlaySoundsFromFile,
                                        captureCurvesBarsData,
                                        encoderCaptureListStore,
+                                       preferences.encoderCaptureMainVariableThisSetOrHistorical,
                                        
sendMaxPowerSpeedForceIntersession(preferences.encoderCaptureMainVariable));
                }
        }
@@ -6173,6 +6174,7 @@ public partial class ChronoJumpWindow
                                                configChronojump.PlaySoundsFromFile,
                                                captureCurvesBarsData,
                                                encoderCaptureListStore,
+                                               preferences.encoderCaptureMainVariableThisSetOrHistorical,
                                                
sendMaxPowerSpeedForceIntersession(preferences.encoderCaptureMainVariable));
                                //}
 
@@ -6697,6 +6699,7 @@ public partial class ChronoJumpWindow
                                                configChronojump.PlaySoundsFromFile,
                                                captureCurvesBarsData,
                                                encoderCaptureListStore,
+                                               preferences.encoderCaptureMainVariableThisSetOrHistorical,
                                                
sendMaxPowerSpeedForceIntersession(preferences.encoderCaptureMainVariable));
                
                                button_encoder_signal_save_comment.Label = Catalog.GetString("Save comment");
diff --git a/src/gui/encoderGraphObjects.cs b/src/gui/encoderGraphObjects.cs
index 5f1d984f..ec2b5d9d 100644
--- a/src/gui/encoderGraphObjects.cs
+++ b/src/gui/encoderGraphObjects.cs
@@ -45,6 +45,7 @@ public class EncoderGraphDoPlot
        private bool playSoundsFromFile;
        private ArrayList data7Variables;
        private Gtk.ListStore encoderCaptureListStore;
+       private bool relativeToSet;
        private double maxPowerSpeedForceIntersession; //it will be one of these 3
 
        private int discardFirstN;
@@ -140,6 +141,7 @@ public class EncoderGraphDoPlot
                        RepetitiveConditionsWindow repetitiveConditionsWin,
                        bool hasInertia, bool playSoundsFromFile,
                        ArrayList data7Variables, Gtk.ListStore encoderCaptureListStore,
+                       bool relativeToSet,
                        double maxPowerSpeedForceIntersession)
        {
                this.mainVariable = mainVariable;
@@ -154,6 +156,7 @@ public class EncoderGraphDoPlot
                this.playSoundsFromFile = playSoundsFromFile;
                this.data7Variables = data7Variables;
                this.encoderCaptureListStore = encoderCaptureListStore;
+               this.relativeToSet = relativeToSet;
                this.maxPowerSpeedForceIntersession = maxPowerSpeedForceIntersession;
 
                graphWidth = drawingarea.Allocation.Width;
@@ -358,7 +361,7 @@ public class EncoderGraphDoPlot
 
                double maxAbsolute = maxThisSet;
                //can be on meanPower, meanSpeed, meanForce
-               if(! repetitiveConditionsWin.EncoderRelativeToSet)
+               if(! relativeToSet)
                {
                        //relative to historical of this person
 
@@ -437,7 +440,7 @@ public class EncoderGraphDoPlot
                string units = "";
                
                //draw line for person max intersession
-               if(! repetitiveConditionsWin.EncoderRelativeToSet)
+               if(! relativeToSet)
                {
                        layout_encoder_capture_curves_bars_text.SetMarkup("Person's best:");
                        layout_encoder_capture_curves_bars_text.GetPixelSize(out textWidth, out textHeight);


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