diff options
| author |  rcoh <rcoh@mit.edu> | 2010-12-20 15:42:13 -0500 |
|---|---|---|
| committer | rcoh <rcoh@mit.edu> | 2010-12-20 15:42:13 -0500 |
| commit | a1d9b85320c9b07d62470d78ef0c5f9015baf813 (patch) | |
| tree | 8df16aec8de793ba0f2e4b330b764a6f6a49f59a /inputs/TCPInput.py | |
| parent | 17577b1b19387b2cefb7ac777ed1323dd36be086 (diff) | |
| parent | 2736307c1d6d67868ca54a3df951f9e959efedd0 (diff) | |
Merge branch 'master' into pixelregions
Conflicts:
Util.py
pixelmappers/SimpleMapper.py
Diffstat (limited to 'inputs/TCPInput.py')
| -rw-r--r-- | inputs/TCPInput.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/inputs/TCPInput.py b/inputs/TCPInput.py index acd6243..9f62825 100644 --- a/inputs/TCPInput.py +++ b/inputs/TCPInput.py @@ -1,4 +1,5 @@ import Util +import util.Strings as Strings from operationscore.Input import * import socket, json, time class TCPInput(Input): @@ -25,7 +26,7 @@ class TCPInput(Input): if self.IS_RESPONDING == 1: # if 'responding', respond to the received data dataDict = json.loads(data) # socketDict = {'data':dataDict, 'address':self.address} - socketDict = {Util.location: (100 * (1 - dataDict['x'] / 10), 25 * (1 + dataDict['y'] / 10))} # like PygameInput + socketDict = {Strings.LOCATION: (100 * (1 - dataDict['x'] / 10), 25 * (1 + dataDict['y'] / 10))} # like PygameInput self.respond(socketDict) else: |