Changeset 374
- Timestamp:
- 04/02/12 05:47:52 (9 years ago)
- Location:
- trunk/Puzzlebox/Synapse
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Puzzlebox/Synapse/Interface.py
r372 r374 69 69 import Puzzlebox.Synapse.ThinkGear.Server as thinkgear_server 70 70 import Puzzlebox.Synapse.Emotiv.Server as emotiv_server 71 #import Puzzlebox.Synapse.Emotiv.Client as emotiv_client72 71 #import puzzlebox_logger 73 72 … … 112 111 ##################################################################### 113 112 114 #class puzzlebox_synapse_interface(QtGui.QWidget, Design, Puzzlebox.Synapse.Session.puzzlebox_synapse_session):115 113 class puzzlebox_synapse_interface(synapse_device.puzzlebox_synapse_device, \ 116 114 synapse_session.puzzlebox_synapse_session, \ … … 491 489 def startEmotivService(self): 492 490 493 #eeg_headset_model = str(self.comboBoxEEGHeadsetModel.currentText())494 491 device_address = str(self.comboBoxDeviceSelect.currentText()) 495 492 496 #server_host = configuration.EMOTIV_SERVER_HOST497 498 493 if device_address == 'Emotiv Control Panel': 499 #server_port = configuration.EMOTIV_SERVER_PORT_CONTROL_PANEL500 494 device_address = configuration.EMOTIV_SERVER_PORT_CONTROL_PANEL 501 495 else: 502 #server_port = configuration.EMOTIV_SERVER_PORT_EMOCOMPOSER503 496 device_address = configuration.EMOTIV_SERVER_PORT_EMOCOMPOSER 504 497 … … 507 500 server_port = int(self.lineEditSynapsePort.text()) 508 501 eeg_headset_model = str(self.comboBoxEEGHeadsetModel.currentText()) 509 #device_address = str(self.comboBoxDeviceSelect.currentText())510 502 emulate_headset_data = (device_address == 'ThinkGear Emulator') 511 503 … … 731 723 self.tabWidget.indexOf(self.tabCharts)): 732 724 self.chartEEGMatplot.update_figure('eegPower', packet['eegPower']) 733 734 735 ##if ((self.synapseServer.protocol != None) and736 #if (self.tabWidget.currentIndex() == \737 #self.tabWidget.indexOf(self.tabControlPanel)):738 739 #self.updateProfileSessionStatus()740 725 741 726 … … 816 801 self.updateInterfaceTimer.stop() 817 802 else: 803 if self.synapseClient != None: 804 self.synapseClient.exitThread() 818 805 #if self.thinkgearConnectClient != None: 819 806 #self.thinkgearConnectClient.exitThread() 820 807 #if self.emotivClient != None: 821 808 #self.emotivClient.exitThread() 822 if self.synapseClient != None:823 self.synapseClient.exitThread()824 809 825 810 if self.synapseServer != None: … … 848 833 else: 849 834 event.ignore() 835 -
trunk/Puzzlebox/Synapse/Session.py
r373 r374 630 630 source = self.parent 631 631 632 #if target == None:633 #if self.parent == None:634 #target = self635 #else:636 #target = self.parent637 638 632 source.packets['rawEeg'] = [] 639 633 source.packets['signals'] = [] 640 634 641 source.synapseServer.protocol.session_start_timestamp = \ 642 time.time() 635 #source.synapseServer.protocol.session_start_timestamp = \ 636 #time.time() 637 self.synapseServer.protocol.resetSessionStartTime() 643 638 644 639 source.synapseServer.protocol.packet_count = 0
Note: See TracChangeset
for help on using the changeset viewer.