wip #65

Author: previ

program.py

@@ -154,6 +154,7 @@ def run(self):
         logging.error("Camera not available")
 
       exec(self._code)
+      get_event().wait_event_generators()
     except RuntimeError as re:
       logging.info("quit: " + str(re))
     finally:
@@ -164,7 +165,6 @@ def run(self):
         logging.error("Camera not available")
       self._running = False
 
-      get_event().wait_event_generators()
 
   def as_json(self):
     return {'name': self.name,

static/js/blockly/blocks.js

@@ -737,11 +737,11 @@ Blockly.Python['coderbot_adv_cnn_classify'] = function(block) {
   return [class_scores, Blockly.Python.ORDER_ATOMIC];
 };
 
-
 Blockly.Blocks['coderbot_event_generator'] = {
   init: function() {
-    this.appendStatementInput("event_generator_function")
-        .appendField("event generator")
+    this.appendDummyInput()
+        .appendField("event generator");
+    this.appendStatementInput("generator_statements")
         .setCheck(null);
     this.setColour(15);
  this.setTooltip("event generator");
@@ -752,9 +752,8 @@ Blockly.Blocks['coderbot_event_generator'] = {
 var coderbot_generator_id = 1;
 Blockly.Python['coderbot_event_generator'] = function(block) {
   Blockly.Generator.prototype.INDENT = '    ';
-  var statements_event_generator = Blockly.Python.statementToCode(block, 'event_generator_function');
+  var statements_event_generator = Blockly.Python.statementToCode(block, 'generator_statements');
   Blockly.Generator.prototype.INDENT = '  ';
-  // TODO: Assemble Python into code variable.
   var code = 'def event_generator_' + coderbot_generator_id + '():\n' +
              '  while True:\n' +
              '    get_prog_eng().check_end()\n' +
@@ -767,36 +766,37 @@ Blockly.Python['coderbot_event_generator'] = function(block) {
 Blockly.Blocks['coderbot_event_listener'] = {
   init: function() {
     this.appendDummyInput()
-        .appendField("event listener for: ")
-        .appendField(new Blockly.FieldDropdown([["image/classified","image/classified"], ["image/face_detected","image/face_detected"], ["sonar/obstacle","sonar/obstacle"]]), "event_topic");
-   this.appendStatementInput("event_listener_code")
+        .appendField("when:")
+        .appendField(new Blockly.FieldTextInput("event_topic"), "event_topic")
+        .appendField("with: event_data");
+    this.appendStatementInput("event_statements")
         .setCheck(null);
+    this.setInputsInline(true);
     this.setColour(15);
- this.setTooltip("event listener");
+ this.setTooltip("");
  this.setHelpUrl("");
   }
 };
 
 var coderbot_listener_id = 1;
 Blockly.Python['coderbot_event_listener'] = function(block) {
   var event_topic = block.getFieldValue('event_topic');
-  var statements_event_listener = Blockly.Python.statementToCode(block, 'event_listener_code');
-  // TODO: Assemble Python into code variable.
+  var event_statements = Blockly.Python.statementToCode(block, 'event_statements');
   var code = 'def event_listener_' + coderbot_listener_id + '(event_data):\n' +
-             statements_event_listener + '\n' +
+             event_statements + '\n' +
              'get_event().register_event_listener(\'' + event_topic + '\', event_listener_' + coderbot_listener_id + ')'
   coderbot_listener_id++; 
   return code;
 };
 
 Blockly.Blocks['coderbot_event_publisher'] = {
   init: function() {
+    this.appendValueInput("event_data")
+        .appendField("publish")
+        .setCheck(null);
     this.appendDummyInput()
-        .appendField("publish event on topic:")
+        .appendField("on topic:")
         .appendField(new Blockly.FieldTextInput("event_topic"), "event_topic");
-    this.appendValueInput("event_data")
-        .setCheck(null)
-        .appendField("data:");
     this.setInputsInline(true);
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);

templates/blocks_adv.xml

@@ -161,18 +161,49 @@
         </value>
       </block>
     </category>
-    <category name="{% trans %}Colour{% endtrans %}" colour="20">
-      <block type="colour_picker"></block>
-      <block type="colour_random"></block>
-      <block type="colour_rgb"></block>
-      <block type="colour_blend"></block>
-    </category>
     <category name="{% trans %}Variables{% endtrans %}" custom="VARIABLE" colour="330"></category>
     <category name="{% trans %}Functions{% endtrans %}" custom="PROCEDURE" colour="290"></category>
-    <category name="{% trans %}Event{% endtrans %}" colour="40">
-      <block type="coderbot_event_generator"></block>
-      <block type="coderbot_event_publisher"></block>
-      <block type="coderbot_event_listener"></block>
+    <category name="{% trans %}Event{% endtrans %}" colour="15">
+      <block type="coderbot_event_generator">
+        <value name="generator_statements">
+          <block type="controls_if">
+            <value name="IF0">
+              <block type="logic_compare"></block>
+            </value>
+            <value name="DO0">
+              <block type="coderbot_event_publisher">
+                <value name="event_data">
+                  <block type="text">
+                  </block>
+                </value>
+                <field name="event_topic">a_topic</field>
+              </block>
+            </value>
+          </block>
+        </value>
+      </block>
+      <block type="coderbot_event_publisher">
+        <value name="event_data">
+          <block type="text">
+          </block>
+        </value>
+        <field name="event_topic">a_topic</field>
+      </block>
+      <block type="coderbot_event_listener">
+        <field name="event_topic">a_topic</field>
+        <value name="event_statements">
+          <block type="text_print">
+            <value name="TEXT">
+              <block type="variables_get">
+                <field name="VAR">{% trans %}event_data{% endtrans %}</field>
+              </block>
+            </value>
+          </block>
+        </value>
+      </block>
+      <block type="variables_get">
+        <field name="VAR">{% trans %}event_data{% endtrans %}</field>
+      </block>
     </category>
     <category name="{% trans %}Movement{% endtrans %}" colour="40">
       <block type="coderbot_moveForward"></block>