Changeset 715 for moxy/trunk/src

Timestamp:

Dec 15, 2011 5:37:28 PM (14 years ago)

Author:

jemian

Message:

improved default handling of motor records

Location:

moxy/trunk/src/moxy

Files:

• connection.py (modified) (1 diff)
• single_axis.py (modified) (2 diffs)

moxy/trunk/src/moxy/connection.py ¶

@@ -88 +88 @@
             self.disconnect()
     
-    def connect(self, callback = None):
-        name = self.pvname.strip()
+    def connect(self, callback = None, suppliedname = None):
+        '''
+        connect to the EPICS PV
+        
+        The name given in ``self.pvname`` will override a name supplied to this method.
+        If ``self.pvname`` is not given, then use ``suppliedname`` if it is given.
+        '''
+        pvname = self.pvname.strip()
+        name = pvname
+        if len(name) == 0 and suppliedname is not None:
+            name = suppliedname
         if len(name) > 0:    # PV name must not be an empty string
             self.channel = epics.PV(name, connection_callback=self.connection_cb)

moxy/trunk/src/moxy/single_axis.py ¶

@@ -123 +123 @@
     def connect(self, widget = None):
         '''connect all the PVs with EPICS'''
+        self.val.connect(callback=self._val_callback, suppliedname=self.val.pvname)
         if self.isMotorRecord:
-            pass    # TODO: do something!!!
-        self.val.connect(self._val_callback)
-        self.rbv.connect(self._rbv_callback)
-        self.egu.connect()
-        self.dmov.connect(self._dmov_callback)
-        self.stop.connect()
-        self.desc.connect()
+            base = self.val.pvname.strip().split(".")[0]
+            self.rbv.connect(callback=self._rbv_callback, suppliedname=base + ".RBV")
+            self.egu.connect(suppliedname=base + ".EGU")
+            self.dmov.connect(callback=self._dmov_callback, suppliedname=base + ".DMOV")
+            self.stop.connect(suppliedname=base + ".STOP")
+            self.desc.connect(suppliedname=base + ".DESC")
+        else:
+            self.rbv.connect(callback=self._rbv_callback)
+            self.egu.connect()
+            self.dmov.connect(callback=self._dmov_callback)
+            self.stop.connect()
+            self.desc.connect()
         self.widget = widget
         self.description = self.desc.channel.get()
@@ -192 +198 @@
     axis = SingleAxis(
         name = "test axis",
-        val = PvConnection(pvname = pv + ".VAL"),
-        isMotorRecord = True,   # FIXME: fix default handling of motor records
-        rbv = PvConnection(pvname = pv + ".RBV"),
-        egu = PvConnection(pvname = pv + ".EGU"),
-        desc = PvConnection(pvname = pv + ".DESC"),
-        dmov = PvConnection(pvname = pv + ".DMOV"),
-        stop = PvConnection(pvname = pv + ".STOP"),
+        val = PvConnection(pvname = pv),
+        isMotorRecord = True,
     )
+#    axis = SingleAxis(
+#        name = "test axis",
+#        val = PvConnection(pvname = pv + ".VAL"),
+#        isMotorRecord = False,
+#        rbv = PvConnection(pvname = pv + ".RBV"),
+#        egu = PvConnection(pvname = pv + ".EGU"),
+#        desc = PvConnection(pvname = pv + ".DESC"),
+#        dmov = PvConnection(pvname = pv + ".DMOV"),
+#        stop = PvConnection(pvname = pv + ".STOP"),
+#    )
     axis.connect()
     axis.configure_traits()