[chronojump] Fixed forceSensor export fail when not exporting impulse



commit f651af5d0cd72434c6f1c5fc22aba31607da9530
Author: Xavier de Blas <xaviblas gmail com>
Date:   Mon Nov 22 17:11:20 2021 +0100

    Fixed forceSensor export fail when not exporting impulse

 r-scripts/maximumIsometricForce.R | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/r-scripts/maximumIsometricForce.R b/r-scripts/maximumIsometricForce.R
index 0b084f5b2..a9712c637 100644
--- a/r-scripts/maximumIsometricForce.R
+++ b/r-scripts/maximumIsometricForce.R
@@ -1167,7 +1167,9 @@ start <- function(op)
                        if(RFDoptions$rfdFunction != "-1")
                                exportModelVectorOnFail = c(exportModelVectorOnFail, NA)
                }
-               exportModelVectorOnFail = c(exportModelVectorOnFail, NA)                #impulse
+               impulseOptions = readImpulseOptions(op$drawImpulseOptions)
+               if(impulseOptions$impulseFunction != "-1")
+                       exportModelVectorOnFail = c(exportModelVectorOnFail, NA)                #impulse
 
                #preparing header row (each set will have this in the result dataframe to be able to combine 
them)
                maxAvgWindowSecondsHeader = op$maxAvgWindowSeconds
@@ -1183,7 +1185,6 @@ start <- function(op)
                                                RFDoptions$start, RFDoptions$end, sep ="_"))
                }
 
-               impulseOptions = readImpulseOptions(op$drawImpulseOptions)
                if(impulseOptions$impulseFunction != "-1")
                        exportNames = c(exportNames, paste("Impulse", impulseOptions$impulseFunction, 
impulseOptions$type,
                                        impulseOptions$start, impulseOptions$end, sep ="_"))


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