wip #71

Author: previ

.gitignore

@@ -36,6 +36,7 @@
 photos/*.jpg
 photos/*.mp4
 photos/*.h264
+photos/*.json
 
 # Sounds recorded
 sounds/*.wav

data/program_no_name.data

@@ -1 +1 @@
-{"dom_code": "<xml xmlns=\"http://www.w3.org/1999/xhtml\"></xml>", "code": "", "name": "no_name"}
+{"dom_code": "", "code": "get_cam().set_text(\"pluto\")", "name": "no_name"}

event.py

@@ -14,20 +14,20 @@ def get_instance(cls, node_name=None):
 
     def __init__(self, node_name):
         self._node_name = node_name
-        rospy.init_node(node_name, disable_signals=True)
+        rospy.init_node(node_name, anonymous=True, disable_signals=True)
         self._publishers = {}
         self._event_generators = []
         self._event_listeners = []
 
     def publish(self, topic, message):
         publisher = self._publishers.get(topic)
         if publisher is None:
-            publisher = rospy.Publisher("/" + self._node_name + "/" + topic, std_msgs.msg.String, queue_size=10)
+            publisher = rospy.Publisher("/" + topic, std_msgs.msg.String, queue_size=10)
             self._publishers[topic] = publisher
         publisher.publish(json.dumps(message))
 
     def register_event_listener(self, topic, callback):
-        self._event_listeners.append(rospy.Subscriber("/" + self._node_name + "/" + topic, std_msgs.msg.String, callback))
+        self._event_listeners.append(rospy.Subscriber("/" + topic, std_msgs.msg.String, callback))
 
     def register_event_generator(self, generator_func):
         generator = threading.Thread(target=generator_func)

main.py

@@ -251,7 +251,7 @@ def handle_program_load():
     logging.debug("program_load")
     name = request.args.get('name')
     app.prog = app.prog_engine.load(name)
-    return app.prog.dom_code
+    return jsonify(app.prog.as_json())
 
 @app.route("/program/save", methods=["POST"])
 def handle_program_save():
@@ -292,7 +292,7 @@ def handle_program_status():
     prog = Program("")
     if app.prog:
         prog = app.prog
-    return json.dumps({'name': prog.name, "running": prog.is_running()})
+    return json.dumps({'name': prog.name, "running": prog.is_running(), "log": prog.get_log()})
 
 @app.route("/cnnmodels", methods=["GET"])
 def handle_cnn_models_list():

photos/metadata.json

@@ -118,6 +118,7 @@ def __init__(self, name, code=None, dom_code=None):
         self.name = name
         self._dom_code = dom_code
         self._code = code
+        self._log = ""
 
     def execute(self):
         if self._running:
@@ -147,6 +148,12 @@ def check_end(self):
             raise RuntimeError('end requested')
         return None
 
+    def log(self, text):
+        self._log += text + "\n"
+
+    def get_log(self):
+        return self._log
+
     def is_running(self):
         return self._running
 
@@ -168,9 +175,10 @@ def run(self):
             get_event().wait_event_generators()
         except RuntimeError as re:
             logging.info("quit: " + str(re))
+            self.log(str(re))
         except Exception as e:
             logging.info("quit: " + str(e))
-
+            self.log(str(e))
         finally:
             try:
                 get_cam().video_stop() #if video is running, stop it