Changeset 844

Timestamp:

Apr 29, 2012 10:00:41 AM (12 years ago)

Author:

jemian

Message:

ready for next step

Location:

moxy/trunk/src/moxy/qtlib

Files:

• __init__.py (modified) (1 diff)
• caqlabel.py (moved) (moved from moxy/trunk/src/moxy/qtlib/CaQLabel.py) (5 diffs)
• pv.py (modified) (3 diffs)
• tools.py (modified) (2 diffs)

moxy/trunk/src/moxy/qtlib/__init__.py

@@ +1 @@
+
+'''
+PySide-based EPICS-aware widgets for Python
+'''
+
+########### SVN repository information ###################
+# $Date$
+# $Author$
+# $Revision$
+# $URL$
+# $Id$
+########### SVN repository information ###################
+
+import caqlabel
+import tools
+
+CaQLabel     = caqlabel.CaQLabel
+CaQSignalDef = tools.CaQSignalDef
+enum         = tools.enum

moxy/trunk/src/moxy/qtlib/caqlabel.py

@@ -16 +16 @@
 '''
 
+
+__version__ = '0.1'
+
+
 import epics
 import sys              #@UnusedImport
-import PySide.QtGui
-import tools
+from PySide import QtGui
 import pprint           #@UnusedImport
 
-class CaQLabel(PySide.QtGui.QLabel):
+from tools import CaQSignalDef, enum
+
+class CaQLabel(QtGui.QLabel):
     '''
     Provide the value of an EPICS PV on a PySide.QtGui.QLabel
@@ -33 +38 @@
         '''
         self.text = ' '*4
-        PySide.QtGui.QLabel.__init__(self, self.text)
+        QtGui.QLabel.__init__(self, self.text)
 
         # define the signals we'll use in the camonitor handler to update the GUI
-        self.labelSignal = tools.CaQSignalDef()
+        self.labelSignal = CaQSignalDef()
         self.labelSignal.newBgColor.connect(self.SetBackgroundColor)
         self.labelSignal.newText.connect(self.SetText)
         
-        self.states = tools.enum('DISCONNECTED', 'CONNECTED', 'ALARM')
+        self.states = enum('DISCONNECTED', 'CONNECTED', 'ALARM')
         self.clut = {   # clut: Color LookUp Table
             self.states.DISCONNECTED:     "#ffffff",      # white
@@ -132 +137 @@
 
 
-class DemoView(PySide.QtGui.QWidget):
+class DemoView(QtGui.QWidget):
     '''
     Show an EPICS PV connection.
@@ -140 +145 @@
 
     def __init__(self, parent=None, pvname=''):
-        PySide.QtGui.QWidget.__init__(self, parent)
+        QtGui.QWidget.__init__(self, parent)
         self.value  = CaQLabel()
 
-        grid = PySide.QtGui.QGridLayout()
+        grid = QtGui.QGridLayout()
         grid.addWidget(self.value,   0,0)
         self.setLayout(grid)
 
-        self.sig = tools.CaQSignalDef()
+        self.sig = CaQSignalDef()
         self.sig.newBgColor.connect(self.SetBackgroundColor)
         self.toggle = False
@@ -177 +182 @@
 
 if __name__ == '__main__':
-    app = PySide.QtGui.QApplication(sys.argv)
+    app = QtGui.QApplication(sys.argv)
     _demo = DemoView(pvname='prj:datetime')
     _demo.show()

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

@@ -18 +18 @@
 
 import sys
-import PySide.QtGui
-from CaQLabel import CaQLabel
-import tools
+from PySide import QtGui
+from caqlabel import CaQLabel
+from tools import CaQSignalDef
 
 
-class DemoView(PySide.QtGui.QWidget):
+class DemoView(QtGui.QWidget):
     '''
     Show an EPICS PV connection.
@@ -31 +31 @@
 
     def __init__(self, parent=None, pvname=''):
-        PySide.QtGui.QWidget.__init__(self, parent)
+        QtGui.QWidget.__init__(self, parent)
 
-        name_label  = PySide.QtGui.QLabel("PV Name:")
-        self.pvname = PySide.QtGui.QLineEdit(pvname)
+        name_label  = QtGui.QLabel("PV Name:")
+        self.pvname = QtGui.QLineEdit(pvname)
         self.pvname.returnPressed.connect(self.onPVNameReturn)
-        value_label = PySide.QtGui.QLabel("PV Value:")
+        value_label = QtGui.QLabel("PV Value:")
         self.value  = CaQLabel()  
         
-        status_label  = PySide.QtGui.QLabel("status:")
-        self.status  = PySide.QtGui.QLabel("just starting")
+        status_label  = QtGui.QLabel("status:")
+        self.status  = QtGui.QLabel("just starting")
         self.status_text = ''
         
-        content_label  = PySide.QtGui.QLabel("content:")
-        self.content  = PySide.QtGui.QLabel("just starting")
+        content_label  = QtGui.QLabel("content:")
+        self.content  = QtGui.QLabel("just starting")
         self.content_text = ''
 
-        self.sig_status = tools.CaQSignalDef()
+        self.sig_status = CaQSignalDef()
         self.sig_status.newText.connect(self.SetStatus)
-        self.sig_content = tools.CaQSignalDef()
+        self.sig_content = CaQSignalDef()
         self.sig_content.newText.connect(self.SetContent)
 
-        grid = PySide.QtGui.QGridLayout()
+        grid = QtGui.QGridLayout()
         grid.addWidget(name_label,    0, 0)
         grid.addWidget(self.pvname,   0, 1)
@@ -88 +88 @@
 
 if __name__ == '__main__':
-    app = PySide.QtGui.QApplication(sys.argv)
+    app = QtGui.QApplication(sys.argv)
     probe = DemoView(pvname='prj:datetime')
     probe.show()

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

@@ -20 +20 @@
 
 
-import PySide
+from PySide import QtCore
 
 
@@ -32 +32 @@
 
 
-class CaQSignalDef(PySide.QtCore.QObject):
+class CaQSignalDef(QtCore.QObject):
     '''
     Define the signals used to communicate between the PyEpics
     thread and the PySide (main Qt4 GUI) thread.
     '''
+    # see: http://www.pyside.org/docs/pyside/PySide/QtCore/Signal.html
     # see: http://zetcode.com/gui/pysidetutorial/eventsandsignals/
-    # TODO: there must be an easier way to do this!
-    # Some way that does not cache the event data and 
-    # receiver apart from the emitter.
-    # Use events.  Look at other's code.
     
-    newFgColor = PySide.QtCore.Signal()
-    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
+    newFgColor = QtCore.Signal()
+    newBgColor = QtCore.Signal()
+    newText    = QtCore.Signal()