[chronojump] Fixed analyze with inertial machines ecc-con, saved reps.



commit a883e2068cefde9f5075b2f3407e42cc8a1ac9e9
Author: Xavier de Blas <xaviblas gmail com>
Date:   Thu Nov 20 13:13:22 2014 +0100

    Fixed analyze with inertial machines ecc-con, saved reps.

 encoder/graph.R    |   17 +++++++++++++++++
 src/gui/encoder.cs |    2 +-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/encoder/graph.R b/encoder/graph.R
index 6e37ce5..72cd290 100644
--- a/encoder/graph.R
+++ b/encoder/graph.R
@@ -523,6 +523,9 @@ findECPhases <- function(displacement,speed) {
 
 
        isometricUse = TRUE
+
+       print("at findECPhases")
+
        if(isometricUse) {
                eccentric=1:min(speed.ext$cross[crossMinRow,1])
                isometric=min(speed.ext$cross[crossMinRow,1]+1):max(speed.ext$cross[crossMinRow,2])
@@ -925,11 +928,25 @@ paint <- function(displacement, eccon, xmin, xmax, yrange, knRanges, superpose,
                        time2 = min(which(speed$y == min(speed$y)))
                        labelsXeXc = c("Xc","Xe")
                }
+
+               print(c("eccon",eccon))
+               print(c("time1",time1))
+               print(c("time2",time2))
                crossMinRow=which(speed.ext$cross[,1] > time1 & speed.ext$cross[,1] < time2)
                
                isometricUse = TRUE
                #TODO: con-ecc is opposite
+       
+               print("at paint")
+               
                if(isometricUse) {
+                       print("at isometricUse")
+                       print("speed.ext$cross")
+                       print(speed.ext$cross)
+                       print("crossMinRow")
+                       print(crossMinRow)
+                       print("speed.ext$cross[crossMinRow,1]")
+                       print(speed.ext$cross[crossMinRow,1])
                        eccentric=1:min(speed.ext$cross[crossMinRow,1])
                        isometric=min(speed.ext$cross[crossMinRow,1]+1):max(speed.ext$cross[crossMinRow,2])
                        concentric=max(speed.ext$cross[crossMinRow,2]+1):length(displacement)
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 9648e83..d75eb56 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -2276,7 +2276,7 @@ public partial class ChronoJumpWindow
                                        sendAnalysis,
                                        analysisVariables,
                                        analysisOptions,
-                                       encoderConfigurationCurrent,
+                                       new EncoderConfiguration(),
                                        Util.ConvertToPoint(preferences.encoderSmoothCon),      //R decimal: 
'.'
                                        myCurveNum,
                                        image_encoder_width, 


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