Changeset 167

Timestamp:

08/25/10 14:58:16 (12 years ago)

Author:

sc

Message:

synapse/Puzzlebox/Synapse/Interface_Design.py:

• tab order fixed

synapse/Puzzlebox/Synapse/Interface.py:

• second graph added to raw eeg wave tab

Location:

trunk/synapse

Files:

• Puzzlebox/Synapse/Interface.py (modified) (9 diffs)
• Puzzlebox/Synapse/Interface_Design.py (modified) (3 diffs)
• interface/puzzlebox_synapse_interface_design.ui (modified) (1 diff)

trunk/synapse/Puzzlebox/Synapse/Interface.py

@@ -75 +75 @@
 UPDATE_INTERFACE_VIA_TIMER = False
 
-UPDATE_INTERFACE_RAW_EEG_VIA_TIMER = False
-
+#INTERFACE_UPDATE_FREQUENCY = (1 / 512) * 1000 # ms (512 Hz)
 INTERFACE_UPDATE_FREQUENCY = 1000 # ms
-INTERFACE_RAW_EEG_UPDATE_FREQUENCY = (1 / 512) * 1000 # ms (512 Hz)
+
+INTERFACE_RAW_EEG_UPDATE_FREQUENCY = 256
 
 ### CLASSES ###
@@ -104 +104 @@
                 self.debug_console_buffer = ''
                 
-                if UPDATE_INTERFACE_VIA_TIMER or \
-                   UPDATE_INTERFACE_RAW_EEG_VIA_TIMER:
+                if UPDATE_INTERFACE_VIA_TIMER:
                         self.updateInterfaceTimer = QtCore.QTimer()
                         QtCore.QObject.connect(self.updateInterfaceTimer, \
@@ -165 +164 @@
                 
                 
-                #self.matplot = dynamicMatplotlibCanvas(QtGui.QWidget(self), width=5, height=4, dpi=100)
-                
-                #print dir(self.tabEEGSignals)
-                
-                self.matplot = dynamicMatplotlibCanvas(self.tabEEGSignals, width=8, height=4, dpi=100)
-                #self.matplotEEG = dynamicMatplotlibCanvas(self.tabEEGSignals, width=6, height=2, dpi=100)
-                #l.addWidget(matplot)
+                self.matplot = dynamicMatplotlibCanvas(self.tabEEGSignals, \
+                                                       width=8, \
+                                                       height=4, \
+                                                       dpi=100, \
+                                                       title='Raw EEG Waves')
         
         
@@ -298 +295 @@
                 
                 
-                if UPDATE_INTERFACE_RAW_EEG_VIA_TIMER:
-                        self.updateInterfaceTimer.start(INTERFACE_RAW_EEG_UPDATE_FREQUENCY)
-                elif UPDATE_INTERFACE_VIA_TIMER:
+                if UPDATE_INTERFACE_VIA_TIMER:
                         self.updateInterfaceTimer.start(INTERFACE_UPDATE_FREQUENCY)
                 
@@ -609 +604 @@
         """Ultimately, this is a QWidget (as well as a FigureCanvasAgg, etc.)."""
         
-        def __init__(self, parent=None, width=8, height=4, dpi=100):
+        def __init__(self, parent=None, width=8, height=4, dpi=100, title=None):
                 
                 fig = Figure(figsize=(width, height), dpi=dpi)
-                self.axes = fig.add_subplot(111)
+                self.axes_top = fig.add_subplot(211)
+                self.axes_bottom = fig.add_subplot(212)
                 # We want the axes cleared every time plot() is called
-                self.axes.hold(False)
-                
-                fig.suptitle('Raw EEG Waves', fontsize=12)
+                self.axes_top.hold(False)
+                self.axes_bottom.hold(False)
+                
+                if title != None:
+                        fig.suptitle(title, fontsize=12)
                 
                 FigureCanvas.__init__(self, fig)
@@ -625 +623 @@
                                                                                         QtGui.QSizePolicy.Expanding)
                 FigureCanvas.updateGeometry(self)
-        
-        
-        ##################################################################
-        
-        def compute_initial_figure(self):
-                pass
 
 
@@ -638 +630 @@
 class dynamicMatplotlibCanvas(matplotlibCanvas):
         
-        def __init__(self, *args, **kwargs):
+        def __init__(self,  *args, **kwargs):
                 
                 matplotlibCanvas.__init__(self, *args, **kwargs)
@@ -646 +638 @@
                 #timer = QtCore.QTimer(self)
                 #QtCore.QObject.connect(timer, QtCore.SIGNAL("timeout()"), self.update_figure)
-                #timer.start(250)
-                
-                self.values = []
-                
-                self.axes.autoscale_view(tight=None, scalex=False, scaley=False)
-                
-                self.axes.set_xbound(0, 256)
-                self.axes.set_ybound(-1024, 1024)
-                #self.axes.set_ybound(-2048, 2047)
-                
-                self.axes.set_autoscale_on(False)
+                #timer.start(256)
+                
+                self.update_top_frequency = \
+                   INTERFACE_RAW_EEG_UPDATE_FREQUENCY * 2
+                self.update_bottom_frequency = \
+                   INTERFACE_RAW_EEG_UPDATE_FREQUENCY
+                
+                self.values_top = []
+                self.values_bottom = []
+                
+                self.axes_top.set_xbound(0, self.update_top_frequency)
+                self.axes_top.set_ybound(-2048, 2047)
+                
+                self.axes_bottom.set_xbound(0, self.update_bottom_frequency)
+                self.axes_bottom.set_ybound(-512, 512)
+                
+                self.axes_top.set_autoscale_on(False)
+                self.axes_bottom.set_autoscale_on(False)
         
         
@@ -663 +662 @@
         def update_figure(self, value):
                 
-                self.values.append(value)
-                
-                if len(self.values) == 256:
-                        
-                        self.axes.plot(range(256), self.values, 'b-', scalex=False, scaley=False)
+                self.values_top.append(value)
+                self.values_bottom.append(value)
+                
+                if len(self.values_top) == self.update_top_frequency:
+                        
+                        self.axes_top.plot(range(self.update_top_frequency), \
+                                       self.values_top, \
+                                       'b-', \
+                                       scalex=False, \
+                                       scaley=False)
+                        
                         self.draw()
                         
-                        self.values = []
-        
-        
+                        self.values_top = []
+                
+                
+                if len(self.values_bottom) == self.update_bottom_frequency:
+                        
+                        self.axes_bottom.plot(range(self.update_bottom_frequency), \
+                                       self.values_bottom, \
+                                       'r-', \
+                                       scalex=False, \
+                                       scaley=False)
+                        
+                        self.draw()
+                        
+                        self.values_bottom = []
+        
+        

trunk/synapse/Puzzlebox/Synapse/Interface_Design.py

@@ -3 +3 @@
 # Form implementation generated from reading ui file 'interface/puzzlebox_synapse_interface_design.ui'
 #
-# Created: Thu Aug 19 18:23:15 2010
+# Created: Wed Aug 25 03:41:40 2010
 #      by: PyQt4 UI code generator 4.7.3
 #
@@ -18 +18 @@
 
 #from PyQt4 import QtCore, QtGui
+
 class Ui_Form(object):
         def setupUi(self, Form):
@@ -239 +240 @@
 
                 self.retranslateUi(Form)
-                self.tabWidget.setCurrentIndex(1)
+                self.tabWidget.setCurrentIndex(0)
                 QtCore.QMetaObject.connectSlotsByName(Form)
 

trunk/synapse/interface/puzzlebox_synapse_interface_design.ui

@@ -44 +44 @@
    </property>
    <property name="currentIndex">
-    <number>1</number>
+    <number>0</number>
    </property>
    <widget class="QWidget" name="tabThinkGearConnectServer">