Changeset 337

Timestamp:

03/25/12 11:33:22 (8 years ago)

Author:

sc

Message:

 

File:

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

trunk/Puzzlebox/Synapse/Emotiv/Protocol.py

@@ -92 +92 @@
                 if self.choice == "a":
                         if self.EmotivEngine.EE_EngineRemoteConnect("127.0.0.1", 1726) != PyEpoc.PyEpoc.ERRCODE['EDK_OK']:
-                                print "Could not connect!"
+                                if self.DEBUG:
+                                        print "Could not connect!"
                                 quit()
-                        else: print "Connected to EmoComposer!"
+                        else:
+                                if self.DEBUG:
+                                        print "Connected to EmoComposer!"
                 
                 elif self.choice == "b":
                         if self.EmotivEngine.EE_EngineConnect() != PyEpoc.PyEpoc.ERRCODE['EDK_OK']:
-                                print "Could not connect!"
+                                if self.DEBUG:
+                                        print "Could not connect!"
                                 quit()
-                        else: print "Connected to Headset!"
-                
-                print """Engine Event handle at: %s""" %(self.engineeventhandle)
-                print """Emo State handle at: %s""" % (self.statehandle)
+                        else:
+                                if self.DEBUG:
+                                        print "Connected to Headset!"
+
+                if self.DEBUG:
+                        print """Engine Event handle at: %s""" %(self.engineeventhandle)
+                        print """Emo State handle at: %s""" % (self.statehandle)
 
         
@@ -111 +118 @@
 
                 if state == PyEpoc.PyEpoc.ERRCODE['EDK_OK']:
+                        
                         event = self.EmotivEngine.EE_EmoEngineEventGetType(self.engineeventhandle)
                         user = self.EmotivEngine.EE_EmoEngineEventGetUserId(self.engineeventhandle)[1]
+                        
                         if (event == PyEpoc.PyEpoc.EVENT['EE_EmoStateUpdated']):
+                                
                                 self.EmotivEngine.EE_EmoEngineEventGetEmoState(self.engineeventhandle, self.statehandle)
+                                
                                 #status
                                 battery = self.EmotivEngine.ES_GetBatteryChargeLevel(self.statehandle)
                                 wireless = self.EmotivEngine.ES_GetWirelessSignalStatus(self.statehandle)
                                 timestamp = self.EmotivEngine.ES_GetTimeFromStart(self.statehandle)
+                                
                                 #emo
                                 meditation = self.EmotivEngine.ES_AffectivGetMeditationScore(self.statehandle)
@@ -124 +136 @@
                                 longexcitement = self.EmotivEngine.ES_AffectivGetExcitementLongTermScore(self.statehandle)
                                 frustration = self.EmotivEngine.ES_AffectivGetFrustrationScore(self.statehandle)
+                                
                                 #cognitiv
                                 currentaction = self.EmotivEngine.ES_CognitivGetCurrentAction(self.statehandle)
                                 currentactionpower = self.EmotivEngine.ES_CognitivGetCurrentActionPower(self.statehandle)
-                                print """--------------------------------------------------------------------------------"""
-                                print """Timestamp: %s\tUser: %s\tEvent: %s\tW.Signal: %s\tBattery: %s""" % (timestamp,user,hex(event), wireless, battery)
-                                print """S.Excite: %s\tL.Excite: %s\tMeditation: %s\tFrustr: %s""" % (shortexcitement, longexcitement, meditation, frustration)
-                                print """Curr.Action: %s\tAction Pwr: %s""" % (hex(currentaction), currentactionpower)
+
+                                message = "--------------------------------------------------------------------------------\n"
+                                message = message + "Timestamp: %s\tUser: %s\tEvent: %s\tW.Signal: %s\tBattery: %s\n" % (timestamp, user, hex(event), wireless, battery)
+                                message = message + "S.Excite: %s\tL.Excite: %s\tMeditation: %s\tFrustr: %s\n" % (shortexcitement, longexcitement, meditation, frustration)
+                                message = message + "Curr.Action: %s\tAction Pwr: %s\n" % (hex(currentaction), currentactionpower)
+
+                                if self.DEBUG:
+                                        print message
+
+                                if self.parent != None:
+                                        self.parent.textEditDebugConsole.append(message)