Changeset 285
- Timestamp:
- 09/19/11 11:31:37 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Puzzlebox/Synapse/Interface.py
r284 r285 432 432 ################################################################## 433 433 434 def parseTimeStamp(self, timestamp, local_version=False ):434 def parseTimeStamp(self, timestamp, local_version=False, truncate_time_zone=False): 435 435 436 436 try: … … 445 445 date = time.strftime('%x', localtime) 446 446 localtime = time.strftime('%X', localtime) 447 448 elif truncate_time_zone: 449 date = time.strftime('%Y-%m-%d', localtime) 450 localtime = time.strftime('%H:%M:%S', localtime) 451 localtime = '%s.%s' % (localtime, decimal[:3]) 447 452 448 453 else: … … 889 894 target = self.parent 890 895 896 try: 897 truncate_csv_timezone = target.configuration.TRUNCATE_CSV_TIMEZONE 898 except: 899 truncate_csv_timezone = False 900 891 901 header = 'Date,Time,Delta,Theta,Low Alpha,High Alpha,Low Beta,High Beta,Low Gamma,Mid Gamma,Attention,Meditation,Signal Level' 892 902 … … 907 917 #print packet 908 918 timestamp = packet['timestamp'] 909 (date, localtime) = self.parseTimeStamp(timestamp) 919 (date, localtime) = self.parseTimeStamp(timestamp, \ 920 truncate_time_zone=truncate_csv_timezone) 910 921 911 922 csv[timestamp] = {} … … 1046 1057 ################################################################## 1047 1058 1059 def stop(self): 1060 1061 if UPDATE_INTERFACE_VIA_TIMER: 1062 self.updateInterfaceTimer.stop() 1063 else: 1064 if self.thinkgearConnectClient != None: 1065 self.thinkgearConnectClient.disconnectFromHost() 1066 1067 if self.thinkGearConnectServer != None: 1068 self.thinkGearConnectServer.exitThread() 1069 1070 1071 ################################################################## 1072 1048 1073 def closeEvent(self, event): 1049 1074 … … 1059 1084 if reply == QtGui.QMessageBox.Yes: 1060 1085 1061 if UPDATE_INTERFACE_VIA_TIMER: 1062 self.updateInterfaceTimer.stop() 1063 else: 1064 if self.thinkgearConnectClient != None: 1065 self.thinkgearConnectClient.disconnectFromHost() 1066 1067 if self.thinkGearConnectServer != None: 1068 self.thinkGearConnectServer.exitThread() 1086 self.stop() 1069 1087 1070 1088 event.accept()
Note: See TracChangeset
for help on using the changeset viewer.