[chronojump] ForceSensor minor change calling a method



commit 5985cb27d2b85b12e584bbbb0e48a3c4defc8d33
Author: Xavier de Blas <xaviblas gmail com>
Date:   Tue Feb 16 20:31:54 2021 +0100

    ForceSensor minor change calling a method

 src/forceSensor.cs          | 26 +++++++++++++++++++++-----
 src/gui/app1/forceSensor.cs |  2 --
 2 files changed, 21 insertions(+), 7 deletions(-)
---
diff --git a/src/forceSensor.cs b/src/forceSensor.cs
index 84d048d2..cab1cbf3 100644
--- a/src/forceSensor.cs
+++ b/src/forceSensor.cs
@@ -1520,13 +1520,9 @@ public class ForceSensorGraphAB
        public string datetime;
        public TriggerList triggerList;
 
-       public ForceSensorGraphAB (string fullURL,
-                       bool decimalIsPoint,
-                       ForceSensor.CaptureOptions fsco, int startSample, int endSample,
+       private void assignParams(ForceSensor.CaptureOptions fsco, int startSample, int endSample,
                        string title, string exercise, string datetime, TriggerList triggerList)
        {
-               this.fullURL = fullURL;
-               this.decimalIsPoint = decimalIsPoint;
                this.fsco = fsco;
                this.startSample = startSample;
                this.endSample = endSample;
@@ -1536,6 +1532,26 @@ public class ForceSensorGraphAB
                this.triggerList = triggerList;
        }
 
+       //constructor for graph on analyze
+       public ForceSensorGraphAB (
+                       ForceSensor.CaptureOptions fsco, int startSample, int endSample,
+                       string title, string exercise, string datetime, TriggerList triggerList)
+       {
+               assignParams(fsco, startSample, endSample, title, exercise, datetime, triggerList);
+       }
+
+       //constructor for export
+       public ForceSensorGraphAB (
+                       string fullURL, bool decimalIsPoint,
+                       ForceSensor.CaptureOptions fsco, int startSample, int endSample,
+                       string title, string exercise, string datetime, TriggerList triggerList)
+       {
+               assignParams(fsco, startSample, endSample, title, exercise, datetime, triggerList);
+
+               this.fullURL = fullURL;
+               this.decimalIsPoint = decimalIsPoint;
+       }
+
        public string ToCSVRowOnExport()
        {
                //since 2.0.3 decimalChar is . (before it was locale specific)
diff --git a/src/gui/app1/forceSensor.cs b/src/gui/app1/forceSensor.cs
index d803289f..66d45f62 100644
--- a/src/gui/app1/forceSensor.cs
+++ b/src/gui/app1/forceSensor.cs
@@ -2181,8 +2181,6 @@ LogB.Information(" fs R ");
                                Util.CSVDecimalColumnIsPoint(UtilEncoder.GetmifCSVFileName(), 1),       
//decimalIsPointAtFile (read)
                                preferences.CSVExportDecimalSeparatorChar,                              
//decimalIsPointAtExport (write)
                                new ForceSensorGraphAB(
-                                       "",     //unused on single graph (no export)
-                                       true,   //unused on single graph (no export)
                                        getForceSensorCaptureOptions(),
                                        sampleA, sampleB,
                                        title, exercise, currentForceSensor.DateTimePublic, 
triggerListForceSensor)


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