[chronojump] paint full serie don't plot speed on inertial



commit 43c70d91eab1302e0be4b87b03c6dfc1f3e9926f
Author: Xavier Padullés <x padulles gmail com>
Date:   Fri Dec 9 17:03:09 2016 +0100

    paint full serie don't plot speed on inertial

 encoder/graph.R |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/encoder/graph.R b/encoder/graph.R
index c270fad..c529955 100644
--- a/encoder/graph.R
+++ b/encoder/graph.R
@@ -2803,7 +2803,7 @@ doProcess <- function(options)
        
                        axisLineRight = 0
                        marginRight = 8.5
-                       if(! showSpeed)
+                       if (! showSpeed || isInertial(op$EncoderConfigurationName))
                                marginRight = marginRight -2
                        if(! showAccel)
                                marginRight = marginRight -2
@@ -2830,7 +2830,8 @@ doProcess <- function(options)
                                mtext(i, side=3, at=(curves[i,1] + curves[i,2])/2)
                        }
 
-                       if (showSpeed) {
+                       #showSpeed only on gravitatory until speed is fixed on this experimental graph
+                       if (showSpeed && ! isInertial(op$EncoderConfigurationName)) {
                                par(new=T)
                                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
@@ -2866,7 +2867,7 @@ doProcess <- function(options)
                                axisLineRight = axisLineRight +2
                        }
                        
-                       paintVariablesLegend(showSpeed, showAccel, showForce, showPower)
+                       paintVariablesLegend(showSpeed && ! isInertial(op$EncoderConfigurationName), 
showAccel, showForce, showPower)
                }
        
                #needed to align the AB vertical lines on C#


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]