[chronojump/FS-RFD-ManualTrimming] gui for start/end sample. Passed the optimized boolean param to R

[Xavier de Blas <xaviblas src gnome org>]

commit f4bcc0b05f47139f05ffd965756a4dfc5deadc9e
Author: Xavier de Blas <xaviblas gmail com>
Date:   Tue Nov 10 17:06:39 2020 +0100

    gui for start/end sample. Passed the optimized boolean param to R

 r-scripts/maximumIsometricForce.R |  7 +++++--
 src/forceSensor.cs                | 20 ++++++++++++++++++--
 src/gui/app1/forceSensor.cs       |  5 ++++-
 3 files changed, 27 insertions(+), 5 deletions(-)
---
diff --git a/r-scripts/maximumIsometricForce.R b/r-scripts/maximumIsometricForce.R
index d7bd1bb4..5b25c284 100644
--- a/r-scripts/maximumIsometricForce.R
+++ b/r-scripts/maximumIsometricForce.R
@@ -55,7 +55,8 @@ assignOptions <- function(options)
                triggersOnList  = as.numeric(unlist(strsplit(options[23], "\\;"))),
                triggersOffList  = as.numeric(unlist(strsplit(options[24], "\\;"))),
                startSample = as.numeric(options[25]),
-               endSample = as.numeric(options[26])
+               endSample = as.numeric(options[26]),
+               startEndOptimized = options[27] #bool
         ))
 }
 
@@ -124,7 +125,7 @@ getDynamicsFromLoadCellFile <- function(captureOptions, inputFile, averageLength
                 op$startSample = 0
                 op$endSample = 0
         }
-        if( (op$startSample > 0 || op$endSample > 0) && op$startSample <= length(originalTest$time) )
+        if( (op$startSample > 0 && op$endSample > 0) && op$startSample <= length(originalTest$time) )
         {
                 startSample = op$startSample
                 endSample = op$endSample
@@ -138,6 +139,8 @@ getDynamicsFromLoadCellFile <- function(captureOptions, inputFile, averageLength
                 startSample = trimmingSamples$startSample
                 endSample = trimmingSamples$endSample
         }
+       #print(paste("startSample: ", startSample))
+       #print(paste("endtSample: ", endSample))
         startTime = originalTest$time[startSample]
         
         endTime = originalTest$time[endSample]
diff --git a/src/forceSensor.cs b/src/forceSensor.cs
index e0cd32be..ab48168f 100644
--- a/src/forceSensor.cs
+++ b/src/forceSensor.cs
@@ -1358,9 +1358,13 @@ public class ForceSensorGraph
        string exercise;
        string datetime;
        private TriggerList triggerList;
+       private int startSample;
+       private int endSample;
 
        public ForceSensorGraph(ForceSensor.CaptureOptions fsco, List<ForceSensorRFD> rfdList,
-                       ForceSensorImpulse impulse, int testLength, int percentChange, string title, string 
exercise, string datetime, TriggerList triggerList)
+                       ForceSensorImpulse impulse, int testLength, int percentChange,
+                       string title, string exercise, string datetime, TriggerList triggerList,
+                       int startSample, int endSample)
        {
                this.fsco = fsco;
                this.rfdList = rfdList;
@@ -1371,6 +1375,8 @@ public class ForceSensorGraph
                this.exercise = exercise;
                this.datetime = datetime;
                this.triggerList = triggerList;
+               this.startSample = startSample;
+               this.endSample = endSample;
 
                averageLength = 0.1;
                vlineT0 = false;
@@ -1429,7 +1435,17 @@ public class ForceSensorGraph
                        "#datetime\n" +                 datetime + "\n" +
                        "#scriptsPath\n" +              UtilEncoder.GetScriptsPath() + "\n" +
                        printTriggers(TriggerList.Type3.ON) + "\n" +
-                       printTriggers(TriggerList.Type3.OFF);
+                       printTriggers(TriggerList.Type3.OFF) + "\n" +
+                       "#startSample\n" +              startSample.ToString() + "\n" +
+                       "#endSample\n" +                endSample.ToString() + "\n" +
+                       "#startEndOptimized\n" +        "TRUE" + "\n";
+
+               /*
+               #startEndOptimized on gui can be:
+               Range of analysis:
+               - startEndOptimized FALSE: user AB selection (use AB selected range)
+               - startEndOptimized TRUE (default): optimized range (program will find best fitting samples 
on user selected range)
+               */
 
                TextWriter writer = File.CreateText(Path.GetTempPath() + "Roptions.txt");
                writer.Write(scriptOptions);
diff --git a/src/gui/app1/forceSensor.cs b/src/gui/app1/forceSensor.cs
index ebfdc14f..4abe135a 100644
--- a/src/gui/app1/forceSensor.cs
+++ b/src/gui/app1/forceSensor.cs
@@ -2077,7 +2077,10 @@ LogB.Information(" fs R ");
 
                ForceSensorGraph fsg = new ForceSensorGraph(getForceSensorCaptureOptions(), rfdList, impulse,
                                duration, Convert.ToInt32(spin_force_rfd_duration_percent.Value),
-                               title, exercise, currentForceSensor.DateTimePublic, triggerListForceSensor);
+                               title, exercise, currentForceSensor.DateTimePublic, triggerListForceSensor,
+                               Convert.ToInt32(hscale_force_sensor_ai_a.Value),
+                               Convert.ToInt32(hscale_force_sensor_ai_b.Value)
+                               );
 
                int imageWidth = UtilGtk.WidgetWidth(viewport_force_sensor_graph);
                int imageHeight = UtilGtk.WidgetHeight(viewport_force_sensor_graph);