Changeset 376

Timestamp:

04/02/12 08:00:40 (9 years ago)

Author:

sc

Message:

• Tweaks on Jigsaw side

Location:

trunk/Puzzlebox/Synapse

Files:

• Interface.py (modified) (9 diffs)
• Server.py (modified) (1 diff)
• Session.py (modified) (3 diffs)

trunk/Puzzlebox/Synapse/Interface.py

@@ -62 +62 @@
         import pickle
 
+
 from Interface_Design import Ui_Form as Design
 
@@ -69 +70 @@
 import Puzzlebox.Synapse.ThinkGear.Server as thinkgear_server
 import Puzzlebox.Synapse.Emotiv.Server as emotiv_server
-#import puzzlebox_logger
 
 
@@ -116 +116 @@
         
         def __init__(self, log, \
-                     server=None, \
                      DEBUG=DEBUG, \
                      parent=None, \
@@ -155 +154 @@
                                                     QtCore.SIGNAL("timeout()"), \
                                                     self.updateInterface)
+                
+                
+                
+                self.activePlugins = []
+        
+        
+        ##################################################################
+        
+        def configureSettings(self):
+                
+                # Synapse Interface
+                image_path = "puzzlebox.ico"
+                if not os.path.exists(image_path):
+                        image_path = os.path.join(DEFAULT_IMAGE_PATH, image_path)
+                
+                if os.path.exists(image_path):
+                        icon = QtGui.QIcon()
+                        icon.addPixmap(QtGui.QPixmap(image_path), \
+                                            QtGui.QIcon.Normal, \
+                                            QtGui.QIcon.Off)
+                        self.setWindowIcon(icon)
+                
+                image_path = "puzzlebox_logo.png"
+                if not os.path.exists(image_path):
+                        image_path = os.path.join(DEFAULT_IMAGE_PATH, image_path)
+                if os.path.exists(image_path):
+                        self.labelPuzzleboxIcon.setPixmap(QtGui.QPixmap(image_path))
                 
                 
@@ -180 +206 @@
                                 print "DEBUG: User default path not found"
                         self.homepath = os.getcwd()
-                
-                
-                self.activePlugins = []
-        
-        
-        ##################################################################
-        
-        def configureSettings(self):
-                
-                # Synapse Interface
-                image_path = "puzzlebox.ico"
-                if not os.path.exists(image_path):
-                        image_path = os.path.join(DEFAULT_IMAGE_PATH, image_path)
-                
-                if os.path.exists(image_path):
-                        icon = QtGui.QIcon()
-                        icon.addPixmap(QtGui.QPixmap(image_path), \
-                                            QtGui.QIcon.Normal, \
-                                            QtGui.QIcon.Off)
-                        self.setWindowIcon(icon)
-                
-                image_path = "puzzlebox_logo.png"
-                if not os.path.exists(image_path):
-                        image_path = os.path.join(DEFAULT_IMAGE_PATH, image_path)
-                if os.path.exists(image_path):
-                        self.labelPuzzleboxIcon.setPixmap(QtGui.QPixmap(image_path))
                 
                 
@@ -294 +294 @@
         ##################################################################
         
+        def updateInterface(self):
+                
+                if not self.synapseServer.emulate_headset_data:
+                        #self.processPacketThinkGear( \
+                        self.processPacketEEG( \
+                                self.synapseServer.protocol.data_packet)
+        
+        
+        ##################################################################
+        
+        def updateDevices(self):
+                
+                if (self.parent != None):
+                        source = self.parent
+                else:
+                        source = self
+                
+                model = source.comboBoxEEGHeadsetModel.currentText()
+                
+                devices = self.searchForDevices()
+                
+                source.comboBoxDeviceSelect.clear()
+                
+                if (model == 'NeuroSky MindWave' or \
+                    model == 'NeuroSky MindSet' or \
+                    model == 'NeuroSky MindWave Mobile'):
+                        
+                        devices.insert(0, 'ThinkGear Emulator')
+                
+                elif (model == 'Emotiv EPOC'):
+                        
+                        devices.insert(0, 'EmoComposer')
+                        devices.insert(0, 'Emotiv Control Panel')
+                
+                
+                for device in devices:
+                        source.comboBoxDeviceSelect.addItem(device)
+        
+        
+        ##################################################################
+        
         def startSynapseServer(self):
                 
                 eeg_headset_model = str(self.comboBoxEEGHeadsetModel.currentText())
-                device_address = str(self.comboBoxDeviceSelect.currentText())
+                #device_address = str(self.comboBoxDeviceSelect.currentText())
                 server_interface = str(self.lineEditSynapseHost.text())
                 server_port = int(self.lineEditSynapsePort.text())
@@ -366 +407 @@
                 
                 eeg_headset_model = str(self.comboBoxEEGHeadsetModel.currentText())
-                device_address = str(self.comboBoxDeviceSelect.currentText())
+                #device_address = str(self.comboBoxDeviceSelect.currentText())
                 
                 if ((eeg_headset_model == 'NeuroSky MindWave Mobile') or \
@@ -551 +592 @@
         ##################################################################
         
-        def updateInterface(self):
-                
-                if not self.synapseServer.emulate_headset_data:
-                        #self.processPacketThinkGear( \
-                        self.processPacketEEG( \
-                                self.synapseServer.protocol.data_packet)
-        
-        
-        ##################################################################
-        
-        def updateDevices(self):
-                
-                if (self.parent != None):
-                        source = self.parent
-                else:
-                        source = self
-                
-                model = source.comboBoxEEGHeadsetModel.currentText()
-                
-                devices = self.searchForDevices()
-                
-                source.comboBoxDeviceSelect.clear()
-                
-                if (model == 'NeuroSky MindWave' or \
-                    model == 'NeuroSky MindSet' or \
-                    model == 'NeuroSky MindWave Mobile'):
-                        
-                        devices.insert(0, 'ThinkGear Emulator')
-                
-                elif (model == 'Emotiv EPOC'):
-                        
-                        devices.insert(0, 'EmoComposer')
-                        devices.insert(0, 'Emotiv Control Panel')
-                
-                
-                for device in devices:
-                        source.comboBoxDeviceSelect.addItem(device)
-        
-        
-        ##################################################################
-        
         def processPacketEEG(self, packet):
                 
@@ -622 +622 @@
                         return
                 else:
+                        # NOTE: This is also logging Emotiv packets to 'signals'
                         self.packets['signals'].append(packet)
                 

trunk/Puzzlebox/Synapse/Server.py

@@ -33 +33 @@
         from PyQt4 import QtCore, QtGui, QtNetwork
 
+
 #####################################################################
 # Globals

trunk/Puzzlebox/Synapse/Session.py

@@ -46 +46 @@
 DEBUG = configuration.DEBUG
 
+PACKET_MINIMUM_TIME_DIFFERENCE_THRESHOLD = 0.75
+
 
 #####################################################################
@@ -117 +119 @@
                 session_time = self.calculateSessionTime()
                 
-                if source == None:
-                        if self.parent == None:
-                                source = self
-                        else:
-                                source = self.parent
-                
-                if target == None:
-                        if self.parent == None:
-                                target = self
-                        else:
-                                target = self.parent
-                
-                target.textLabelSessionTime.setText(session_time)
+                #if source == None:
+                        #if self.parent == None:
+                                #source = self
+                        #else:
+                                #source = self.parent
+                
+                #if target == None:
+                        #if self.parent == None:
+                                #target = self
+                        #else:
+                                #target = self.parent
+                
+                #target.textLabelSessionTime.setText(session_time)
+                self.textLabelSessionTime.setText(session_time)
                 
                 try:
-                        target.textLabelPacketsReceived.setText( "%i" % \
-                                source.synapseServer.protocol.packet_count)
+                        #target.textLabelPacketsReceived.setText( "%i" % \
+                                #source.synapseServer.protocol.packet_count)
+                        self.textLabelPacketsReceived.setText( "%i" % \
+                                self.synapseServer.protocol.packet_count)
                 except:
                         pass
                 
                 try:
-                        target.textLabelPacketsDropped.setText( "%i" % \
-                                source.synapseServer.protocol.bad_packets)
+                        #target.textLabelPacketsDropped.setText( "%i" % \
+                                #source.synapseServer.protocol.bad_packets)
+                        self.textLabelPacketsDropped.setText( "%i" % \
+                                self.synapseServer.protocol.bad_packets)
                 except:
                         pass
@@ -148 +155 @@
         def calculateSessionTime(self):
                 
-                if self.parent == None:
-                        server = self.synapseServer
-                else:
-                        server = self.parent.synapseServer
+                #if self.parent == None:
+                        #server = self.synapseServer
+                #else:
+                        #server = self.parent.synapseServer
                 
                 session_time = time.time() - \
-                        server.session_start_timestamp
+                        self.synapseServer.session_start_timestamp
+                        #server.session_start_timestamp
                         #server.protocol.session_start_timestamp