Changeset 708 for moxy/trunk/src

Timestamp:

Dec 8, 2011 4:56:00 PM (13 years ago)

Author:

jemian

Message:

added EPD example of traitsui with dynamic view as test6, can modify and adapt test5 which is direct copy of current moxy gui

Location:

moxy/trunk/src

Files:

• moxy/axes_set.py (modified) (2 diffs)
• moxy/connection.py (modified) (2 diffs)
• moxy/moxy.py (modified) (4 diffs)
• moxy/runner.py (modified) (8 diffs)
• moxy/single_axis.py (modified) (1 diff)
• test/test4.py (modified) (2 diffs)
• test/test5.py (added)
• test/test6.py (added)

moxy/trunk/src/moxy/axes_set.py ¶

@@ -20 +20 @@
 
 from traits.api import *
+from traitsui.api import *
 
 from single_axis import SingleAxis
@@ -52 +53 @@
     def _stopButton_fired(self):
         for axis in self.axes:
-            axis.stop()
+            axis.stopMotion()
+    
+    ''' should show something like this::
+
+            vgrid = VGrid(
+                Label('field'),             Label('X axis'),        Label('Y axis'),
+                Label('readback (RBV)'),    UReadonly('x_RBV'),     UReadonly('y_RBV'),
+                Label('target (VAL)'),      UItem('x_VAL'),         UItem('y_VAL'), 
+                columns = 3,
+                show_border=True,
+            )
+            View( vgrid, UItem('stopButton'), )
+
+    '''
+    
+    axes_set_view = View(
+           UItem('name', springy=True),
+           UItem('configButton'),
+           UItem('axes', springy=True, style='custom'),
+           UItem('stopButton'),
+           UItem('axes[0]', springy=True, style='custom'),
+       )
 
 

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

@@ -38 +38 @@
     
     def connect(self, callback = None):
-        if len(self.pvname.strip()) > 0:
+        if len(self.pvname.strip()) > 0:    # PV name must not be an empty string
             self.channel = epics.PV(self.pvname)
             #self.channel.get()
@@ -46 +46 @@
     def disconnect(self):
         '''stop monitoring the PV for CA callbacks and drop the channel'''
-        if self.cb_index != 0:
+        if self.cb_index != 0 and self.channel is not None:
             self.channel.remove_callback(self.cb_index)
+            self.cb_index = 0
         self.channel = None
 

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

@@ -25 +25 @@
 
 
-from traits.api import *
-from traitsui.api import *
-from traitsui.menu import *
+from traits.api import *      #@UnusedWildImport
+from traitsui.api import *    #@UnusedWildImport
+from traitsui.menu import *   #@UnusedWildImport
 
 from axes_set import AxesSet
 from single_axis import SingleAxis
+from connection import PvConnection
+import about
 
 __svnid__ = "$Id$"
@@ -40 +42 @@
 
     def show_about(self, uinfo):
-        '''About this application'''
-        import about
+        '''About this application ...'''
         about.About().edit_traits()
 
@@ -50 +51 @@
     a table of user-defined positions
     '''
-    axes_sets = List( 
+    axes_list = List( 
                     Instance( AxesSet ), 
                     help='One or more sets of axes that describe an instrument setting (or settings).'
                 )
-    #axes_sets = [ AxesSet( axes=[SingleAxis()] ) ]
-    thing = List( Instance( Str ) )
 
     status_label = Str('status:')
@@ -82 +81 @@
     def connect(self):
         '''Connect all the axes sets with EPICS'''
-        for a_set in self.axes_sets:
+        for a_set in self.axes_list:
             a_set.connect()
 
     def disconnect(self):
         '''Disconnect all the axes sets from EPICS'''
-        for a_set in self.axes_sets:
+        for a_set in self.axes_list:
             a_set.disconnect()
-    
+
     view = View(
                 Group(
                     UItem( 'axes_sets' ),
-                    label = 'Moxy axis set',
                     show_border = True,
                     scrollable = True,
+                    layout = 'tabbed',
+                ),
+                Group(
+                    UItem( 'axes_sets' ),
+                    label = 'again',
+                    show_border = True,
+                    scrollable = True,
+                    layout = 'tabbed',
                 ),
                 title="Moxy (development) GUI",

moxy/trunk/src/moxy/runner.py ¶

@@ -38 +38 @@
 
 
+# =================================================================================
+
+
 def demo_moxy_plain():
     Moxy().configure_traits()
 
 
-def demo_moxy():
-    kw = { 'name' : 'test set of axes'}
-    axes = single_axis_setup(x='prj:m1', y='prj:m2') # two test motor records
-    kw[ 'axes' ] = axes
-    axes_sets = [AxesSet(**kw) ]
-    
-    outer = {
-             'axes_sets' : axes_sets,
-             }
-    
-    mxy = Moxy( **outer )
-    mxy.connect()
-    for axis in axes:
-        print axis.desc.channel.get()
-    mxy.configure_traits()  # needs a custom view
-    mxy.disconnect()
+# =================================================================================
+
 
 # TODO: need a view more like the prototype
@@ -83 +72 @@
        )
 
+def demo_moxy():
+    kw = { 'name' : 'test set of axes'}
+    axes_xy = single_axis_setup(x='prj:m1', y='prj:m2') # two test motor records
+    axes_uvw = single_axis_setup(u='prj:m3', v='prj:m4', w='prj:m5') # three test motor records
+    kw[ 'axes' ] = axes_xy
+    axes_sets = [AxesSet(**{'name': 'xy ', 'axes': axes_xy}), 
+                 AxesSet(**{'name': 'uvw', 'axes': axes_uvw}) ]
+    
+    outer = {
+             'axes_sets' : axes_sets,
+             }
+    
+    mxy = Moxy( **outer )
+    mxy.connect()
+    for a_set in axes_sets:
+        for axis in a_set.axes:
+            print a_set.name + ", ", axis.desc.channel.get(), ' = ', axis.rbv.channel.get()
+    mxy.configure_traits()  # needs a custom view
+    mxy.disconnect()
+
+
+# =================================================================================
+
+
 def demo_axes_set():
-    kw = { 'name' : 'test set of axes'}
-    global_axes = single_axis_setup(x='prj:m1', y='prj:m2') # two test motor records
-    kw[ 'axes' ] = global_axes
+    axes = single_axis_setup(x='prj:m1', y='prj:m2') # two test motor records
     
     # build the test view on-the-fly, based on the number of defined axes
     vg_args = []
-    qty = len(global_axes)
+    qty = len(axes)
     grid = []
     grid.append( Heading('motor') )
-    for axis in global_axes:
+    for axis in axes:
         grid.append( Heading(axis.name) )
     grid.append( Label('readback') )
@@ -107 +118 @@
     traits_context = {}
     for i in range(qty):
-        axis = global_axes[i]
+        axis = axes[i]
         traits_context['a%d'%i] = axis
     
-    #AxesSet().configure_traits()
-    
-    # use_notebook  = True
-    
+    kw = { 'name' : 'test set of axes'}
+    kw[ 'axes' ] = axes
     a_set = AxesSet(**kw)
     a_set.connect()
@@ -132 +141 @@
               )
     # TODO: Can I make a green border appear if moving?  That's in the View!
+    # Easier (not as compact) to make text appear/not based on a Bool
 
 single_axis_view = View(
@@ -144 +154 @@
     )
 
+
+# =================================================================================
+
+
 def demo_single_axis():
     # test routine
@@ -154 +168 @@
     single.configure_traits()
     single.disconnect()
+
+
+# =================================================================================
 
 
@@ -173 +190 @@
 
 
+# =================================================================================
+
+
 def pv_connections(axis_name, base_pv):
     '''standardize the connection setup'''
@@ -193 +213 @@
 
 
+# =================================================================================
+
+
 if __name__ == '__main__':
     #demo_connection()
-    demo_single_axis()
+    #demo_single_axis()
     #demo_axes_set()
     demo_moxy()

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

@@ -69 +69 @@
             pv.disconnect()
     
-    def stop(self):
+    def stopMotion(self):
         '''tell EPICS to stop moving this axis'''
         if self.stop is not None and self.stop.channel is not None:

moxy/trunk/src/test/test4.py ¶

@@ -74 +74 @@
             ),
                 label = 'group: One',
+                layout = 'tabbed',
         ),
         Group(
@@ -81 +82 @@
 
 
-#DemoLower().configure_traits()
+DemoLower().configure_traits()
 
 #-------------------------------------------------------------------------------------