[chronojump] RUNENCODER_SAVE_IMAGE, RUNENCODER_SAVE_TABLE renamed RUNENCODER_ANALYZE_SAVE_IMAGE, RUNENCODER_ANALY



commit ee8391d6a5ed7dd56d9a629a0129e26e5635b0ee
Author: Xavier de Blas <xaviblas gmail com>
Date:   Fri Feb 11 13:08:46 2022 +0100

    RUNENCODER_SAVE_IMAGE, RUNENCODER_SAVE_TABLE renamed RUNENCODER_ANALYZE_SAVE_IMAGE, 
RUNENCODER_ANALYZE_SAVE_TABLE

 src/constants.cs                  |  2 +-
 src/gui/app1/encoder.cs           | 18 +++++++++---------
 src/gui/app1/runEncoder.cs        |  5 -----
 src/gui/app1/runEncoderAnalyze.cs |  7 ++++++-
 4 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/src/constants.cs b/src/constants.cs
index 0830ee27d..f714c9918 100644
--- a/src/constants.cs
+++ b/src/constants.cs
@@ -1137,7 +1137,7 @@ public class Constants
                FORCESENSOR_EXPORT_INDIVIDUAL_CURRENT_SESSION_YES_IMAGES,
                FORCESENSOR_EXPORT_INDIVIDUAL_ALL_SESSIONS_YES_IMAGES,
                FORCESENSOR_EXPORT_GROUPAL_CURRENT_SESSION_YES_IMAGES,
-               RUNENCODER_SAVE_IMAGE, RUNENCODER_SAVE_TABLE,
+               RUNENCODER_ANALYZE_SAVE_IMAGE, RUNENCODER_ANALYZE_SAVE_TABLE,
                RUNENCODER_EXPORT_INDIVIDUAL_CURRENT_SESSION_NO_IMAGES,
                RUNENCODER_EXPORT_INDIVIDUAL_ALL_SESSIONS_NO_IMAGES,
                RUNENCODER_EXPORT_GROUPAL_CURRENT_SESSION_NO_IMAGES,
diff --git a/src/gui/app1/encoder.cs b/src/gui/app1/encoder.cs
index 6c4305d4d..368f376b9 100644
--- a/src/gui/app1/encoder.cs
+++ b/src/gui/app1/encoder.cs
@@ -2157,7 +2157,7 @@ public partial class ChronoJumpWindow
                                checkFileOp == Constants.CheckFileOp.FORCESENSOR_SAVE_IMAGE_SIGNAL ||
                                checkFileOp == Constants.CheckFileOp.FORCESENSOR_SAVE_IMAGE_RFD_AUTO ||
                                checkFileOp == Constants.CheckFileOp.FORCESENSOR_SAVE_IMAGE_RFD_MANUAL ||
-                               checkFileOp == Constants.CheckFileOp.RUNENCODER_SAVE_IMAGE)
+                               checkFileOp == Constants.CheckFileOp.RUNENCODER_ANALYZE_SAVE_IMAGE)
                        exportString = Catalog.GetString ("Save image");
                else if(
                                checkFileOp == Constants.CheckFileOp.ENCODER_ANALYZE_SAVE_AB ||
@@ -2173,7 +2173,7 @@ public partial class ChronoJumpWindow
                        exportString = Catalog.GetString ("Export repetition in CSV format");
                else if(checkFileOp == Constants.CheckFileOp.ENCODER_ANALYZE_SAVE_TABLE ||
                                checkFileOp == 
Constants.CheckFileOp.ENCODER_ANALYZE_SAVE_TABLE_CURRENT_SESSION ||
-                               checkFileOp == Constants.CheckFileOp.RUNENCODER_SAVE_TABLE)
+                               checkFileOp == Constants.CheckFileOp.RUNENCODER_ANALYZE_SAVE_TABLE)
                        exportString = Catalog.GetString ("Save table");
 
                // 2) write the name of the file: nameString
@@ -2281,7 +2281,7 @@ public partial class ChronoJumpWindow
                        nameString += "_force_sensor_rfd_auto.png";
                else if(checkFileOp == Constants.CheckFileOp.FORCESENSOR_SAVE_IMAGE_RFD_MANUAL)
                        nameString += "_force_sensor_general_analysis.png";
-               else if(checkFileOp == Constants.CheckFileOp.RUNENCODER_SAVE_IMAGE)
+               else if(checkFileOp == Constants.CheckFileOp.RUNENCODER_ANALYZE_SAVE_IMAGE)
                        nameString += "_race_analyzer.png";
                else if(checkFileOp == Constants.CheckFileOp.ENCODER_ANALYZE_SAVE_AB)
                        nameString += "_encoder_repetition_export.csv";
@@ -2305,7 +2305,7 @@ public partial class ChronoJumpWindow
                else if(checkFileOp == Constants.CheckFileOp.ENCODER_ANALYZE_SAVE_TABLE ||
                                checkFileOp == 
Constants.CheckFileOp.ENCODER_ANALYZE_SAVE_TABLE_CURRENT_SESSION)
                        nameString += "_encoder_curves_table.csv";
-               else if(checkFileOp == Constants.CheckFileOp.RUNENCODER_SAVE_TABLE)
+               else if(checkFileOp == Constants.CheckFileOp.RUNENCODER_ANALYZE_SAVE_TABLE)
                        nameString += "_raceAnalyzer_table.csv";
 
                // 3) prepare and Run the dialog
@@ -2338,7 +2338,7 @@ public partial class ChronoJumpWindow
                                        checkFileOp == 
Constants.CheckFileOp.RUNENCODER_EXPORT_GROUPAL_CURRENT_SESSION_NO_IMAGES ||
                                        checkFileOp == Constants.CheckFileOp.ENCODER_ANALYZE_SAVE_TABLE ||
                                        checkFileOp == 
Constants.CheckFileOp.ENCODER_ANALYZE_SAVE_TABLE_CURRENT_SESSION ||
-                                       checkFileOp == Constants.CheckFileOp.RUNENCODER_SAVE_TABLE)
+                                       checkFileOp == Constants.CheckFileOp.RUNENCODER_ANALYZE_SAVE_TABLE)
                                exportFileName = Util.AddCsvIfNeeded(exportFileName);
                        else {
                                //ENCODER_ANALYZE_SAVE_IMAGE, ENCODER_ANALYZE_SAVE_IMAGE_CURRENT_SESSION, 
FORCESENSOR_SAVE_IMAGE_SIGNAL,
@@ -2437,10 +2437,10 @@ public partial class ChronoJumpWindow
                                                        checkFileOp == 
Constants.CheckFileOp.RUNENCODER_EXPORT_GROUPAL_CURRENT_SESSION_NO_IMAGES )
                                                confirmWin.Button_accept.Clicked +=
                                                        new 
EventHandler(on_overwrite_file_runencoder_export_accepted);
-                                       else if(checkFileOp == Constants.CheckFileOp.RUNENCODER_SAVE_IMAGE)
+                                       else if(checkFileOp == 
Constants.CheckFileOp.RUNENCODER_ANALYZE_SAVE_IMAGE)
                                                confirmWin.Button_accept.Clicked +=
                                                        new 
EventHandler(on_overwrite_file_runencoder_image_save_accepted);
-                                       else if(checkFileOp == Constants.CheckFileOp.RUNENCODER_SAVE_TABLE)
+                                       else if(checkFileOp == 
Constants.CheckFileOp.RUNENCODER_ANALYZE_SAVE_TABLE)
                                                confirmWin.Button_accept.Clicked +=
                                                        new 
EventHandler(on_overwrite_file_raceAnalyzer_save_table_accepted);
 
@@ -2500,9 +2500,9 @@ public partial class ChronoJumpWindow
                                                        checkFileOp == 
Constants.CheckFileOp.RUNENCODER_EXPORT_INDIVIDUAL_ALL_SESSIONS_NO_IMAGES ||
                                                        checkFileOp == 
Constants.CheckFileOp.RUNENCODER_EXPORT_GROUPAL_CURRENT_SESSION_NO_IMAGES )
                                                on_button_run_encoder_export_file_selected (exportFileName);
-                                       else if(checkFileOp == Constants.CheckFileOp.RUNENCODER_SAVE_IMAGE)
+                                       else if(checkFileOp == 
Constants.CheckFileOp.RUNENCODER_ANALYZE_SAVE_IMAGE)
                                                on_button_run_encoder_image_save_selected (exportFileName);
-                                       else if(checkFileOp == Constants.CheckFileOp.RUNENCODER_SAVE_TABLE)
+                                       else if(checkFileOp == 
Constants.CheckFileOp.RUNENCODER_ANALYZE_SAVE_TABLE)
                                                on_button_raceAnalyzer_save_table_file_selected 
(exportFileName);
 
                                        //show message, but not in long processes managed by a thread
diff --git a/src/gui/app1/runEncoder.cs b/src/gui/app1/runEncoder.cs
index e1f16365e..702fc1717 100644
--- a/src/gui/app1/runEncoder.cs
+++ b/src/gui/app1/runEncoder.cs
@@ -1462,11 +1462,6 @@ public partial class ChronoJumpWindow
                return recsv;
        }
 
-       private void on_button_raceAnalyzer_table_save_clicked (object o, EventArgs args)
-       {
-               checkFile(Constants.CheckFileOp.RUNENCODER_SAVE_TABLE);
-       }
-
        private string readFromRunEncoderIfDataArrived()
        {
                string str = "";
diff --git a/src/gui/app1/runEncoderAnalyze.cs b/src/gui/app1/runEncoderAnalyze.cs
index d73fa39b8..217df2c72 100644
--- a/src/gui/app1/runEncoderAnalyze.cs
+++ b/src/gui/app1/runEncoderAnalyze.cs
@@ -202,9 +202,14 @@ public partial class ChronoJumpWindow
                        raceEncoderCopyToTempAndDoRGraph();
        }
 
+       private void on_button_raceAnalyzer_table_save_clicked (object o, EventArgs args)
+       {
+               checkFile(Constants.CheckFileOp.RUNENCODER_ANALYZE_SAVE_TABLE);
+       }
+
        private void on_button_run_encoder_image_save_clicked (object o, EventArgs args)
        {
-               checkFile(Constants.CheckFileOp.RUNENCODER_SAVE_IMAGE);
+               checkFile(Constants.CheckFileOp.RUNENCODER_ANALYZE_SAVE_IMAGE);
        }
 
        private void on_button_run_encoder_image_save_selected (string destination)


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