Changeset 731

Timestamp:

Dec 20, 2011 4:46:55 PM (12 years ago)

Author:

jemian

Message:

needs more testing - threading?

Location:

moxy/trunk/src/moxy

Files:

• m_pv.py (modified) (5 diffs)
• vc_pv.py (modified) (1 diff)

moxy/trunk/src/moxy/m_pv.py

@@ -30 +30 @@
 # - - - - - - - - - - - - - - - - - - class
 
-class PvConnection:
+class PvConnection():
     '''
     A single EPICS Process Variable connection
@@ -40 +40 @@
     :param bool connected: Is PV connected with EPICS now?
     :param str connectedText: describes connection state for humans
-    :param str str_value: most recent value of EPICS PV
     '''
     
@@ -49 +48 @@
         self.connected = False
         self.connectedText = 'not connected'
-        self.str_value = ''
+        self.ext_callback = None
     
     def connect(self, callback = None, suppliedname = None, **kw):
@@ -68 +67 @@
                     char_value = repr(value)
                 print("%.32s %s %s" % (pvname, epics.pv.fmt_time(), char_value))
-                self.str_value = str(value)
 
         if len(pvname) > 0:    # PV name must not be an empty string
             self.channel = epics.PV(pvname, connection_callback=self.connection_cb)
             if callback is not None:
+                self.ext_callback = callback
                 self.cb_index = self.channel.add_callback(callback, **kw)
     
@@ -82 +81 @@
         self.connected = False
         self.channel = None
+        self.ext_callback = None
 
     def connection_cb(self, **metadata):
         "PV connection callback"
         self.connected = metadata['conn']       # connection state
+        self.connectedText = {True: 'connected', 
+                              False: 'not connected'}[self.connected]
+        if self.ext_callback is not None:
+            self.ext_callback(**metadata)
 
 

moxy/trunk/src/moxy/vc_pv.py

@@ -184 +184 @@
         self.w_value.SetValue( self.value )
     
+    def ColorSelector(self, index):
+        clut = [ COLOR_NOT_MOVING, COLOR_MOVING, 
+                 COLOR_PALE_PURPLE, COLOR_LIGHTGREEN, COLOR_LIGHTRED, ]
+        return clut[index % len(clut)]
+    
     def callback(self, **kw):
         "generic monitor callback"
         print kw
-        self.SetRemarks(kw['cb_info'])
-        self.SetValue(kw['value'])
-        self._cb_counter += 1
-        color = self.ColorSelector(self._cb_counter)
-        print self._cb_counter, color
-        self.w_value.SetBackgroundColour(color)
-    
-    def ColorSelector(self, index):
-        clut = [ COLOR_NOT_MOVING, COLOR_MOVING, COLOR_PALE_PURPLE, COLOR_LIGHTGREEN, COLOR_LIGHTRED, ]
-        return clut[index % len(clut)]
+        if 'conn' in kw.keys():
+            self.SetState({False: 'not connected', True: 'connected'}[kw['conn']])
+            if kw['conn']:
+                print "before...", kw['conn']
+                value = self.pv.channel.get()
+                self.SetValue( value )
+                print "HERE WE ARE...", value
+        else:
+            self.SetRemarks(kw['cb_info'])
+            self.SetValue(kw['value'])
+            self._cb_counter += 1
+            color = self.ColorSelector(self._cb_counter)
+            print self._cb_counter, color
+            self.w_value.SetBackgroundColour(color)