Changeset 771 for moxy

Timestamp:

Feb 1, 2012 4:45:03 PM (13 years ago)

Author:

jemian

Message:

checkpoint

Location:

moxy/trunk/src/moxy

Files:

• vc_axis.py (modified) (10 diffs)
• vc_set.py (modified) (1 diff)

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

@@ -72 +72 @@
         self.notebook = wx.Notebook( self )
         
-        self.operate_panel = SingleAxisOperatePanel(self.notebook, 
-                                show_buttons)
+        self.operate_panel = SingleAxisOperatePanel(self.notebook, self, show_buttons)
         self.setup_panel = SingleAxisSetupPanel(self.notebook, 
+                                self,
                                 show_buttons, 
                                 operate_panel = self.operate_panel)
@@ -106 +106 @@
     and can be suppressed by adding  ``show_buttons = False``
     
-    :param obj parent: panel or frame that contains this panel
-    :param axis: set of PVs that describe the operation of this axis
+    :param obj parent: container of this panel
+    :param obj axis_parent: container of the axis object
     :param bool show_buttons: suppress display of certain buttons
     '''
     
-    def __init__(self, parent, axis, show_buttons = True):
+    def __init__(self, parent, axis_parent, show_buttons = True):
         self.parent = parent
+        self.axis_parent = axis_parent
         self.show_buttons = show_buttons
         self.connected = False
 
         wx.Panel.__init__(self, id=wx.ID_ANY, parent=parent)
-        self.SetToolTipString( self.GrandParent.axis.axis.get_pv('VAL').pvname )
+        self.SetToolTipString( self.axis_parent.axis.axis.get_pv('VAL').pvname )
         self._init_panel(self)
         self.Fit()
@@ -147 +148 @@
                                                       wx.ID_ANY, 'description')
         self.gst_name.SetToolTipString(u'local name for this axis')
-        self.gst_name.SetLabel( self.GrandParent.axis.name )
+        self.gst_name.SetLabel( self.axis_parent.axis.name )
         
         self.w_desc = wx.lib.stattext.GenStaticText(parent, 
@@ -202 +203 @@
         obj = event.EventObject
         if obj == self.w_target:
-            if self.GrandParent.axis._connected:
+            if self.axis_parent.axis._connected:
                 s = obj.GetValue()
                 try:
                     value = float( s )
-                    self.GrandParent.axis.move( value )
+                    self.axis_parent.axis.move( value )
                     self.SetStatus( 'new target' )
                 except ValueError:
@@ -214 +215 @@
     def doStopButton(self, event):
         '''stop this axis from moving'''
-        self.GrandParent.axis.stopMotion()
+        self.axis_parent.axis.stopMotion()
         self.SetStatus( 'stopped' )
 
@@ -224 +225 @@
         '''connect the PVs of this axis with EPICS'''
         if not self.connected:
-            the_axis = self.GrandParent.axis
+            the_axis = self.axis_parent.axis
             the_axis.connect(self.callback)
             self.SetStatus( 'connected' )
@@ -238 +239 @@
         '''connect the PVs of this axis from EPICS'''
         if self.connected:
-            self.GrandParent.axis.disconnect()
+            self.axis_parent.axis.disconnect()
             self.SetStatus( 'disconnected' )
             self.w_target.SetEditable(False)
@@ -300 +301 @@
     
     :param obj parent: panel or frame that contains this panel
-    :param axis: set of PVs that describe the operation of this axis
-    :type axis: m_axis.SingleAxis object
+    :param obj axis_parent: container of the axis object
     :param bool show_buttons: suppress display of certain buttons
     :param obj operate_panel: SingleAxisOperatePanel object to use with this class
     '''
     
-    def __init__(self, parent, show_buttons = True, operate_panel = None):
+    def __init__(self, parent, axis_parent, show_buttons = True, operate_panel = None):
         self.parent = parent
+        self.axis_parent = axis_parent
         self.show_buttons = show_buttons
         self.operate_panel = operate_panel
 
         wx.Panel.__init__(self, id=wx.ID_ANY, parent=parent)
-        self.SetToolTipString(self.GrandParent.axis.axis.get_pv('VAL').pvname)
+        self.SetToolTipString(self.axis_parent.axis.axis.get_pv('VAL').pvname)
         self._init_panel(self)
         self.Fit()
@@ -344 +345 @@
         label_STOP = wx.lib.stattext.GenStaticText(parent, wx.ID_ANY, 'STOP')
         
-        this_axis = self.GrandParent.axis
+        this_axis = self.axis_parent.axis
         self.w_name = Make_My_TextEntry(parent, this_axis.name,
                         True, u'local name for this axis', 
@@ -503 +504 @@
         stop = self.w_STOP_pv.GetValue()
         
-        self.GrandParent.disconnect()
-        self.GrandParent.axis = m_axis.SingleAxis(name, val, isMotorRecord, desc, dmov, egu, rbv, stop)
-        self.GrandParent.connect()
-        self.operate_panel.SetVAL( str(self.GrandParent.axis.axis.VAL) )
+        self.axis_parent.disconnect()
+        self.axis_parent.axis = m_axis.SingleAxis(name, val, isMotorRecord, desc, dmov, egu, rbv, stop)
+        self.axis_parent.connect()
+        self.operate_panel.SetVAL( str(self.axis_parent.axis.axis.VAL) )
     
     def revert(self):
         '''revert to existing PV name'''
         # restore widget fields from axis object
-        this_axis = self.GrandParent.axis
+        this_axis = self.axis_parent.axis
         self.w_name.SetValue( this_axis.name )
         self.w_VAL_pv.SetValue( this_axis.axis.get_pv('VAL').pvname )

moxy/trunk/src/moxy/vc_set.py ¶

@@ -89 +89 @@
         self.operate_list = []
         for axis in self.aset.axes:
-            obj = vc_axis.SingleAxisOperatePanel(panel, axis, False, None)
+            obj = vc_axis.SingleAxisOperatePanel(panel, False, None)
             self.operate_list.append( obj )