bugfixing

python/MAVelocity.py

@@ -148,10 +148,10 @@ class MAVelocityFrame(wx.Frame):
       #datapoint timebase: 2 ms () per data point
       #velocity: um/ms (deltatau desVel= motor units per serco cycle)
       rec=doc.fh['rec']
-      velxAct = np.diff(rec[:, 1])/tb
-      velxDes = np.diff(rec[:, 4])/tb
-      velyAct = np.diff(rec[:, 2])/tb
-      velyDes = np.diff(rec[:, 5])/tb
+      velxAct = np.diff(rec[:, 2])/tb
+      velxDes = np.diff(rec[:, 5])/tb
+      velyAct = np.diff(rec[:, 1])/tb
+      velyDes = np.diff(rec[:, 4])/tb
       velAct = np.sqrt(velxAct**2+velyAct**2)
       velDes = np.sqrt(velxDes**2+velyDes**2)
       doc.vel = vel = (velxAct,velxDes,velyAct,velyDes,velAct,velDes)
@@ -194,7 +194,7 @@ class MAVelocityFrame(wx.Frame):
     if msg == 0:
       canvas = self.canvas
       ax = canvas.ax
-      len = usrData
+      idx = usrData
       hl = canvas.hl
       #hl[0].set_data(rec[:len, 4], rec[:len, 5])
       #hl[3].set_data(rec[:len, 1], rec[:len, 2])
@@ -203,7 +203,7 @@ class MAVelocityFrame(wx.Frame):
       x = (x[1] - x[0]) / 2;
       #y = ax.get_ylim();
       #y = (y[1] - y[0]) / 2;
-      ax.set_xlim(len-x, len + x,emit=True)
+      ax.set_xlim(idx-x, idx + x,emit=True)
       #ax.set_ylim(rec[len, 2] - y, rec[len, 2] + y)
       canvas.draw()