Changeset 285

Timestamp:

09/19/11 11:31:37 (11 years ago)

Author:

sc

Message:

Interface:

• TRUNCATE_CSV_TIMEZONE support added

File:

• trunk/Puzzlebox/Synapse/Interface.py (modified) (6 diffs)

trunk/Puzzlebox/Synapse/Interface.py

@@ -432 +432 @@
         ##################################################################
         
-        def parseTimeStamp(self, timestamp, local_version=False):
+        def parseTimeStamp(self, timestamp, local_version=False, truncate_time_zone=False):
                 
                 try:
@@ -445 +445 @@
                         date = time.strftime('%x', localtime)
                         localtime = time.strftime('%X', localtime)
+                
+                elif truncate_time_zone:
+                        date = time.strftime('%Y-%m-%d', localtime)
+                        localtime = time.strftime('%H:%M:%S', localtime)
+                        localtime = '%s.%s' % (localtime, decimal[:3])
                 
                 else:
@@ -889 +894 @@
                         target = self.parent
                 
+                try:
+                        truncate_csv_timezone = target.configuration.TRUNCATE_CSV_TIMEZONE
+                except:
+                        truncate_csv_timezone = False
+                
                 header = 'Date,Time,Delta,Theta,Low Alpha,High Alpha,Low Beta,High Beta,Low Gamma,Mid Gamma,Attention,Meditation,Signal Level'
                 
@@ -907 +917 @@
                                 #print packet
                                 timestamp = packet['timestamp']
-                                (date, localtime) = self.parseTimeStamp(timestamp)
+                                (date, localtime) = self.parseTimeStamp(timestamp, \
+                                                    truncate_time_zone=truncate_csv_timezone)
                                 
                                 csv[timestamp] = {}
@@ -1046 +1057 @@
         ##################################################################
         
+        def stop(self):
+                
+                if UPDATE_INTERFACE_VIA_TIMER:
+                        self.updateInterfaceTimer.stop()
+                else:
+                        if self.thinkgearConnectClient != None:
+                                self.thinkgearConnectClient.disconnectFromHost()
+                
+                if self.thinkGearConnectServer != None:
+                        self.thinkGearConnectServer.exitThread()
+        
+        
+        ##################################################################
+        
         def closeEvent(self, event):
                 
@@ -1059 +1084 @@
                 if reply == QtGui.QMessageBox.Yes:
                         
-                        if UPDATE_INTERFACE_VIA_TIMER:
-                                self.updateInterfaceTimer.stop()
-                        else:
-                                if self.thinkgearConnectClient != None:
-                                        self.thinkgearConnectClient.disconnectFromHost()
-                        
-                        if self.thinkGearConnectServer != None:
-                                self.thinkGearConnectServer.exitThread()
+                        self.stop()
                         
                         event.accept()