Changeset 291

Timestamp:

09/27/11 14:38:21 (10 years ago)

Author:

sc

Message:

• Updated for new Puzzlebox Jigsaw plug-in model

Location:

trunk/Puzzlebox/Synapse

Files:

• Interface.py (modified) (5 diffs)
• Protocol.py (modified) (2 diffs)
• Server.py (modified) (1 diff)

trunk/Puzzlebox/Synapse/Interface.py

@@ -907 +907 @@
                 
                 
-                header = 'Date,Time,Delta,Theta,Low Alpha,High Alpha,Low Beta,High Beta,Low Gamma,Mid Gamma,Attention,Meditation,Signal Level'
-                
-                for each in target.customDataHeaders:
-                        header = header + ',%s' % each
-                
-                header = header + '\n'
+                headers = 'Date,Time,Delta,Theta,Low Alpha,High Alpha,Low Beta,High Beta,Low Gamma,Mid Gamma,Attention,Meditation,Signal Level'
+                
+                customDataHeaders = []
+                for header in target.customDataHeaders:
+                        customDataHeaders.append(header)
+                for plugin in target.activePlugins:
+                        for header in plugin.customDataHeaders:
+                                customDataHeaders.append(header)
+                
+                for each in customDataHeaders:
+                        headers = headers + ',%s' % each
+                
+                headers = headers + '\n'
                 
                 csv = {}
@@ -943 +950 @@
                                 csv[timestamp]['Signal Level'] = ''
                                 
-                                for each in target.customDataHeaders:
-                                        csv[timestamp][each] = ''
+                                for header in customDataHeaders:
+                                        csv[timestamp][header] = ''
                         
                         
@@ -974 +981 @@
                                 csv[timestamp]['Signal Level'] = packet['poorSignalLevel']
                         
-                        for each in target.customDataHeaders:
+                        for header in customDataHeaders:
                                 if 'custom' in packet.keys() and \
-                                   each in packet['custom'].keys():
-                                        csv[timestamp][each] = packet['custom'][each]
+                                   header in packet['custom'].keys():
+                                        csv[timestamp][header] = packet['custom'][header]
                 
                 
@@ -984 +991 @@
                 
                 
-                output = header
+                output = headers
                 
                 csv_keys = csv.keys()
@@ -1006 +1013 @@
                                csv[key]['Signal Level'])
                         
-                        for each in target.customDataHeaders:
-                                row = row + ',%s' % csv[key][each]
+                        for header in customDataHeaders:
+                                row = row + ',%s' % csv[key][header]
                         
                         row = row + '\n'

trunk/Puzzlebox/Synapse/Protocol.py

@@ -765 +765 @@
                 self.session_start_timestamp = time.time()
                 
-                self.parseStream()
+                if self.device != None:
+                        self.parseStream()
         
         
@@ -1049 +1050 @@
         def run(self):
                 
+                if self.device == None:
+                        self.keep_running = False
+                
                 self.buffer = ''
                 

trunk/Puzzlebox/Synapse/Server.py

@@ -187 +187 @@
                         
                         self.serial_device.start()
-                        
-                        self.protocol = \
-                                serial_interface.ProtocolHandler( \
-                                        self.log, \
-                                        self.serial_device, \
-                                        self.device_id, \
-                                        DEBUG=self.DEBUG, \
-                                        parent=self)
-                        
-                        self.protocol.start()
+                
+                else:
+                        self.serial_device = None
+                
+                
+                self.protocol = \
+                        serial_interface.ProtocolHandler( \
+                                self.log, \
+                                self.serial_device, \
+                                self.device_id, \
+                                DEBUG=self.DEBUG, \
+                                parent=self)
+                
+                self.protocol.start()