Changeset 391

Timestamp:

05/07/12 17:16:37 (9 years ago)

Author:

sc

Message:

• fixes to Synapse after changes to session data handling for Jigsaw 1.2.2

Location:

trunk/Puzzlebox/Synapse

Files:

• Configuration.py (modified) (2 diffs)
• Interface.py (modified) (2 diffs)
• ThinkGear/Server.py (modified) (1 diff)

trunk/Puzzlebox/Synapse/Configuration.py

@@ -8 +8 @@
 
 __changelog__ = """\
-Last Update: 2012.05.05
+Last Update: 2012.05.07
 """
 
@@ -150 +150 @@
 THINKGEAR_DELIMITER = '\r'
 
-THINKGEAR_CONFIGURATION_PARAMETERS = {"enableRawOutput": False, "format": "Json"}
-#THINKGEAR_CONFIGURATION_PARAMETERS = {"enableRawOutput": True, "format": "Json"}
+#THINKGEAR_CONFIGURATION_PARAMETERS = {"enableRawOutput": False, "format": "Json"}
+THINKGEAR_CONFIGURATION_PARAMETERS = {"enableRawOutput": True, "format": "Json"}
 
 ENABLE_THINKGEAR_AUTHORIZATION = False

trunk/Puzzlebox/Synapse/Interface.py

@@ -152 +152 @@
                 self.customDataHeaders = []
                 
-                #self.session_start_timestamp = time.time()
-                #self.packet_count = 0
-                #self.bad_packets = 0
+                self.session_start_timestamp = time.time()
+                self.packet_count = 0
+                self.bad_packets = 0
                 
                 if UPDATE_INTERFACE_VIA_TIMER:
@@ -804 +804 @@
         
         
+        
+        ##################################################################
+        
+        def setPacketCount(self, value):
+                
+                self.packet_count = value
+        
+        
+        ##################################################################
+        
+        def setBadPackets(self, value):
+                
+                self.bad_packets = value
+        
+        
+        ##################################################################
+        
+        def incrementPacketCount(self):
+                
+                self.packet_count += 1
+        
+        
+        ##################################################################
+        
+        def incrementBadPackets(self):
+                
+                self.bad_packets += 1
+        
+        
+        ##################################################################
+        
+        def getPacketCount(self):
+                
+                return (self.packet_count)
+        
+        
+        ##################################################################
+        
+        def getBadPackets(self):
+                
+                return (self.bad_packets)
+        
+        
+        ##################################################################
+        
+        def getSessionTime(self):
+                
+                return (self.session_start_timestamp)
+        
+        
+        ##################################################################
+        
+        def resetSessionStartTime(self):
+        
+                #self.synapseServer.protocol.resetSessionStartTime()
+                #self.resetSessionStartTime()
+                self.session_start_timestamp = time.time()
+        
+        
         ##################################################################
         

trunk/Puzzlebox/Synapse/ThinkGear/Server.py

@@ -395 +395 @@
                                         if ((THINKGEAR_EEG_POWER_MULTIPLIERS != None) and \
                                                  (each in THINKGEAR_EEG_POWER_MULTIPLIERS.keys())):
-                                                value = THINKGEAR_EEG_POWER_MULTIPLIERS[each] * plot
+                                                value = int(THINKGEAR_EEG_POWER_MULTIPLIERS[each] * plot)
                                         else:
                                                 value = plot