[chronojump] graph.R discards image creation on processMultiDatabases
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] graph.R discards image creation on processMultiDatabases
- Date: Thu, 16 Jan 2020 15:58:32 +0000 (UTC)
commit 8ae4726f3362988c854bbbcec9e4e378777d459b
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Jan 16 15:58:51 2020 +0100
graph.R discards image creation on processMultiDatabases
encoder/graph.R | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/encoder/graph.R b/encoder/graph.R
index 6528f92e..7d7277c7 100644
--- a/encoder/graph.R
+++ b/encoder/graph.R
@@ -3608,7 +3608,7 @@ doProcess <- function(options)
if(
op$Analysis == "powerBars" || op$Analysis == "cross" ||
op$Analysis == "1RMBadillo2010" || op$Analysis == "1RMAnyExercise" ||
- op$Analysis == "curves" || op$Analysis == "curvesAC" ||
+ op$Analysis == "curves" || op$Analysis == "curvesAC" || op$Analysis ==
"curvesProcessMultiDB" ||
op$Analysis == "neuromuscularProfile" ||
op$Analysis == "pfvProfileEvolution" ||
writeCurves)
@@ -3849,7 +3849,8 @@ doProcess <- function(options)
neuromuscularProfileWriteData(npj, op$OutputData1)
}
- if(op$Analysis == "curves" || op$Analysis == "curvesAC" || writeCurves) {
+ if(op$Analysis == "curves" || op$Analysis == "curvesAC" || op$Analysis ==
"curvesProcessMultiDB" || writeCurves)
+ {
#create pafCurves to be printed on CSV. This columns are going to be removed:
#print("---- 1 ----")
@@ -3909,8 +3910,9 @@ doProcess <- function(options)
"laterality", "inertiaM"
)
- #Add "Max", "AVG" and "SD" when analyzing, not on "curves", not on "curvesAC"
- if(op$Analysis != "curves" && op$Analysis != "curvesAC") {
+ #Add "Max", "AVG" and "SD" when analyzing, not on "curves", not on "curvesAC", not
on "curvesProcessMultiDB"
+ if(op$Analysis != "curves" && op$Analysis != "curvesAC" && op$Analysis !=
"curvesProcessMultiDB")
+ {
addSD = FALSE
if(length(pafCurves[,1]) > 1)
addSD = TRUE
@@ -3984,6 +3986,8 @@ doProcess <- function(options)
else
pafCurvesWrite[,1] = myTimestamps
}
+ #print("---- 4 ----")
+ #print(pafCurvesWrite)
write.csv(pafCurvesWrite, op$OutputData1, quote=FALSE)
#print("curves written")
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]