Changeset 74 for remote_control/puzzlebox_brainstorms_client_interface.py

Timestamp:

06/29/10 14:11:53 (11 years ago)

Author:

sc

Message:

brainstorms:

• continued file and class renaming in response to conversions

from PyGame/Twisted? frameworks to Qt

network_client:

• initial checkin of Qt based Brainstorms client

network_client_thinkgear:

• initial checkin of Qt based ThinkGear? client

File:

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

remote_control/puzzlebox_brainstorms_client_interface.py

@@ -15 +15 @@
 import os, sys
 
-try:
-        import PySide as PyQT4
-except:
-        print "Using PyQt4 module"
-else:
-        print "Using PySide module"
+#try:
+        #from PySide import QtCore, QtGui, QtNetwork
+#except:
+        #print "Using PyQt4 module"
+        #from PyQt4 import QtCore, QtGui, QtNetwork
+#else:
+        #print "Using PySide module"
 
 from PyQt4 import QtCore, QtGui, QtNetwork
+#from PySide import QtCore, QtGui, QtNetwork
 
 sys.path.append(os.path.join(os.getcwd(), "interface"))
@@ -30 +32 @@
 
 import puzzlebox_brainstorms_configuration as configuration
-import puzzlebox_brainstorms_client as client
+import puzzlebox_brainstorms_network_client as brainstorms_client
+import puzzlebox_brainstorms_network_client_thinkgear as thinkgear_client
 #import puzzlebox_logger
 
@@ -39 +42 @@
 DEBUG = 1
 
-BRAINSTORMS_SERVER_HOST = configuration.BRAINSTORMS_SERVER_HOST
-BRAINSTORMS_SERVER_PORT = configuration.BRAINSTORMS_SERVER_PORT
-
-THINKGEAR_SERVER_HOST = configuration.THINKGEAR_SERVER_HOST
-THINKGEAR_SERVER_PORT = configuration.THINKGEAR_SERVER_PORT
-
-THINKGEAR_DELIMITER = configuration.THINKGEAR_DELIMITER
-
-THINKGEAR_CONFIGURATION_PARAMETERS = configuration.THINKGEAR_CONFIGURATION_PARAMETERS
-
 THINKGEAR_POWER_THRESHOLDS = configuration.THINKGEAR_POWER_THRESHOLDS
 
@@ -57 +50 @@
 #####################################################################
 
-class puzzlebox_brainstorms_client_interface( \
-              QtGui.QWidget, Ui_Form, \
-              client.puzzlebox_brainstorms_client):
+class puzzlebox_brainstorms_client_interface(QtGui.QWidget, Ui_Form):
         
         def __init__(self, log, DEBUG=DEBUG, parent = None):
@@ -70 +61 @@
                 
                 self.configureSettings()
+                self.configureNetwork()
                 self.connectWidgets()
-                self.configureNetwork()
         
         
@@ -131 +122 @@
         ##################################################################
         
+        def configureNetwork(self):
+                
+                self.brainstormsClient = \
+                   brainstorms_client.puzzlebox_brainstorms_network_client(self.log, parent=self)
+                
+                self.thinkgearClient = \
+                   thinkgear_client.puzzlebox_brainstorms_network_client_thinkgear(self.log, parent=self)
+        
+        
+        ##################################################################
+        
         def connectWidgets(self):
                 
@@ -171 +173 @@
         ##################################################################
         
-        def configureNetwork(self):
-                
-                #self.blockSize = 0
-                self.brainstormsClientTcpSocket = QtNetwork.QTcpSocket(self)
-                self.brainstormsClientTcpSocket.name = 'Brainstorms Server'
-                
-                #self.brainstormsClientTcpSocket.readyRead.connect(self.printReply)
-                self.brainstormsClientTcpSocket.error.connect(self.displayError)
-                
-                
-                self.thinkgearClientTcpSocket = QtNetwork.QTcpSocket(self)
-                self.thinkgearClientTcpSocket.name = 'ThinkGear Server'
-                
-                self.thinkgearClientTcpSocket.readyRead.connect(self.printReply)
-                self.thinkgearClientTcpSocket.error.connect(self.displayError)
-                
-                self.sendCommand(THINKGEAR_CONFIGURATION_PARAMETERS, \
-                                 self.thinkgearClientTcpSocket, \
-                                 THINKGEAR_SERVER_HOST, \
-                                 THINKGEAR_SERVER_PORT)
-        
-        
-        ##################################################################
-        
-        def printReply(self, reply=None):
-                
-                socket = self.thinkgearClientTcpSocket
-                
-                socket_buffer = socket.readAll()
-                
-                for packet in socket_buffer.split(THINKGEAR_DELIMITER):
-                        
-                        if packet != '':
-                                
-                                data = json.loads(packet.data())
-                                
-                                if self.DEBUG:
-                                        print "<-- [%s] Received:" % socket.name,
-                                        print data
-                                
-                                self.processPacketThinkGear(data)
-        
-        
-        ##################################################################
-        
-        def processPacketThinkGear(self, packet):
-                
-                if ('eSense' in packet.keys()):
-                                
-                        if ('attention' in packet['eSense'].keys()):
-                                self.progressBarConcentration.setValue(packet['eSense']['attention'])
-                        
-                        if ('meditation' in packet['eSense'].keys()):
-                                self.progressBarRelaxation.setValue(packet['eSense']['meditation'])                     
-        
-        
-        ##################################################################
-        
-        def displayError(self, socketError):
-                
-                if socketError == QtNetwork.QAbstractSocket.RemoteHostClosedError:
-                        pass
-                
-                elif socketError == QtNetwork.QAbstractSocket.HostNotFoundError:
-                        QtGui.QMessageBox.information(self, "Puzzlebox Brainstorms Client",
-                                        "The server host was not found. Please check the host name and "
-                                        "port settings.")
-                
-                elif socketError == QtNetwork.QAbstractSocket.ConnectionRefusedError:
-                        QtGui.QMessageBox.information(self, "Puzzlebox Brainstorms Client",
-                                        "The server connection was refused by the peer. Make sure the "
-                                        "server is running, and check that the host name "
-                                        "and port settings are correct.")
-                
-                else:
-                        QtGui.QMessageBox.information(self, "Puzzlebox Brainstorms Client",
-                                        "The following error occurred: %s." % \
-                                           self.brainstormsClientTcpSocket.errorString())
-        
-        
-        ##################################################################
-        
         def turnLeft(self):
-                self.sendCommand('turn_left', self.brainstormsClientTcpSocket)
+                self.brainstormsClient.sendCommand('turn_left')
         
         def driveForward(self):
-                self.sendCommand('drive_forward', self.brainstormsClientTcpSocket)
+                self.brainstormsClient.sendCommand('drive_forward')
         
         def turnRight(self):
-                self.sendCommand('turn_right', self.brainstormsClientTcpSocket)
+                self.brainstormsClient.sendCommand('turn_right')
         
         def turnLeftInReverse(self):
-                self.sendCommand('turn_left_in_reverse', self.brainstormsClientTcpSocket)
+                self.brainstormsClient.sendCommand('turn_left_in_reverse')
         
         def driveReverse(self):
-                self.sendCommand('drive_reverse', self.brainstormsClientTcpSocket)
+                self.brainstormsClient.sendCommand('drive_reverse')
         
         def turnRightInReverse(self):
-                self.sendCommand('turn_right_in_reverse', self.brainstormsClientTcpSocket)
+                self.brainstormsClient.sendCommand('turn_right_in_reverse')
         
         def stopMotors(self):
-                self.sendCommand('stop_motors', self.brainstormsClientTcpSocket)
-        
-        
-        ##################################################################
-        
-        def sendCommand(self, \
-                             command, \
-                             socket, \
-                             host=BRAINSTORMS_SERVER_HOST, \
-                             port=BRAINSTORMS_SERVER_PORT):
-                
-                if self.DEBUG:
-                        print "--> [%s] Sending:" % socket.name,
-                        print command
-                
-                socket.abort()
-                socket.connectToHost(host, port)
-                
-                data = json.dumps(command)
-                socket.write(data)
+                self.brainstormsClient.sendCommand('stop_motors')