[chronojump] Removed last commits on graph.R speed all set until is tested.
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Removed last commits on graph.R speed all set until is tested.
- Date: Tue, 25 Jul 2017 09:39:25 +0000 (UTC)
commit ced860daffa9eca2e2d2c774692bbd630b6d53fc
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Jul 25 11:38:42 2017 +0200
Removed last commits on graph.R speed all set until is tested.
encoder/graph.R | 32 +++-----------------------------
1 files changed, 3 insertions(+), 29 deletions(-)
---
diff --git a/encoder/graph.R b/encoder/graph.R
index 70e5e01..ef1252a 100644
--- a/encoder/graph.R
+++ b/encoder/graph.R
@@ -2902,37 +2902,11 @@ doProcess <- function(options)
}
#showSpeed only on gravitatory until speed is fixed on this experimental graph
- #if (showSpeed && ! isInertial(op$EncoderConfigurationName)) {
- if (showSpeed ) {
+ if (showSpeed && ! isInertial(op$EncoderConfigurationName)) {
par(new=T)
-
- correctedSpeed = speed$y[0:(curves[1,1] -1)] #The first part of the graph
isn't corrected
- #adding the consecutive repetitions to the correctedSpeed
- for (n in 2:length(curves[,1]))
- {
- if(speed$y[curves[n -1 , 1]] > 0) #If the speed is positive it
must be changeed the sign of it
- {
- correctedSpeed = c(correctedSpeed, -1 * (speed$y[curves[n -1,
1]:(curves[n,1] -1 )]))
- } else #If the speed is negative it must to
be manteined
- {
- correctedSpeed = c(correctedSpeed, (speed$y[curves[n -1,
1]:(curves[n,1] -1 )]))
- }
- }
-
- if(speed$y[curves[length(curves[,1]), 1]] > 0) #If the speed is positive
it must be changeed the sign of it
- {
- correctedSpeed = c(correctedSpeed, -1 *
(speed$y[curves[length(curves[,1]), 1]:length(speed$y)]))
- } else #If the speed is negative it must to be
manteined
- {
- correctedSpeed = c(correctedSpeed, speed$y[curves[length(curves[,1]),
1]:length(speed$y)])
- }
-
- #correctedSpeed = c(correctedSpeed, speed$y[curves[length(curves[,1]),1]:
length(speed$y)])
- print(paste("CorrectedSpeed length =", length(correctedSpeed)))
- ylimHeight = max(abs(range(correctedSpeed)))
+ ylimHeight = max(abs(range(speed$y)))
ylim=c(- 1.05 * ylimHeight, 1.05 * ylimHeight) #put 0 in the middle, and
have 5% margin at each side
- print(paste("ylim =",ylim))
- plot(correctedSpeed, col=cols[1], ylim=ylim, type="l", xlab="",ylab="",axes=F)
+ plot(speed$y, col=cols[1], ylim=ylim, type="l", xlab="",ylab="",axes=F)
axis(4, col=cols[1], lty=lty[1], line=axisLineRight, lwd=1, padj=-.5)
axisLineRight = axisLineRight +2
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]