Changeset 643

Timestamp:

Oct 4, 2011 5:24:14 PM (12 years ago)

Author:

jemian

Message:

add threading

Location:

moxy/trunk/src/moxy

Files:

• examples/simple-test.xml (modified) (2 diffs)
• index.html (modified) (1 diff)
• moxy_axis.py (modified) (3 diffs)
• pair.py (modified) (8 diffs)

moxy/trunk/src/moxy/examples/simple-test.xml

@@ -1 +1 @@
 <?xml version="1.0" ?>
-<moxy date="2011-10-04" time="01:23:16" version="1.0">
+<moxy date="2011-10-04" time="17:17:17" version="1.0">
   <XYpair name="a1y &amp; a2y test motors" selected="True">
     <EPICS_configuration>
@@ -17 +17 @@
       <row name="0.2 mm below" x="-0.01997" y="24.98001"/>
       <row name="my starting position" x="1.1" y="2.2"/>
+      <row name="small change up" x="2" y="3"/>
+      <row name="small change down" x="0.5" y="0.5"/>
+      <row name="zero" x="0" y="0"/>
     </tab>
   </XYpair>

moxy/trunk/src/moxy/index.html

@@ -24 +24 @@
                                                 <h2>A GUI tool for EPICS</h2>
                                                 <br/><b>author: Pete R. Jemian (jemian@anl.gov)</b>
-                                                <br/><b>version: 0.5</b>
+                                                <br/><b>version: 0.6</b>
                                         </td>
                                         <td valign="top"><img 

moxy/trunk/src/moxy/moxy_axis.py

@@ -28 +28 @@
 import copy
 import time
+import threading
 
 
@@ -33 +34 @@
 
 
-class Axis:
+class Axis(threading.Thread):
     '''
-    EPICS PVs and connections for one axis
+    EPICS PVs and connections for one axis.
+    Run the EPICS PV monitors in a separate thread so the GUI can be updated.
     
     Example use::
@@ -52 +54 @@
     def __init__(self):
         '''declare initial storage'''
+        threading.Thread.__init__(self)
         self.db = {}                # internal data
         self.pvname = {}            # actual PV name for each field

moxy/trunk/src/moxy/pair.py

@@ -11 +11 @@
 #*************************************************************************
 
-'''
-Define the GUI elements and interface for one X,Y pair
-
-@version: 
 ########### SVN repository information ###################
 # $Date$
@@ -22 +18 @@
 # $Id$
 ########### SVN repository information ###################
+
+'''
+Define the GUI elements and interface for one X,Y pair
 '''
 
@@ -348 +347 @@
     def SetEpicsConfig(self, config):
         '''define the EPICS PVs from a configuration
-           @param config: Python dictionary with axes configurations'''
+        
+        :param dict config: Python dictionary with axes configurations
+        '''
         for axis in ['x', 'y']:
             self.epics[axis].SetConfigure(copy.deepcopy(config[axis]))
@@ -358 +359 @@
         field = kw['field']
         value = kw['value']
-        print "onChangePositions", axis, field, value
+        #print "onChangePositions", axis, field, value
         if 'precision' in kw:
             # what about display precision?
@@ -370 +371 @@
         else:
             str_value = str(value)
-        # TODO: either callbacks or widget updates should be in a different thread
         self.widget[axis][field].SetLabel(str_value)
         self.Layout()
@@ -380 +380 @@
         field = kw['field']
         value = kw['value']
-        print "onChangePositions", axis, field, value
+        #print "onChangeTitle", axis, field, value
         self.titles[axis][field] = value
         title = "%s, %s" % (self.titles[axis]['DESC'], self.titles[axis]['EGU'])
-        # TODO: either callbacks or widget updates should be in a different thread
         self.widget[axis]['title'].SetLabel(title)
 
@@ -392 +391 @@
         axis = kw['axis']
         value = kw['value']
-        # TODO: either callbacks or widget updates should be in a different thread
         self.SetMotorColor(axis, value == 1)
 
@@ -410 +408 @@
             if not item.Connect(**redirects):
                 raise RuntimeError, "Did not connect %s axis" % axis
+            # TODO: initial RBV connection does not generate a monitor, fake it here somehow
 
     def ReleaseEpics(self):