Changeset 810

Timestamp:

Apr 22, 2012 5:45:27 PM (12 years ago)

Author:

jemian

Message:

updates and simplifications

File:

• moxy/trunk/src/test/SimpleTraitsEpicsTest.py (modified) (8 diffs)

moxy/trunk/src/test/SimpleTraitsEpicsTest.py

@@ -9 +9 @@
 ########### SVN repository information ###################
 
-doc = '''
+DOC = '''
 Demonstration of EPICS Probe Application
 using Traits and
@@ -28 +28 @@
 
 choose_Qt4 = True
-#choose_Qt4 = False
+choose_Qt4 = False
 from traits.etsconfig.api import ETSConfig
 if choose_Qt4:
@@ -66 +66 @@
         logger = logging.getLogger(__name__)
         logger.debug("callback: %s = %s" % (kw['pvname'], kw['char_value']))
-        #self._gui.pv_value = kw['char_value']
-        GUI.invoke_later(self._gui.SetPvValue, kw['char_value'])
+        self._gui.pv_value = kw['char_value']
+        #GUI.invoke_later(self._gui.SetPvValue, kw['char_value'])
     
     def ca_connect_callback(self, **kw):
@@ -74 +74 @@
         event information will be in kw dictionary
         '''
-        GUI.invoke_later(self._gui.SetStatus, "%s connected=%s" % (kw['pvname'], kw['conn']))
-        #self._gui.SetStatus("%s connected=%s" % (kw['pvname'], kw['conn']))
+        self._gui.SetStatus("%s connected=%s" % (kw['pvname'], kw['conn']))
+        #GUI.invoke_later(self._gui.SetStatus, "%s connected=%s" % (kw['pvname'], kw['conn']))
     
     def do_watch(self, uinfo):
@@ -149 +149 @@
         self.define_gui(uinfo)
         self._gui.SetStatus('showing About box')
-        ShowAbout().edit_traits()
+        ShowAbout(text=DOC).edit_traits()
     
     def show_info(self, uinfo):
@@ -156 +156 @@
         if self._watching and self._ch is not None:
             self._gui.SetStatus('showing PV info')
-            ShowInfo(self._ch).edit_traits()
+            ShowInfo(text=self._ch.info).edit_traits()
         else:
             self._gui.SetStatus('must Watch a PV first')
@@ -174 +174 @@
 
     my_button_actions = [
-        Action(name="Watch",  action="do_watch",   desc="start monitoring PV"),
+        Action(name="Start",  action="do_watch",   desc="start monitoring PV"),
         Action(name="Info",   action="show_info",  desc="show PV info"),
-        Action(name="Ignore", action="undo_watch", desc="stop monitoring PV"),
+        Action(name="Stop",   action="undo_watch", desc="stop monitoring PV"),
         Action(name="About",  action='show_about', desc="describe this application"),
     ]
@@ -223 +223 @@
     '''dead simple PV Info box'''
     text = Str
-    view = View( UReadonly('text'))
-
-    def __init__(self, ch, **kwtraits):
-        '''sets initial status message'''
-        super(ShowInfo, self).__init__(**kwtraits)
-        self.text = str(ch.info)
+    view = View( UReadonly('text'), title='PV info ...' )
     
 
 class ShowAbout( HasTraits ):
     '''dead simple About box'''
-    desc = Str(doc)
-    view = View( UReadonly('desc'))
+    text = Str
+    view = View( UReadonly('text'), title='About ...' )