wip

python/PBMotionAnalyzer/MAError.py

@@ -8,7 +8,7 @@
 '''
 implements an image view to show a colored image of a hdf5 dataset.
 '''
-
+from __future__ import print_function
 if __name__ == '__main__':
   #Used to guarantee to use at least Wx2.8
   import wxversion
@@ -45,15 +45,17 @@ class MPLCanvasErr(FigureCanvas):
     self.fig=fig
     self.ax=ax
 
-  def InitChild(self,meta,err):
+  def InitChild(self,meta,err,trig):
 
     fig=self.fig
     ax=self.ax
     errx,erry,err=err
     hl = []
+    hl += ax.plot(trig, 'k-',label='trigger')
     hl += ax.plot(errx, 'b-',label='x-error')
     hl += ax.plot(erry, 'g-',label='y-error')
     hl += ax.plot(err, 'r-',label='error')
+
     ax.xaxis.set_label_text('datapoint (timebase: %g ms per data point)'%meta['timebase'])
     ax.yaxis.set_label_text('pos-error um')
     legend = ax.legend(loc='upper right', shadow=True)
@@ -89,12 +91,12 @@ class MPLCanvasErr(FigureCanvas):
 
   def OnBtnPress(self, event):
     """on button press we will see if the mouse is over us and store some data"""
-    print dir(event.guiEvent)
+    print(dir(event.guiEvent))
     return
 
   def OnBtnRelease(self, event):
     """on release we reset the press data"""
-    print dir(event.guiEvent)
+    print(dir(event.guiEvent))
     #self.OnMouse(event)
     return
 
@@ -129,15 +131,15 @@ class MAErrorFrame(wx.Frame):
     toolbar=ut.AddToolbar(canvas,sizer)
 
     meta = doc.fh['meta'].item()
+    rec = doc.fh['rec']
     try:
       err=doc.err
     except AttributeError:
-      rec=doc.fh['rec']
       errx = (rec[:, 1] - rec[:, 3])
       erry = (rec[:, 0] - rec[:, 2])
       errxy = np.sqrt(errx ** 2 + erry ** 2)
       doc.err = err = (errx, erry, errxy)
-    canvas.InitChild(meta,err)
+    canvas.InitChild(meta,err,rec[:,4])
 
     self.Centre()
 

python/PBMotionAnalyzer/MAVelocity.py

@@ -8,7 +8,7 @@
 '''
 implements an image view to show a colored image of a hdf5 dataset.
 '''
-
+from __future__ import print_function
 if __name__ == '__main__':
   #Used to guarantee to use at least Wx2.8
   import wxversion
@@ -100,12 +100,12 @@ class MPLCanvasVelo(FigureCanvas):
 
   def OnBtnPress(self, event):
     """on button press we will see if the mouse is over us and store some data"""
-    print dir(event.guiEvent)
+    print(dir(event.guiEvent))
     return
 
   def OnBtnRelease(self, event):
     """on release we reset the press data"""
-    print dir(event.guiEvent)
+    print(dir(event.guiEvent))
     #self.OnMouse(event)
     return
 

python/PBMotionAnalyzer/MAxyPlot.py

@@ -8,7 +8,7 @@
 '''
 implements an image view to show a colored image of a hdf5 dataset.
 '''
-
+from __future__ import print_function
 if __name__ == '__main__':
   #Used to guarantee to use at least Wx2.8
   import wxversion
@@ -149,7 +149,7 @@ class MPLCanvasImg(FigureCanvas):
 
   def OnBtnPress(self, event):
     """on button press we will see if the mouse is over us and store some data"""
-    print dir(event.guiEvent)
+    print(dir(event.guiEvent))
     return
     if event.inaxes == self.colBar.ax:
       #if event.guiEvent.LeftDClick()==True:
@@ -209,7 +209,7 @@ class MPLCanvasImg(FigureCanvas):
     return
     for k in dir(event):
       if k[0]!='_':
-        print k,getattr(event,k)
+        print(k,getattr(event,k))
 
 class MAxyPlotFrame(wx.Frame):
   def __del__(self):

python/PBMotionAnalyzer/PBMotionAnalyzer.py

@@ -5,7 +5,7 @@
 # |                                                                       |
 # |              Author Thierry Zamofing (thierry.zamofing@psi.ch)        |
 # *-----------------------------------------------------------------------*
-
+from __future__ import print_function
 import os,sys
 import wx
 import wx.py
@@ -68,7 +68,7 @@ class AboutFrame(wx.Frame):
     st0=wx.StaticText(panel,-1,s,(30,10))
     bmp = wx.StaticBitmap(panel,-1,wx.Bitmap(os.path.join(imgDir,'PBMA.png'), wx.BITMAP_TYPE_ANY ), (30,st0.Position[1]+st0.Size[1]+10))
     for k,v in os.environ.iteritems():
-      print k,'=',v
+      print(k,'=',v)
 
 class MAMainFrame(wx.Frame):
 
@@ -88,7 +88,10 @@ class MAMainFrame(wx.Frame):
     lenRec=fh['rec'].shape[0]
     lenPts=fh['pts'].shape[0]
     self.wxTimeCtrl.slider.SetRange(0,lenRec-1)
-    self.wxTimeCtrl.slider.SetPageSize(lenRec/lenPts)
+
+    ts=fh['meta'].item()['timebase']
+    page=int((lenRec-1000/ts)/(lenPts+2))
+    self.wxTimeCtrl.slider.SetPageSize(page)
 
     self.xPosCtrl.slider.SetRange(0,lenPts-1)
 
@@ -105,7 +108,7 @@ class MAMainFrame(wx.Frame):
       pass
 
   def __init__(self, parent, title,doc):
-    wx.Frame.__init__(self, parent, title=title, size=wx.Size(650, 350))
+    wx.Frame.__init__(self, parent, title=title, size=wx.Size(650, 200),style = wx.DEFAULT_FRAME_STYLE | wx.STAY_ON_TOP)
     self.doc=doc;doc.view.append(self)
     imgDir=ut.Path.GetImage()
     icon = wx.Icon(os.path.join(imgDir,'PBMA.ico'), wx.BITMAP_TYPE_ICO)
@@ -261,7 +264,7 @@ rec
   @staticmethod
   def OnSetTime(usrData, value, msg):
     'called when the time slider has been changed'
-    print 'OnSetTime', usrData, value, msg
+    print('OnSetTime', usrData, value, msg)
     view=usrData.slider.Parent
     doc=view.doc
     doc.Update(view,0,value)
@@ -287,7 +290,7 @@ rec
   @staticmethod
   def OnSetPosition(usrData, value, msg):
     'called when the time slider has been changed'
-    print 'OnSetPosition', usrData, value, msg
+    print('OnSetPosition', usrData, value, msg)
     view = usrData.slider.Parent
     doc = view.doc
     doc.Update(view, 1, value)

python/PBMotionAnalyzer/wxutils.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 if __name__ == '__main__':
   #Used to guarantee to use at least Wx2.8
   import wxversion
@@ -29,7 +30,7 @@ class StopWatch():
   @classmethod
   def Log(cls,str=None,restart=True):
     ts=time.time()
-    print '%.6f'%(ts-cls.ts),str
+    print('%.6f'%(ts-cls.ts),str)
     if restart:
       cls.ts=ts