[chronojump] Encoder graph cross power/load better shown of pmax
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Encoder graph cross power/load better shown of pmax
- Date: Tue, 29 Sep 2020 07:18:01 +0000 (UTC)
commit 230423617e324182bf8e407b1ba2e9b64ee0b696
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Sep 29 09:17:34 2020 +0200
Encoder graph cross power/load better shown of pmax
encoder/graph.R | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/encoder/graph.R b/encoder/graph.R
index 8de45176..df5b6ab8 100644
--- a/encoder/graph.R
+++ b/encoder/graph.R
@@ -1983,7 +1983,7 @@ paintCrossVariables <- function (paf, varX, varY, option,
coef.c <- fit$coefficient[1]
#2) plot graph
- plot(x,y, ylim=c(min(c(y,y1)), max(c(y,y1))),
+ plot(x,y, ylim=c(min(c(y,y1)), max(c(y,y1+8))), #+8 to allow to be
seen the pmax circle
xlab=varXut, ylab="", pch=pchVector,
col=colBalls,bg=bgBalls,cex=cexBalls,axes=F)
paintCrossVariablesLaterality(x, y, laterality, colBalls, varX =
varX, varY = varY)
@@ -2024,7 +2024,7 @@ paintCrossVariables <- function (paf, varX, varY, option,
pmax <- xmax^2 * coef.a + xmax * coef.b + coef.c
abline(v=xmax,lty=3)
- points(xmax, pmax, pch=1, cex=3)
+ points(xmax, pmax, pch=1, cex=3, col="red")
massUnit <- "Kg"
if(hasInertia)
@@ -2034,7 +2034,8 @@ paintCrossVariables <- function (paf, varX, varY, option,
if(title != "")
title = paste(title, " (pmax = ", round(pmax,1), " W
with ",
round(xmax,1), " ", massUnit, sep="")
- text(xmax, pmax, label = paste("Pmax=", round(pmax,1),
"W*"), pos = 3, col = "red")
+ #do not show pmax because it can go out of graph, just show
in the legend
+ #text(xmax, pmax, label = paste("Pmax=", round(pmax,1),
"W*"), pos = 3, col = "red")
legend(x = par("usr")[2], y = par("usr")[4]-(par("usr")[4] -
par("usr")[3])*0.1,
legend = c(paste("Pmax = ", round(pmax,1), "W",
sep=""),
paste("Load: ", round(xmax,1), massUnit,
sep = "")),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]