lots of updates

Author: RyanHope

examples/python/environment.py

@@ -1,5 +1,9 @@
 #!/usr/bin/env python
 
+
+import sys,os
+sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../lib/python"))
+
 # For general environment
 from twisted.internet import reactor
 from twisted.internet.task import LoopingCall, Cooperator
@@ -18,7 +22,7 @@
 
 class Letter(object):
 
-    colors = {'blue':(0, 0, 255), 'red':(255, 0, 0)}
+    colors = {':blue':(0, 0, 255), ':red':(255, 0, 0)}
 
     def __init__(self, letter, quad, start, colors, max_font_size):
         self.letter = letter
@@ -51,7 +55,7 @@ class Environment(object):
     STATE_SEARCH = 3
     STATE_DONE = 4
 
-    colors = {'white':(255, 255, 255), 'black':(0, 0, 0)}
+    colors = {':white':(255, 255, 255), ':black':(0, 0, 0)}
 
     def __init__(self, actr=False):
 
@@ -101,14 +105,14 @@ def reset(self):
         while not self.screen_rect.contains(self.intro_xs) or self.intro_ts.colliderect(self.intro_xs):
             self.intro_xs.center = (randint(0, self.screen_rect.width), randint(0, self.screen_rect.height))
         self.start = sample([1, 0, 0, 0], 4)
-        colors = sample(["red", "blue"], 2)
+        colors = sample([":red", ":blue"], 2)
         self.letters = sample(string.ascii_uppercase, 4)
         self.objects = [Letter(self.letters[i], i + 1, self.start[i], colors, self.max_font_size) for i in range(0, len(self.letters))]
         self.clockwise = choice([True, False])
         if self.clockwise:
-            self.bgcolorname = 'black'
+            self.bgcolorname = ':black'
         else:
-            self.bgcolorname = 'white'
+            self.bgcolorname = ':white'
         self.bgcolor = self.colors[self.bgcolorname]
         start = self.start.index(True)
         if self.clockwise:
@@ -250,6 +254,7 @@ def setDefaultClock(self):
         @d.listen('connectionMade')
         def ACTR6_JNI_Event(self, model, params):
             self.state = self.STATE_WAIT_MODEL
+            self.actr.setup(self.screen_rect.width, self.screen_rect.height)
 
         @d.listen('connectionLost')
         def ACTR6_JNI_Event(self, model, params):
@@ -258,15 +263,15 @@ def ACTR6_JNI_Event(self, model, params):
 
         @d.listen('reset')
         def ACTR6_JNI_Event(self, model, params):
-            self.actr_time_lock = params[0]
+            self.actr_time_lock = params['time-lock']
             self.setDefaultClock()
             self.state = self.STATE_WAIT_MODEL
 
         @d.listen('model-run')
         def ACTR6_JNI_Event(self, model, params):
-            if not params[0]:
+            if not params['resume']:
                 self.state = self.STATE_INTRO
-                X = VisualChunk(None, "letterobj", self.intro_xs.centerx, self.intro_xs.centery, color="red")
+                X = VisualChunk(None, "letterobj", self.intro_xs.centerx, self.intro_xs.centery, color=":red")
                 self.actr.update_display([X], clear=True)
                 self.actr_running = True
             if self.actr_time_lock:
@@ -280,13 +285,13 @@ def ACTR6_JNI_Event(self, model, params):
 
         @d.listen('keypress')
         def ACTR6_JNI_Event(self, model, params):
-            self.handle_key_press(params[0], chr(params[0]))
+            self.handle_key_press(params['keycode'], chr(params['keycode']))
 
         @d.listen('mousemotion')
         def ACTR6_JNI_Event(self, model, params):
             # Store "ACT-R" cursor in variable since we are 
             # not going to move the real mouse
-            self.fake_cursor = params[0]
+            self.fake_cursor = params['loc']
 
         @d.listen('mouseclick')
         def ACTR6_JNI_Event(self, model, params):

json-network-interface.lisp

@@ -141,7 +141,7 @@
       (send-command instance "set-mp-time" (jsown:new-js ("time" (mp-time))) :sync t)))
 
 (defmethod device-handle-keypress ((instance json-interface-module) key)
-  (send-command instance "keypress" (jsown:new-js ("keycode" char-code) ("unicode" key))
+  (send-command instance "keypress" (jsown:new-js ("keycode" (char-code key)))
                 :sync (not (numberp (jni-sync instance)))))
 
 (defmethod device-move-cursor-to ((instance json-interface-module) loc)

lib/Python/actr6_jni/__init__.py lib/python/actr6_jni/__init__.py

@@ -33,22 +33,26 @@ def connectionLost(self, reason):
             d.trigger(e="connectionLost", model=None, params=None)
 
     def lineReceived(self, string):
-        model, method, params = json.loads(string)
-        if method == 'set-mp-time':
+        obj = json.loads(string)
+        if obj['method'] == 'set-mp-time':
             if self.factory.clock:
                 self.factory.clock.setTime(float(params[0]))
-        elif method == 'disconnect':
+        elif obj['method'] == 'disconnect':
             self.factory.p.transport.loseConnection()
         else:
-            if method == 'reset':
+            if obj['method'] == 'reset':
                 if self.factory.clock:
                     self.factory.clock.setTime(0.0)
             for d in self.factory.dispatchers:
-                d.trigger(e=method, model=model, params=params)
-        self.sendLine(json.dumps([model, "sync", None]))
+                d.trigger(e=obj['method'],
+                          model=obj['model'],
+                          params=obj['params'])
+        self.sendCommand(obj['model'], "sync")
 
-    def sendCommand(self, model, method, *params):
-        self.sendLine(json.dumps([model, method, params]))
+    def sendCommand(self, model, method, **params):
+        self.sendLine(json.dumps({"model": model, 
+                                  "method": method, 
+                                  "params": params}))
 
 class JNI_Server(Factory):
 
@@ -70,31 +74,31 @@ def buildProtocol(self, addr):
     def update_display(self, chunks, clear=False):
         visual_locations = [chunk.get_visual_location() for chunk in chunks]
         visual_objects = [chunk.get_visual_object() for chunk in chunks]
-        self.p.sendCommand(self.model, "update-display", [visual_locations, visual_objects], clear)
+        self.p.sendCommand(self.model, "update-display", chunks=[visual_locations, visual_objects], clear=clear)
 
     def set_cursor_location(self, loc):
-        self.p.sendCommand(self.model, "set-cursor-loc", loc)
+        self.p.sendCommand(self.model, "set-cursor-loc", loc=loc)
 
     def digit_sound(self, digit):
-        self.p.sendCommand(self.model, "new-digit-sound", digit)
+        self.p.sendCommand(self.model, "new-digit-sound", digit=digit)
 
     def tone_sound(self, freq, duration):
-        self.p.sendCommand(self.model, "new-tone-sound", freq, duration)
+        self.p.sendCommand(self.model, "new-tone-sound", frequency=freq, duration=duration)
 
-    def word_sound(self, word):
-        self.p.sendCommand(self.model, "new-word-sound", word)
+    def word_sound(self, words):
+        self.p.sendCommand(self.model, "new-word-sound", words=words)
 
-    def other_sound(self, content, duration, delay, recode):
-        self.p.sendCommand(self.model, "new-other-sound", content, duration, delay, recode)
+    def other_sound(self, content, onset, delay, recode):
+        self.p.sendCommand(self.model, "new-other-sound", content=content, onset=onset, delay=delay, recode=recode)
 
     def trigger_reward(self, reward):
-        self.p.sendCommand(self.model, "trigger-reward", reward)
-
-    def set_visual_center_pint(self, (x, y)):
-        self.p.sendCommand(self.model, "set-visual-center-point", x, y)
+        self.p.sendCommand(self.model, "trigger-reward", reward=reward)
 
     def disconnect(self):
         self.p.sendCommand(self.model, "disconnect")
 
     def setup(self, width, height):
-        self.p.sendCommand(self.model, "setup", width, height)
+        self.p.sendCommand(self.model, "setup", width=width, height=height)
+        
+    def trigger_event(self, event, *args):
+        self.p.sendCommand(self.model, "trigger-event", event=event, args=args)