Changeset 702 for moxy/trunk/src

Timestamp:

Dec 2, 2011 4:06:57 PM (14 years ago)

Author:

jemian

Message:

making some real progress with the Traits-based GUI

Location:

moxy/trunk/src/moxy

Files:

• __init__.py (added)
• about.py (added)
• axes_set.py (modified) (4 diffs)
• connection.py (modified) (1 diff)
• moxy.py (modified) (5 diffs)
• positions_set.py (added)
• single_axis.py (modified) (3 diffs)
• table_row.py (added)
• version.py (added)

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

@@ -15 +15 @@
 Enthought Python Distribution. 
 
-Copyright (c) 2011, UChicago Argonne, LLC
+Copyright (c) 2009 - 2011, UChicago Argonne, LLC
 '''
 
 
-from enthought.traits.api import HasTraits, String, Instance, List
-from enthought.traits.ui.api import View, UItem, HGroup
+from enthought.traits.api import HasTraits, String, Instance, List, Button
+from enthought.traits.ui.api import View, UItem, VGrid, Label, UReadonly
 from single_axis import SingleAxis
 
@@ -33 +33 @@
     '''
     name = String
+    configButton = Button(Label=name)       # TODO: Label assignment does not work yet
     axes = List( Instance( SingleAxis ) )
+    stopButton = Button(Label='STOP')
+    
+    # TODO: need a view more like the prototype
+    # complication is when a PV is not connected
+    # which can probably be solved by some kind of Dependency Trait
+    '''
+    prototype
+    
+    ========  =========  =========  =========
+    axis      x         y          ...
+    ========  =========  =========  =========
+    readback  x_RBV     y_RBV      ..._RBV
+    target    x_VAL     y_VAL      ..._VAL
+    ========  =========  =========  =========
+    
+    [___________ STOP button ___________]
+    '''
     
     view = View(
                UItem('name', springy=True),
-               HGroup('axes', springy=True, style='custom'),
+               UItem('configButton'),
+               UItem('axes', springy=True, style='custom'),
+               UItem('stopButton'),
+               UItem('axes[0]', springy=True, style='custom'),
            )
+    
+    def _configButton_fired(self):
+        print 'configButton pressed'
+        self.axes[0].edit_traits()
+    
+    def _stopButton_fired(self):
+        print 'STOP pressed'
 
 
@@ -45 +73 @@
     from connection import PvConnection
     kw = { 'name' : 'test set of axes'}
-    axes = []
+    global_axes = []
     basic_config = {'x': 'prj:m1', 'y': 'prj:m2',}  # two test motor records
     for axis in sorted(basic_config):
@@ -53 +81 @@
             full_pv = base_pv + "." + field.upper()
             inner[ field.lower() ] = PvConnection( pvname = full_pv )
-        axes.append( SingleAxis(**inner) )
-    kw[ 'axes' ] = axes
+        global_axes.append( SingleAxis(**inner) )
+    kw[ 'axes' ] = global_axes
     
-    AxesSet(**kw).configure_traits()
+    # build the test view on-the-fly, based on the number of defined axes
+    vg_args = []
+    qty = len(global_axes)
+    grid = []
+    grid.append( Label('motor') )
+    for axis in global_axes:
+        grid.append( Label(axis.name) )
+    grid.append( Label('readback') )
+    for i in range(qty):
+        grid.append( UReadonly('a%d.rbv.pvname'%i) )
+    grid.append( Label('target') )
+    for i in range(qty):
+        grid.append( UItem('a%d.val.pvname'%i) )
+    gridkw = {'columns': qty+1}
+    vg_args.append( VGrid(*grid, **gridkw) )
+    vkw = {'resizable': True}
+    
+    traits_context = {}
+    for i in range(qty):
+        axis = global_axes[i]
+        traits_context['a%d'%i] = axis
+    
+    #AxesSet(**kw).configure_traits()
+    AxesSet(**kw).configure_traits(view=View(*vg_args, **vkw), context=traits_context)

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

@@ -15 +15 @@
 Enthought Python Distribution. 
 
-Copyright (c) 2011, UChicago Argonne, LLC
+Copyright (c) 2009 - 2011, UChicago Argonne, LLC
 '''
 

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

@@ -14 +14 @@
 ========================================
 
-Build the Graphical User Interface
-using the Traits library from the
-Enthought Python Distribution. 
+Built using the Traits library from the
+Enthought Python Distribution.
 
 Copyright (c) 2011, UChicago Argonne, LLC
@@ -31 +30 @@
     UndoAction, RedoAction, Separator, HelpAction
 from axes_set import AxesSet
+from positions_set import PositionsSet
 
 __svnid__ = "$Id$"
@@ -41 +41 @@
     def show_about(self, uinfo):
         '''About this application'''
-        print 'About ...', __svnid__
+        import about
+        about.About().edit_traits()
 
 
@@ -50 +51 @@
     '''
     axes_sets = Dict( String, Instance( AxesSet ))
-    user_positions = Dict( String, List( String ) )
+    user_positions = Dict( String, List( PositionsSet ) )
 
     status_label = String('status:')
@@ -118 +119 @@
     outer = {
              'axes_sets' : axes_sets,
-             'user_positions': {},
+             'user_positions': {'nothing': [PositionsSet()]},
              }
 

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

@@ -15 +15 @@
 Enthought Python Distribution. 
 
-Copyright (c) 2011, UChicago Argonne, LLC
+Copyright (c) 2009 - 2011, UChicago Argonne, LLC
 '''
 
 
-from enthought.traits.api import HasTraits, String, Instance
+from enthought.traits.api import HasTraits, String, Instance, Bool
+from enthought.traits.ui.api import View, Item
 from connection import PvConnection
 
@@ -38 +39 @@
     stop = Instance( PvConnection )
     desc = Instance( PvConnection )
+    isMotorRecord = Bool(True)
+    
+
+config_view = View(
+                   Item('axis.name'),
+                   Item('axis.val.pvname'),
+                   Item('axis.rbv.pvname'),
+              )
 
 if __name__ == '__main__':
@@ -48 +57 @@
     
     SingleAxis(**kw).configure_traits()
+    
+    single = SingleAxis(**kw)
+    single.configure_traits(view=config_view, context={'axis': single})