Changeset 741 for moxy

Timestamp:

Dec 24, 2011 12:07:31 AM (14 years ago)

Author:

jemian

Message:

SingleAxis? GUI works, needs a Configure dialog

Location:

moxy/trunk/src/moxy

Files:

• m_pv.py (modified) (3 diffs)
• vc_axis.py (modified) (9 diffs)
• vc_pv.py (modified) (2 diffs)

moxy/trunk/src/moxy/m_pv.py ¶

@@ -21 +21 @@
 import epics
 from threading import Thread
+from time import sleep
 
 
@@ -100 +101 @@
 def waitmove(pv, position, seconds):
     '''move this motor pv and wait for a fixed time'''
-    from time import sleep
     print "moving", pv, " to ", position
     epics.caput(pv, position)
@@ -119 +119 @@
     # now try a couple moves
     waitmove(pv, position=5,   seconds=5)
+    sleep(2.5)
     waitmove(pv, position=1.1, seconds=5)

moxy/trunk/src/moxy/vc_axis.py ¶

@@ -35 +35 @@
 COLOR_BACKGROUND = wx.Colour(237, 233, 227)     # boa-constructor uses this
 
+COLOR_NOT_MOVING = COLOR_BACKGROUND     # slight revision
+
 
 # - - - - - - - - - - - - - - - - - - classes
@@ -65 +67 @@
     '''
     def __init__(self, parent, axis): #@ReservedAssignment
-        wx.Frame.__init__(self, parent, wx.ID_ANY, 'DemoView')
+        wx.Frame.__init__(self, parent, wx.ID_ANY, 'DemoView', size=(200,300))
         self.SetToolTipString(u'Single Axis DemoFrame')
         self.panel = SingleAxisPanel(parent=self, axis=axis)
@@ -74 +76 @@
     Show a single motion axis in a panel.
     The EPICS CA connections must be made here to get the callbacks.
-    '''
-
-    def __init__(self, parent, axis): #@ReservedAssignment
+    
+    The buttons (STOP, Configure, Connect, Disconnect) are optional
+    and can be suppressed by adding  ``show_buttons = False``
+    '''
+
+    def __init__(self, parent, axis, show_buttons = True):
         self.axis = axis
-        # self.axis.connect(ext_handler=None)
+        self.connected = False
+        self.show_buttons = show_buttons
+
         wx.Panel.__init__(self, id=wx.ID_ANY, parent=parent)
         self.SetToolTipString( self.axis.val.pvname )
-        self._init_widgets(self)
-        self.axis.connect(ext_handler=None)        # TODO: need a callback handler
+        
+        self.SetSizer(self._init_widgets(self))
+        
+        self.SetStatus( 'initialized' )
+        self.connect()
 
     def _init_widgets(self, panel):
-        self.panelSizer = wx.BoxSizer(orient=wx.VERTICAL)
-        panel.SetSizer(self.panelSizer)
-        
-        self.panelSizer.AddSizer(self._init_upper(panel), 0, flag=wx.EXPAND)
-        self.panelSizer.AddSizer(self._init_lower(panel), 0, flag=wx.EXPAND)
-        self.panelSizer.AddSizer(self._init_buttons(panel), 0, flag=wx.EXPAND)
+        '''create and layout all the widgets, return the sizer'''
+        sizer = wx.BoxSizer(orient=wx.VERTICAL)
+        
+        sizer.AddSizer(self._init_upper(panel), 0, flag=wx.EXPAND)
+        sizer.AddSizer(self._init_lower(panel), 0, flag=wx.EXPAND)
+        if self.show_buttons:
+            sizer.AddSizer(self._init_buttons1(panel), 0, flag=wx.EXPAND)
+            sizer.AddSizer(self._init_buttons2(panel), 0, flag=wx.EXPAND)
+        return sizer
 
     def _init_upper(self, parent):
         '''
-        describe this axis
+        describe this axis, return a sizer
         '''
         self.w_name = wx.TextCtrl(parent=parent, id=wx.ID_ANY)
         self.w_name.SetEditable(True)
         self.w_name.SetValue(self.axis.name)
-        
-        # TODO: get from desc PV when connected
+        self.w_name.SetToolTipString(u'local name for this axis')
+        
         self.w_desc = wx.lib.stattext.GenStaticText(parent, wx.ID_ANY, 'description')
-        #self.w_desc.SetBackgroundColour( COLOR_BACKGROUND )
-        
-        # TODO: get from egu PV when connected
+        self.w_desc.SetToolTipString(u'EPICS description for this axis')
+        
         self.w_egu = wx.lib.stattext.GenStaticText(parent, wx.ID_ANY, 'units')
-        #self.w_egu.SetBackgroundColour( COLOR_BACKGROUND )
+        self.w_egu.SetToolTipString(u'engineering units')
 
         sbox = wx.StaticBox(parent, id=wx.ID_ANY,
@@ -115 +127 @@
         sbs.Add(fgs, 0, wx.EXPAND|wx.ALIGN_CENTRE|wx.ALL, 5)
 
-        fgs.Add(self.w_name, flag=wx.EXPAND)
-        fgs.Add(self.w_desc, flag=wx.EXPAND)
-        fgs.Add(self.w_egu, flag=wx.EXPAND)
+        fgs.Add(self.w_name, flag=wx.EXPAND|wx.GROW)
+        fgs.Add(self.w_desc, flag=wx.EXPAND|wx.GROW)
+        fgs.Add(self.w_egu, flag=wx.EXPAND|wx.GROW)
 
         return sbs
@@ -123 +135 @@
     def _init_lower(self, parent):
         '''
-        show readback and target values and connection state
+        show readback and target values and connection state, return the sizer
         '''
         self.w_readback = wx.lib.stattext.GenStaticText(parent, wx.ID_ANY, 'readback')
+        self.w_readback.SetToolTipString(u'readback value')
+        
         self.w_target = wx.TextCtrl(parent=parent, id=wx.ID_ANY)
         self.w_target.SetEditable(False)
+        self.w_target.SetToolTipString(u'target value')
+        
         self.w_status = wx.lib.stattext.GenStaticText(parent, wx.ID_ANY, 'status')
-        
-        # TODO: unfinished
-#        self.SetState(self.state)
-#        self.SetRemarks(self.remarks)
+        self.w_status.SetToolTipString(u'EPICS connection status')
         
         sbox = wx.StaticBox(parent, id=wx.ID_ANY,
@@ -141 +154 @@
         sbs.Add(fgs, 0, wx.EXPAND|wx.ALIGN_CENTRE|wx.ALL, 5)
         
-        fgs.Add(self.w_readback, 0, flag=wx.EXPAND)
-        fgs.Add(self.w_target, 0, flag=wx.EXPAND)
-        fgs.Add(self.w_status, 0, flag=wx.EXPAND)
+        fgs.Add(self.w_readback, flag=wx.EXPAND|wx.ALL)
+        fgs.Add(self.w_target, flag=wx.EXPAND|wx.ALL)
+        fgs.Add(self.w_status, flag=wx.EXPAND|wx.ALL)
 
         return sbs
     
-    def _init_buttons(self, parent):
+    def _init_buttons1(self, parent):
         '''
         build the buttons row and place it in a sizer, return the sizer
@@ -158 +171 @@
         self.stopButton.SetForegroundColour('yellow')
 
+        sizer = wx.BoxSizer(orient=wx.HORIZONTAL)
+        sizer.AddWindow(self.stopButton, proportion=1, flag=wx.EXPAND)
+        return sizer
+    
+    def _init_buttons2(self, parent):
+        '''
+        build the second buttons row and place it in a sizer, return the sizer
+        '''
         self.configureButton = self._my_button(parent, 
               label=u'Configure', name='configureButton', 
@@ -163 +184 @@
               binding=self.doConfigureButton)
 
+        self.connectButton = self._my_button(parent, 
+              label=u'Connect', name='connectButton', 
+              tip=u'Connect this axis with EPICS', 
+              binding=self.doConnnectButton)
+        self.disconnectButton = self._my_button(parent, 
+              label=u'Disconnect', name='disconnectButton', 
+              tip=u'Disconnect this axis from EPICS', 
+              binding=self.doDisconnnectButton)
+
         sizer = wx.BoxSizer(orient=wx.HORIZONTAL)
-        sizer.AddWindow(self.stopButton, proportion=1, flag=wx.EXPAND)
-        sizer.AddWindow(self.configureButton, proportion=0, flag=wx.EXPAND)
+        sizer.AddWindow(self.configureButton, proportion=1, flag=wx.EXPAND)
+        sizer.AddWindow(self.connectButton, proportion=1, flag=wx.EXPAND)
+        sizer.AddWindow(self.disconnectButton, proportion=1, flag=wx.EXPAND)
         return sizer
         
@@ -180 +211 @@
 
     def doStopButton(self, event):
-        print "STOP pressed"    # TODO: unfinished
+        '''stop this axis from moving'''
         self.axis.stopMotion()
 
     def doConfigureButton(self, event):
-        print "Configure pressed"    # TODO: unfinished
-
-    def SetWidgetValue(self, widget, value):
-        wx.CallAfter(widget.SetValue, value)
+        '''run dialog to configure the EPICS PVs of this axis'''
+        print "Configure pressed - feature not enabled yet"    # TODO: unfinished
+
+    def doConnnectButton(self, event):
+        '''user clicked button to connect'''
+        self.connect()
+
+    def doDisconnnectButton(self, event):
+        '''user clicked button to disconnect'''
+        self.disconnect()
+
+    def connect(self):
+        '''connect the PVs of this axis with EPICS'''
+        if not self.connected:
+            self.axis.connect(ext_handler=self.callback)
+            self.SetStatus( 'connected' )
+            self.w_name.SetEditable(False)
+            self.w_target.SetEditable(True)
+            self.connected = True
+
+    def disconnect(self):
+        '''connect the PVs of this axis from EPICS'''
+        if self.connected:
+            self.axis.disconnect()
+            self.SetStatus( 'disconnected' )
+            self.w_name.SetEditable(True)
+            self.w_target.SetEditable(False)
+            self.connected = False
 
     def SetVAL(self, value):
-        print "set VAL"    # TODO: unfinished
-        # self.SetWidgetValue(self.WIDGET, value)
+        '''put the value into the widget text'''
+        wx.CallAfter(self.w_target.SetValue, str(value) )
 
     def SetRBV(self, value):
-        print "set RBV"    # TODO: unfinished
-        # self.SetWidgetValue(self.WIDGET, value)
+        '''put the value into the widget text'''
+        wx.CallAfter(self.w_readback.SetLabel, str(value) )
 
     def SetEGU(self, value):
-        print "set EGU"    # TODO: unfinished
-        # self.SetWidgetValue(self.WIDGET, value)
+        '''put the value into the widget text'''
+        wx.CallAfter(self.w_egu.SetLabel, value)
 
     def SetDESC(self, value):
-        print "set DESC"    # TODO: unfinished
-        # self.SetWidgetValue(self.WIDGET, value)
+        '''put the value into the widget text'''
+        wx.CallAfter(self.w_desc.SetLabel, value)
 
     def SetDMOV(self, value):
-        print "set DMOV"    # TODO: unfinished
-        # change the color
-        #wx.CallAfter(self.WIDGET.SetBackgroundColour, value)
-
-    # TODO: unfinished
+        '''set the widget background color based on moving state'''
+        moving = not value
+        color = {False: COLOR_NOT_MOVING, True: COLOR_MOVING}[moving]
+        wx.CallAfter(self.w_target.SetBackgroundColour, color )
+        wx.CallAfter(self.w_readback.SetBackgroundColour, color )
+
+    def SetSTOP(self, value):
+        '''a no-op'''
+        pass
+
+    def SetStatus(self, value):
+        '''describe what's what'''
+        wx.CallAfter(self.w_status.SetLabel, value)
+    
+    def callback(self, **kw):
+        "PyEPICS CA monitor callback"
+        #print kw
+        if 'conn' in kw.keys():
+            print "connection event", kw
+            if kw['conn']:
+                self.SetStatus( 'connected event received' )
+            else:
+                self.SetStatus( 'disconnect received, IOC is unavailable?' )
+        else:
+            #print "PV update event"
+            if 'field' in kw:
+                #print kw['field']
+                {'VAL': self.SetVAL,
+                 'RBV': self.SetRBV,
+                 'EGU': self.SetEGU,
+                 'DESC': self.SetDESC,
+                 'DMOV': self.SetDMOV,
+                 'STOP': self.SetSTOP,
+                }[ kw['field'] ]( kw['value'] )
 
 

moxy/trunk/src/moxy/vc_pv.py ¶

@@ -71 +71 @@
         upper = self._init_upper(self.panel)
         lower = self._init_lower(self.panel)
-        buttons = self._init_buttons(self.panel)
+        buttons = self._init_buttons1(self.panel)
         
         sizer.AddSizer(upper, 1, flag=wx.EXPAND)
@@ -128 +128 @@
         return sbs
     
-    def _init_buttons(self, parent):
+    def _init_buttons1(self, parent):
         '''
         build the buttons row and place it in a sizer, return the sizer