Changeset 374

Timestamp:

04/02/12 05:47:52 (9 years ago)

Author:

sc

Message:

• reset session time issue fixed

Location:

trunk/Puzzlebox/Synapse

Files:

• Interface.py (modified) (7 diffs)
• Session.py (modified) (1 diff)

trunk/Puzzlebox/Synapse/Interface.py

@@ -69 +69 @@
 import Puzzlebox.Synapse.ThinkGear.Server as thinkgear_server
 import Puzzlebox.Synapse.Emotiv.Server as emotiv_server
-#import Puzzlebox.Synapse.Emotiv.Client as emotiv_client
 #import puzzlebox_logger
 
@@ -112 +111 @@
 #####################################################################
 
-#class puzzlebox_synapse_interface(QtGui.QWidget, Design, Puzzlebox.Synapse.Session.puzzlebox_synapse_session):
 class puzzlebox_synapse_interface(synapse_device.puzzlebox_synapse_device, \
                                   synapse_session.puzzlebox_synapse_session, \
@@ -491 +489 @@
         def startEmotivService(self):
                 
-                #eeg_headset_model = str(self.comboBoxEEGHeadsetModel.currentText())
                 device_address = str(self.comboBoxDeviceSelect.currentText())
                 
-                #server_host = configuration.EMOTIV_SERVER_HOST
-                
                 if device_address == 'Emotiv Control Panel':
-                        #server_port = configuration.EMOTIV_SERVER_PORT_CONTROL_PANEL
                         device_address = configuration.EMOTIV_SERVER_PORT_CONTROL_PANEL
                 else:
-                        #server_port = configuration.EMOTIV_SERVER_PORT_EMOCOMPOSER
                         device_address = configuration.EMOTIV_SERVER_PORT_EMOCOMPOSER
                 
@@ -507 +500 @@
                 server_port = int(self.lineEditSynapsePort.text())
                 eeg_headset_model = str(self.comboBoxEEGHeadsetModel.currentText())
-                #device_address = str(self.comboBoxDeviceSelect.currentText())
                 emulate_headset_data = (device_address == 'ThinkGear Emulator')
                 
@@ -731 +723 @@
                                     self.tabWidget.indexOf(self.tabCharts)):
                                         self.chartEEGMatplot.update_figure('eegPower', packet['eegPower'])
-                
-                
-                ##if ((self.synapseServer.protocol != None) and
-                #if (self.tabWidget.currentIndex() == \
-                    #self.tabWidget.indexOf(self.tabControlPanel)):
-                        
-                        #self.updateProfileSessionStatus()
         
         
@@ -816 +801 @@
                         self.updateInterfaceTimer.stop()
                 else:
+                        if self.synapseClient != None:
+                                self.synapseClient.exitThread()
                         #if self.thinkgearConnectClient != None:
                                 #self.thinkgearConnectClient.exitThread()
                         #if self.emotivClient != None:
                                 #self.emotivClient.exitThread()
-                        if self.synapseClient != None:
-                                self.synapseClient.exitThread()
                 
                 if self.synapseServer != None:
@@ -848 +833 @@
                 else:
                         event.ignore()
+

trunk/Puzzlebox/Synapse/Session.py

@@ -630 +630 @@
                                 source = self.parent
                 
-                #if target == None:
-                        #if self.parent == None:
-                                #target = self
-                        #else:
-                                #target = self.parent
-                
                 source.packets['rawEeg'] = []
                 source.packets['signals'] = []
                 
-                source.synapseServer.protocol.session_start_timestamp = \
-                        time.time()
+                #source.synapseServer.protocol.session_start_timestamp = \
+                        #time.time()
+                self.synapseServer.protocol.resetSessionStartTime()
                 
                 source.synapseServer.protocol.packet_count = 0