[chronojump] Fixed pfvProfileEvolution graph.R code
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Fixed pfvProfileEvolution graph.R code
- Date: Tue, 9 Jan 2018 13:19:46 +0000 (UTC)
commit 4d2dc09311d2cc2c5fd9f903953b05c7bc9bd62e
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Jan 9 14:19:02 2018 +0100
Fixed pfvProfileEvolution graph.R code
encoder/Makefile.am | 1 +
encoder/graph.R | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/encoder/Makefile.am b/encoder/Makefile.am
index 90a437e..52be193 100644
--- a/encoder/Makefile.am
+++ b/encoder/Makefile.am
@@ -8,4 +8,5 @@ dist_encoderdata_DATA = pyserial_pyper.py \
graphSmoothingEC.R \
inertia-momentum.R \
neuromuscularProfile.R \
+ pfvProfileEvolution.R \
util.R
diff --git a/encoder/graph.R b/encoder/graph.R
index abfdf31..faf64ec 100644
--- a/encoder/graph.R
+++ b/encoder/graph.R
@@ -2407,7 +2407,7 @@ doProcess <- function(options)
if(op$Analysis == "neuromuscularProfile")
source(paste(op$EncoderRScriptsPath, "/neuromuscularProfile.R", sep=""))
if(op$Analysis == "pfvProfileEvolution")
- source(paste(op$EncoderRScriptsPath, "/pfvProfileEvolution", sep=""))
+ source(paste(op$EncoderRScriptsPath, "/pfvProfileEvolution.R", sep=""))
print(op$File)
print(op$OutputGraph)
@@ -3413,8 +3413,8 @@ doProcess <- function(options)
neuromuscularProfileWriteData(npj, op$OutputData1)
}
- else if(op$analysis == "pfvProfileEvolution"){
- pfvProfileExecute("/tmp/chronojump-last-encoder-analyze-table.txt")
+ else if(op$Analysis == "pfvProfileEvolution"){
+
pfvProfileExecute(paste(op$EncoderTempPath,"/chronojump-last-encoder-analyze-table.txt",sep=""))
}
if(op$Analysis == "curves" || op$Analysis == "curvesAC" || writeCurves) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]