[chronojump] encoder analysis cross graphs better pmax display
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] encoder analysis cross graphs better pmax display
- Date: Tue, 10 Jun 2014 11:35:29 +0000 (UTC)
commit 2cd37dde7834c9b0929c4e5683651b50d5e6b3fc
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Jun 10 13:34:46 2014 +0200
encoder analysis cross graphs better pmax display
encoder/graph.R | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/encoder/graph.R b/encoder/graph.R
index b75e8fd..3ce9237 100644
--- a/encoder/graph.R
+++ b/encoder/graph.R
@@ -1697,13 +1697,15 @@ paintCrossVariables <- function (paf, varX, varY, option, isAlone, title, single
abline(v=xmax,lty=3)
points(xmax, pmax, pch=1, cex=3)
- mtext(paste("pmax = ", round(pmax,1), " W", sep=""),side=3,at=xmax,
cex = .9)
- mtext(paste("mass = ", round(xmax,1), " Kg", sep=""),side=1,at=xmax,
cex = .9, line = -1)
+
+ #this check is to not have title overlaps on 'speed,power / load'
graph
+ if(title != "")
+ title = paste(title, " (pmax = ", round(pmax,1), " W with ",
round(xmax,1), " Kg)", sep="")
}
}
}
- title(title, cex.main=1, font.main=2)
+ title(title, cex.main=1, font.main=2, line=3)
text(as.numeric(nums.print$x), as.numeric(nums.print$y), paste(" ", nums.print$curveNum),
adj=c(adjHor,.5), cex=cexNums)
@@ -2782,22 +2784,24 @@ doProcess <- function(options) {
print(AnalysisVariables[3])
if(AnalysisVariables[1] == "Speed,Power") {
- par(mar=c(5,4,4,5))
+ par(mar=c(5,4,5,5))
analysisVertVars = unlist(strsplit(AnalysisVariables[1], "\\,"))
paintCrossVariables(paf, AnalysisVariables[2], analysisVertVars[1],
- AnalysisVariables[3], "LEFT", Title,
+ AnalysisVariables[3], "LEFT", "",
singleFile,Eccon,mySeries,
FALSE, FALSE, OutputData1)
par(new=T)
paintCrossVariables(paf, AnalysisVariables[2], analysisVertVars[2],
- AnalysisVariables[3], "RIGHT", "",
+ AnalysisVariables[3], "RIGHT", Title,
singleFile,Eccon,mySeries,
FALSE, FALSE, OutputData1)
- } else
+ } else {
+ par(mar=c(5,4,5,2))
paintCrossVariables(paf, AnalysisVariables[2], AnalysisVariables[1],
AnalysisVariables[3], "ALONE", Title,
singleFile,Eccon,mySeries,
FALSE, FALSE, OutputData1)
+ }
}
else if(Analysis == "1RMAnyExercise") {
mySeries = "1"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]