Changeset 388

Timestamp:

04/09/12 17:03:20 (9 years ago)

Author:

sc

Message:

Emotiv_Server:

• fix to CSV header output

File:

• trunk/Puzzlebox/Synapse/Emotiv/Server.py (modified) (3 diffs)

trunk/Puzzlebox/Synapse/Emotiv/Server.py

@@ -344 +344 @@
                 headers = headers + ','
                 #headers = headers + 'Time From Start,Headset On,Contact Number Of Quality Channels,Wireless,Excitement,Long Term Excitement,Meditation,Frustration,Engagement/Boredom,Cognitiv Action,Cognitiv Action Power'
-                headers = headers + 'Time From Start,Headset On,Contact Number Of Quality Channels,Wireless,Expressiv ActionExcitement,Long Term Excitement,Meditation,Frustration,Engagement/Boredom,Cognitiv Action,Cognitiv Action Power'
+                headers = headers + 'Time From Start,Headset On,Contact Number Of Quality Channels,Wireless,Expressiv Action,Excitement,Long Term Excitement,Meditation,Frustration,Engagement/Boredom,Cognitiv Action,Cognitiv Action Power'
                 
                 if self.emulate_thinkgear:
@@ -429 +429 @@
                         if 'expressiv' in packet.keys():
                                 if 'currentAction' in packet['expressiv'].keys():
-                                        csv[timestamp]['Expressiv Action'] = packet['expressiv']['currentAction']
+                                        value = packet['expressiv']['currentAction']
+                                        if value == 32:
+                                                csv[timestamp]['Expressiv Action'] = ''
+                                        else:
+                                                csv[timestamp]['Expressiv Action'] = packet['expressiv']['currentAction']
                         
                         if 'affectiv' in packet.keys():
@@ -529 +533 @@
                         for header in customDataHeaders:
                                 row = row + ',%s' % csv[key][header]
-                                #print header
-                                #print csv[key]
                         
                         row = row + '\n'