Changeset 842

Timestamp:

Apr 28, 2012 7:19:36 AM (12 years ago)

Author:

jemian

Message:

finish off pv.py GUI demo, add TODO items

Location:

moxy/trunk/src/moxy/qtlib

Files:

• CaQLabel.py (modified) (1 diff)
• pv.py (modified) (3 diffs)
• tools.py (modified) (1 diff)

moxy/trunk/src/moxy/qtlib/CaQLabel.py

@@ -26 +26 @@
     Provide the value of an EPICS PV on a PySide.QtGui.QLabel
     '''
+    # TODO: need to superclass a lot of this
 
     def __init__(self, text=''):

moxy/trunk/src/moxy/qtlib/pv.py

@@ -45 +45 @@
 import PySide.QtGui
 from CaQLabel import CaQLabel
+import tools
 
 
@@ -61 +62 @@
         self.pvname.setText(pvname)
         value_label = PySide.QtGui.QLabel("PV Value:")
-        self.value  = CaQLabel(" "*4)      
+        self.value  = CaQLabel(" "*4)  
+        
+        status_label  = PySide.QtGui.QLabel("status:")
+        self.status  = PySide.QtGui.QLabel("just starting")
+        self.status_text = ''
+        
+        content_label  = PySide.QtGui.QLabel("content:")
+        self.content  = PySide.QtGui.QLabel("just starting")
+        self.content_text = ''
+
+        self.sig_status = tools.CaQSignalDef()
+        self.sig_status.newText.connect(self.SetStatus)
+        self.sig_content = tools.CaQSignalDef()
+        self.sig_content.newText.connect(self.SetContent)
 
         self.pvname.returnPressed.connect(self.onPVNameReturn)
 
         grid = PySide.QtGui.QGridLayout()
-        grid.addWidget(name_label,   0, 0)
-        grid.addWidget(self.pvname,  0, 1)
-        grid.addWidget(value_label,  1, 0)
-        grid.addWidget(self.value,   1, 1)
+        grid.addWidget(name_label,    0, 0)
+        grid.addWidget(self.pvname,   0, 1)
+        grid.addWidget(value_label,   1, 0)
+        grid.addWidget(self.value,    1, 1)
+        grid.addWidget(status_label,  2, 0)
+        grid.addWidget(self.status,   2, 1)
+        grid.addWidget(content_label, 3, 0)
+        grid.addWidget(self.content,  3, 1)
 
         self.setLayout(grid)
@@ -82 +100 @@
     
     def connect_update(self, **kw):
-        print kw['conn']
+        self.status_text = {True: 'connected', False: 'disconnected'}[ kw['conn'] ]
+        self.sig_status.newText.emit()
     
     def pv_update(self, **kw):
-        print kw['char_value'], kw['timestamp']
+        self.content_text = "updated:" + str(kw['timestamp'])
+        self.sig_content.newText.emit()
+    
+    def SetStatus(self):
+        self.status.setText(self.status_text)
+    
+    def SetContent(self):
+        self.content.setText(self.content_text)
 
 

moxy/trunk/src/moxy/qtlib/tools.py

@@ -46 +46 @@
     newBgColor = PySide.QtCore.Signal()
     newText    = PySide.QtCore.Signal()
+    # TODO: Can we have the caller give the list of signals to create?
+    # Signal v SignalInstance: we want the latter