changeset 570:5adaab9ad160

merged
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Wed, 06 Aug 2014 17:54:01 -0400
parents 0057c04f94d5 (current diff) 538fb47b3007 (diff)
children a9c1d61a89b4
files python/moving.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/python/moving.py	Wed Aug 06 17:53:38 2014 -0400
+++ b/python/moving.py	Wed Aug 06 17:54:01 2014 -0400
@@ -335,7 +335,7 @@
                 break
             ss_spline_d[spline][0][spline_p] = utils.pointDistanceL2(splines[spline][spline_p][0],splines[spline][spline_p][1],splines[spline][(spline_p+1)][0],splines[spline][(spline_p+1)][1])
             ss_spline_d[spline][1][spline_p] = sum(ss_spline_d[spline][0][0:spline_p])
-            ss_spline_d[spline][2][spline_p] = sum(ss_spline_d[spline][0][0:spline_p])
+            ss_spline_d[spline][2][spline_p] = ss_spline_d[spline][1][spline_p]#sum(ss_spline_d[spline][0][0:spline_p])
     
     ss_spline_d[spline][2][-1] = ss_spline_d[spline][2][-2] + ss_spline_d[spline][0][-1]
 
@@ -426,8 +426,8 @@
     
 def getXYfromSY(s, y, splineNum, splines, mode = 0):
     ''' Find X,Y coordinate from S,Y data. 
-    if Mode = 0 : return Snapped X,Y
-    if Mode !=0 : return Real X,Y
+    if mode = 0 : return Snapped X,Y
+    if mode !=0 : return Real X,Y
     ''' 
     
     #(buckle in, it gets ugly from here on out)