Changeset 206

Timestamp:

11/15/10 17:41:41 (11 years ago)

Author:

sc

Message:

Brainstorms/Helicopter_Control.py:

• Qt threaded model added

File:

• trunk/brainstorms/Puzzlebox/Brainstorms/Helicopter_Control.py (modified) (9 diffs)

trunk/brainstorms/Puzzlebox/Brainstorms/Helicopter_Control.py

@@ -50 +50 @@
 #####################################################################
 
-class puzzlebox_brainstorms_helicopter_control:
+#class puzzlebox_brainstorms_helicopter_control:
+class puzzlebox_brainstorms_helicopter_control(QtCore.QThread):
         
         def __init__(self, \
@@ -58 +59 @@
                      parent=None):
                 
-                #QtCore.QThread.__init__(self,parent)
+                QtCore.QThread.__init__(self, parent)
                 
                 self.log = None
@@ -123 +124 @@
                 self.serial_device.start()
                 
-                self.protocol = \
-                        ProtocolHandler( \
-                                self.log, \
-                                self.serial_device, \
-                                DEBUG=self.DEBUG, \
-                                parent=self)
-                
-                self.protocol.start()
+                #self.protocol = \
+                        #ProtocolHandler( \
+                                #self.log, \
+                                #self.serial_device, \
+                                #DEBUG=self.DEBUG, \
+                                #parent=self)
+                
+                #self.protocol.start()
         
         
@@ -422 +423 @@
 
 #class SerialDevice(Protocol.SerialDevice):
-class SerialDevice:
+#class SerialDevice:
+class SerialDevice(QtCore.QThread):
         
         def __init__(self, log, \
@@ -429 +431 @@
                                parent=None):
                 
-                #QtCore.QThread.__init__(self, parent)
+                QtCore.QThread.__init__(self, parent)
                 
                 self.log = log
@@ -611 +613 @@
         def stop(self):
                 
+                #self.buffer_check_timer.stop()
                 self.keep_running = False
-                self.buffer_check_timer.stop()
         
         
@@ -659 +661 @@
                 
                 
-                #self.exitThread()
-                self.exitThread(callThreadQuit=False)
+                #self.exitThread(callThreadQuit=False)
+                self.exitThread()
 
 
@@ -684 +686 @@
 
 if __name__ == '__main__':
+        
+        # Perform correct KeyboardInterrupt handling
+        signal.signal(signal.SIGINT, signal.SIG_DFL)
         
         # Collect default settings and command line parameters
@@ -702 +707 @@
         
         if rc.connection == None:
-                #sys.exit(app.exec_())
-                sys.exit()
-        
-        #rc.start()
-        rc.run(rc.command)
+                #sys.exit()
+                sys.exit(app.exec_())
+        
+        #rc.run(rc.command)
+        rc.start()
+        
         #rc.stop()
-
+        sys.exit(app.exec_())
+