Changeset 358

Timestamp:

03/30/12 14:16:46 (8 years ago)

Author:

sc

Message:

• Significant namespace changes

Location:

trunk

Files:

• Puzzlebox/Synapse/Interface.py (modified) (2 diffs)
• Puzzlebox/Synapse/ThinkGear (moved) (moved from trunk/Puzzlebox/Synapse/Thinkgear)
• Puzzlebox/Synapse/ThinkGear/Client.py (added)
• Puzzlebox/Synapse/ThinkGear/Protocol.py (added)
• Puzzlebox/Synapse/ThinkGear/Server.py (added)
• synapse-client.py (modified) (3 diffs)

trunk/Puzzlebox/Synapse/Interface.py

@@ -73 +73 @@
 
 #import Configuration as configuration
-import Server as synapse_server
-import Client as thinkgear_client
+import Puzzlebox.Synapse.ThinkGear.Server as synapse_server
+import Puzzlebox.Synapse.ThinkGear.Client as thinkgear_client
 import Puzzlebox.Synapse.Emotiv.Client as emotiv_client
 #import puzzlebox_logger
@@ -508 +508 @@
                 else:
                         self.thinkgearConnectClient = \
-                                thinkgear_client.QtClient( \
+                                thinkgear_client.puzzlebox_synapse_thinkgear_client( \
                                         self.log, \
                                         server_host=server_interface, \

trunk/synapse-client.py

@@ -7 +7 @@
 # For more information please refer to http://www.gnu.org/copyleft/gpl.html
 
-import Puzzlebox.Synapse.Client as tgClient
-import Puzzlebox.Synapse.Configuration as tgConf
+import Puzzlebox.Synapse.ThinkGear.Client as client
+import Puzzlebox.Synapse.Configuration as configuration
 import sys, signal
 
@@ -26 +26 @@
 command_parameters = sys.argv[1:]
 
-server_host = tgConf.THINKGEAR_SERVER_HOST
-server_port = tgConf.THINKGEAR_SERVER_PORT
+server_host = configuration.THINKGEAR_SERVER_HOST
+server_port = configuration.THINKGEAR_SERVER_PORT
 
 for each in sys.argv:
@@ -40 +40 @@
 
 app = QtCore.QCoreApplication(sys.argv)
-client = tgClient.CLIClient(log, command_parameters, server_host, server_port, DEBUG=DEBUG)
+client = client.puzzlebox_synapse_thinkgear_client_console(log, command_parameters, server_host, server_port, DEBUG=DEBUG)
 sys.exit(app.exec_())