Changeset 81 for remote_control/puzzlebox_brainstorms_client_interface.py

Timestamp:

07/01/10 11:55:18 (11 years ago)

Author:

sc

Message:

remote_control/puzzlebox_brainstorms_network_client_thinkgear.py:

• converted to use QCoreApplication format

remote_control/puzzlebox_brainstorms_client_interface.py:

• corrected handling of ThinkGear? connecting/disconnecting

remote_control/puzzlebox_brainstorms_network_server_thinkgear.py:

• DEFAULT_SAMPLE_WAVELENGTH updated to 20 seconds
• connection handling reorganized
• comment cleanup

File:

• remote_control/puzzlebox_brainstorms_client_interface.py (modified) (4 diffs)

remote_control/puzzlebox_brainstorms_client_interface.py

@@ -150 +150 @@
         ##################################################################
         
-        def configureNetworkThinkGear(self):
+        def connectToThinkGearHost(self):
+                
+                if self.DEBUG:
+                        print "Connecting to ThinkGear Host"
                 
                 self.thinkgearClient = \
                    thinkgear_client.puzzlebox_brainstorms_network_client_thinkgear(self.log, parent=self)
                 
+                self.disconnect(self.pushButtonThinkGearConnect, \
+                             QtCore.SIGNAL("clicked()"), \
+                             self.connectToThinkGearHost)
+                
                 self.connect(self.pushButtonThinkGearConnect, \
                                   QtCore.SIGNAL("clicked()"), \
@@ -160 +167 @@
                 
                 self.pushButtonThinkGearConnect.setText('Disconnect')
-                
-                #self.pushButtonThinkGearConnect.setEnabled(False)
         
         
@@ -168 +173 @@
         def diconnectFromThinkGearHost(self):
                 
+                if self.DEBUG:
+                        print "Disconnecting from ThinkGear Host"
+                
                 self.thinkgearClient.disconnectFromHost()
                 
+                self.disconnect(self.pushButtonThinkGearConnect, \
+                                  QtCore.SIGNAL("clicked()"), \
+                                  self.diconnectFromThinkGearHost)
+                
                 self.connect(self.pushButtonThinkGearConnect, \
                                   QtCore.SIGNAL("clicked()"), \
-                                  self.configureNetworkThinkGear)
+                                  self.connectToThinkGearHost)
                 
                 self.pushButtonThinkGearConnect.setText('Connect')
@@ -214 +226 @@
                 self.connect(self.pushButtonThinkGearConnect, \
                                   QtCore.SIGNAL("clicked()"), \
-                                  self.configureNetworkThinkGear)
+                                  self.connectToThinkGearHost)