[chronojump] minor. at exportFiles refactorized: exportDecimalSeparator and personSession_l



commit acc6d67885653a79c09a6be182f009316885ee75
Author: Xavier de Blas <xaviblas gmail com>
Date:   Tue Mar 23 17:23:32 2021 +0100

    minor. at exportFiles refactorized: exportDecimalSeparator and personSession_l

 src/exportFiles/exportFiles.cs | 7 ++++++-
 src/exportFiles/fs.cs          | 9 +++------
 src/exportFiles/re.cs          | 5 +----
 3 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/src/exportFiles/exportFiles.cs b/src/exportFiles/exportFiles.cs
index 8783e37c..6b0cb0f4 100644
--- a/src/exportFiles/exportFiles.cs
+++ b/src/exportFiles/exportFiles.cs
@@ -38,6 +38,9 @@ public abstract class ExportFiles
        protected bool isWindows;
        protected int personID; // -1: all
        protected int sessionID;
+       protected char exportDecimalSeparator;
+
+       protected ArrayList personSession_l;
 
        protected static Thread thread;
        protected static bool cancel;
@@ -52,7 +55,8 @@ public abstract class ExportFiles
                        Gtk.Label labelResult,
                        bool includeImages,
                        int imageWidth, int imageHeight,
-                       bool isWindows, int personID, int sessionID)
+                       bool isWindows, int personID, int sessionID,
+                       char exportDecimalSeparator)
 
        {
                this.notebook = notebook;
@@ -64,6 +68,7 @@ public abstract class ExportFiles
                this.isWindows = isWindows;
                this.personID = personID;
                this.sessionID = sessionID;
+               this.exportDecimalSeparator = exportDecimalSeparator;
        }
 
        protected void prepare(string exportURL)
diff --git a/src/exportFiles/fs.cs b/src/exportFiles/fs.cs
index a3ea1bdb..e19057cd 100644
--- a/src/exportFiles/fs.cs
+++ b/src/exportFiles/fs.cs
@@ -36,11 +36,9 @@ public class ForceSensorExport : ExportFiles
        private double forceSensorElasticConMinDispl;
        private int forceSensorNotElasticConMinForce;
        private bool forceSensorStartEndOptimized;
-       private char CSVExportDecimalSeparatorChar;
        private double forceSensorAnalyzeMaxAVGInWindowSeconds;
 
        private List<ForceSensor> fs_l;
-       private ArrayList personSession_l;
        private ArrayList fsEx_l;
        private static int totalRepsToExport;
 
@@ -58,14 +56,14 @@ public class ForceSensorExport : ExportFiles
                        double forceSensorElasticConMinDispl,
                        int forceSensorNotElasticConMinForce,
                        bool forceSensorStartEndOptimized,
-                       char CSVExportDecimalSeparatorChar,
+                       char exportDecimalSeparator,
                        double forceSensorAnalyzeMaxAVGInWindowSeconds)
 
        {
                Button_done = new Gtk.Button();
 
                assignParams(notebook, progressbar, labelResult, includeImages,
-                               imageWidth, imageHeight, isWindows, personID, sessionID);
+                               imageWidth, imageHeight, isWindows, personID, sessionID, 
exportDecimalSeparator);
 
                this.rfdList = rfdList;
                this.impulse = impulse;
@@ -76,7 +74,6 @@ public class ForceSensorExport : ExportFiles
                this.forceSensorElasticConMinDispl = forceSensorElasticConMinDispl;
                this.forceSensorNotElasticConMinForce = forceSensorNotElasticConMinForce;
                this.forceSensorStartEndOptimized = forceSensorStartEndOptimized;
-               this.CSVExportDecimalSeparatorChar = CSVExportDecimalSeparatorChar;
                this.forceSensorAnalyzeMaxAVGInWindowSeconds = forceSensorAnalyzeMaxAVGInWindowSeconds;
        }
 
@@ -332,7 +329,7 @@ public class ForceSensorExport : ExportFiles
                                        duration, durationPercent,
                                        forceSensorStartEndOptimized,
                                        true, //not used to read data, but used to print data
-                                       CSVExportDecimalSeparatorChar, // at write file
+                                       exportDecimalSeparator, // at write file
                                        fsgABe_l,
                                        forceSensorAnalyzeMaxAVGInWindowSeconds,
                                        includeImages
diff --git a/src/exportFiles/re.cs b/src/exportFiles/re.cs
index 0dc32a72..65aadc5a 100644
--- a/src/exportFiles/re.cs
+++ b/src/exportFiles/re.cs
@@ -34,10 +34,8 @@ public class RunEncoderExport : ExportFiles
        private bool plotFittedForce;
        private bool plotRawPower;
        private bool plotFittedPower;
-       private char exportDecimalSeparator;
 
        private List<RunEncoder> re_l;
-       ArrayList personSession_l;
        private ArrayList reEx_l;
        private List<TriggerList> triggerListOfLists;
 
@@ -61,7 +59,7 @@ public class RunEncoderExport : ExportFiles
                Button_done = new Gtk.Button();
 
                assignParams(notebook, progressbar, labelResult, includeImages,
-                               imageWidth, imageHeight, isWindows, personID, sessionID);
+                               imageWidth, imageHeight, isWindows, personID, sessionID, 
exportDecimalSeparator);
 
                this.startAccel = startAccel;
                this.plotRawAccel = plotRawAccel;
@@ -70,7 +68,6 @@ public class RunEncoderExport : ExportFiles
                this.plotFittedForce = plotFittedForce;
                this.plotRawPower = plotRawPower;
                this.plotFittedPower = plotFittedPower;
-               this.exportDecimalSeparator = exportDecimalSeparator;
        }
 
        private string getTempGraphsDir() {


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