Changeset 286

Timestamp:

09/19/11 14:55:32 (11 years ago)

Author:

sc

Message:

Interface:

• scrubData added

Protocol:

• thread error exception handled

Location:

trunk/Puzzlebox/Synapse

Files:

• Interface.py (modified) (6 diffs)
• Protocol.py (modified) (3 diffs)

trunk/Puzzlebox/Synapse/Interface.py

@@ -428 +428 @@
                         self.processPacketThinkGear( \
                                 self.thinkGearConnectServer.protocol.data_packet)
-        
-        
-        ##################################################################
-        
-        def parseTimeStamp(self, timestamp, local_version=False, truncate_time_zone=False):
-                
-                try:
-                        decimal = '%f' % timestamp
-                        decimal = decimal.split('.')[1]
-                except:
-                        decimal = '0'
-                
-                localtime = time.localtime(timestamp)
-                
-                if local_version:
-                        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:
-                        date = time.strftime('%Y-%m-%d', localtime)
-                        localtime = time.strftime('%H:%M:%S', localtime)
-                        localtime = '%s.%s %s' % (localtime, decimal, \
-                                       time.strftime('%Z', time.localtime(timestamp)))
-                
-                
-                return(date, localtime)
         
         
@@ -810 +779 @@
         ##################################################################
         
+        def parseTimeStamp(self, timestamp, local_version=False, truncate_time_zone=False):
+                
+                try:
+                        decimal = '%f' % timestamp
+                        decimal = decimal.split('.')[1]
+                except:
+                        decimal = '0'
+                
+                localtime = time.localtime(timestamp)
+                
+                if local_version:
+                        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:
+                        date = time.strftime('%Y-%m-%d', localtime)
+                        localtime = time.strftime('%H:%M:%S', localtime)
+                        localtime = '%s.%s %s' % (localtime, decimal, \
+                                       time.strftime('%Z', time.localtime(timestamp)))
+                
+                
+                return(date, localtime)
+        
+        
+        ##################################################################
+        
         def saveData(self):
                 
@@ -845 +845 @@
         def exportData(self):
                 
-                if self == None:
+                if self.parent == None:
                         target = self
                 else:
@@ -895 +895 @@
                 
                 try:
-                        truncate_csv_timezone = target.configuration.TRUNCATE_CSV_TIMEZONE
+                        truncate_csv_timezone = target.configuration.EXPORT_CSV_TRUNCATE_TIMEZONE
                 except:
                         truncate_csv_timezone = False
+                
+                try:
+                        scrub_data = target.configuration.EXPORT_CSV_SCRUB_DATA
+                except:
+                        scrub_data = False
+                
                 
                 header = 'Date,Time,Delta,Theta,Low Alpha,High Alpha,Low Beta,High Beta,Low Gamma,Mid Gamma,Attention,Meditation,Signal Level'
@@ -971 +977 @@
                                         csv[timestamp][each] = packet['custom'][each]
                 
+                
+                if scrub_data:
+                        csv = self.scrubData(csv, truncate_csv_timezone)
+                
+                
                 output = header
                 
@@ -1006 +1017 @@
         ##################################################################
         
+        def scrubData(self, csv, truncate_csv_timezone=False):
+                
+                # If there are missing packets, repeat a given packet once per missing
+                # second until there is a gap between 1 and 2 seconds, in which case
+                # produce a final duplicate packet at the mid-point between the packets
+                
+                last_time = None
+                
+                output = {}
+                
+                csv_keys = csv.keys()
+                csv_keys.sort()
+                
+                for key in csv_keys:
+                        
+                        localtime = key
+                        
+                        if last_time == None:
+                                last_time = localtime
+                                output[key] = csv[key]
+                                continue
+                        
+                        else:
+                                
+                                time_difference = last_time - localtime
+                                
+                                if time_difference <= 1:
+                                        last_time = localtime
+                                        output[key] = csv[key]
+                                        continue
+                                
+                                else:
+                                        
+                                        new_packet = csv[key].copy()
+                                        
+                                        if time_difference >= 2:
+                                                
+                                                new_time = localtime + 1
+                                        
+                                        
+                                        elif (time_difference < 2) and (time_difference > 1):
+                                                
+                                                new_time = last_time + ((last_time - localtime) / 2)
+                                        
+                                        
+                                        (date, formatted_new_time) = self.parseTimeStamp(new_time, \
+                                           truncate_time_zone=truncate_csv_timezone)
+                                        
+                                        new_packet['Time'] = formatted_new_time
+                                        
+                                        last_time = new_time
+                                        output[new_time] = new_packet
+                                        
+                                        if self.DEBUG:
+                                                print "WARN: Scrubbing new packet:",
+                                                print new_packet
+                
+                
+                return(output)
+        
+        
+        ##################################################################
+        
         def resetData(self):
                 

trunk/Puzzlebox/Synapse/Protocol.py

@@ -750 +750 @@
                 
                 if (self.parent != None):
+                        
+                        # NOTE: is it possible this call is blocking the Protocol
+                        #       thread from continuing to parse data?
+                        
                         self.parent.processPacketThinkGear(process_packet)
         
@@ -997 +1001 @@
                 # (1/512) * 1000 = 1.9531250
                 while len(self.buffer) < length:
-                        QtCore.QThread.msleep(2)
+                        try:
+                                QtCore.QThread.msleep(2)
+                        except Exception, e:
+                                #if self.DEBUG:
+                                        #print "ERROR: Protocol failed to call QtCore.QThread.msleep(2) in read():",
+                                        #print e
+                                pass
                         
                 bytes = self.buffer[:length]
@@ -1013 +1023 @@
                 self.buffer_check_timer.stop()
                 self.read_buffer_check_timer.stop()
+                self.buffer = ''