Changeset 329

Timestamp:

03/21/12 12:34:26 (9 years ago)

Author:

sc

Message:

• Fixed bad values in emulated ThinkGear? session when exporting to CSV

Location:

trunk

Files:

• Puzzlebox/Synapse/Interface.py (modified) (5 diffs)
• Puzzlebox/Synapse/Server.py (modified) (5 diffs)
• synapse-gui.py (modified) (2 diffs)

trunk/Puzzlebox/Synapse/Interface.py

@@ -10 +10 @@
 
 __changelog__ = """\
-Last Update: 2012.03.12
+Last Update: 2012.03.21
 """
 
@@ -115 +115 @@
 class QtUI(QtGui.QWidget, Design):
         
-        def __init__(self, log, server=None, DEBUG=DEBUG, parent = None):
+        def __init__(self, log, \
+                     server=None, \
+                     DEBUG=DEBUG, \
+                     parent=None, \
+                     embedded_mode=False):
                 
                 self.log = log
                 self.DEBUG = DEBUG
                 self.parent=parent
+                self.embedded_mode=embedded_mode
                 
                 if self.parent == None:
@@ -481 +486 @@
         def processPacketThinkGear(self, packet):
                 
-                if self.DEBUG > 2:
-                        print packet
+                #if self.DEBUG > 2:
+                        #print packet
                 
                 
@@ -1163 +1168 @@
                                 target = self.parent
                 
+                
                 (date, localtime) = self.parseTimeStamp(time.time())
                 
@@ -1265 +1271 @@
                 for packet in source.packets['signals']:
                         
+                        
                         if 'rawEeg' in packet.keys():
                                 continue
                         
                         if packet['timestamp'] not in csv.keys():
+                                
+                                if 'blinkStrength' in packet.keys():
+                                        # Skip any blink packets from log
+                                        continue
+                                
                                 
                                 #print packet

trunk/Puzzlebox/Synapse/Server.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
 
-# Copyright Puzzlebox Productions, LLC (2010-2011)
+# Copyright Puzzlebox Productions, LLC (2010-2012)
 #
 # This code is released under the GNU Pulic License (GPL) version 2
@@ -9 +9 @@
 
 __changelog__ = """\
-Last Update: 2011.12.06
+Last Update: 2012.03.21
 """
 
@@ -575 +575 @@
                                                    THINKGEAR_MEDITATION_MULTIPLIER
                                         
+                                        
+                                        value = int(value)
+                                        
+                                        
                                         if value < 0:
                                                 value = 0
@@ -617 +621 @@
                                 self.sendPacketQueue()
                                 
-                                #if (self.parent != None):
-                                        #self.parent.processPacketThinkGear(self.protocol.data_packet)
+                                if (self.parent != None):
+                                        self.parent.processPacketThinkGear(self.protocol.data_packet)
         
         
@@ -630 +634 @@
                 self.packet_queue.append(packet)
                 
-                if (self.parent != None):
-                        self.parent.processPacketThinkGear(packet)
+                #if (self.parent != None):
+                        #self.parent.processPacketThinkGear(packet)
                 
                 # Include simulated blinks at desired frequency

trunk/synapse-gui.py

@@ -2 +2 @@
 # -*- coding: utf-8 -*-
 
-# Copyright Puzzlebox Productions, LLC (2010-2011)
+# Copyright Puzzlebox Productions, LLC (2010-2012)
 #
 # This code is released under the GNU Pulic License (GPL) version 2
 # For more information please refer to http://www.gnu.org/copyleft/gpl.html
+
+__changelog__ = """\
+Last Update: 2012.03.13
+"""
 
 import Puzzlebox.Synapse.Configuration as configuration
@@ -29 +33 @@
 log = None
 app = QtGui.QApplication(sys.argv)
-window = tgInterface.QtUI(log, configuration.DEBUG)
+window = tgInterface.QtUI( \
+   log=log, \
+   DEBUG=configuration.DEBUG, \
+   embedded_mode=False)
 window.show()
 sys.exit(app.exec_())