-

Author: previ

camera.py

@@ -169,8 +169,6 @@ def calibrate(self):
   def find_line(self):
     self._image_lock.acquire()
     img = self.get_image(0).binarize()
-    #img.drawRectangle(0,200,640,40)
-    #img.drawRectangle(240,200,160,40, color=(0,0,255))
     slices = [0,0,0]
     blobs = [0,0,0]
     slices[0] = img.crop(0, 100, 160, 120)
@@ -179,7 +177,6 @@ def find_line(self):
     coords = [-1, -1, -1]
     for idx, slice in enumerate(slices):
       blobs[idx] = slice.find_blobs(minsize=30, maxsize=160)
-      #print "blobs: " + str(blobs[idx])
       if len(blobs[idx]):
         coords[idx] = (blobs[idx][0].center[0] * 100) / 160
 	print "line coord: " + str(idx) + " " +  str(coords[idx])+ " area: " + str(blobs[idx][0].area())

coderbot.cfg

@@ -1 +1 @@
-{"move_tr_speed": "75", "move_fw_elapse": "1.5", "show_page_program": "true", "load_at_start": "", "move_tr_elapse": "1", "sound_start": "$startup.mp3", "sound_stop": "$shutdown.mp3", "camera_exposure_mode": "auto", "prog_video_rec": "true", "show_control_move_commands": "true", "prog_level": "adv", "prog_scrollbars": "true", "ctrl_fw_speed": "100", "move_fw_speed": "100", "sound_shutter": "$shutter.mp3", "show_page_prefs": "true", "prog_maxblocks": "-1", "ctrl_hud_image": "", "button_func": "none", "move_motor_mode": "dc", "ctrl_fw_elapse": "-1", "ctrl_tr_elapse": "-1", "show_page_control": "true", "ctrl_tr_speed": "80"}
+{"move_tr_speed": "75", "move_fw_elapse": "1.5", "show_page_program": "true", "prog_saveonrun": "true", "load_at_start": "", "move_tr_elapse": "1", "sound_start": "$startup.mp3", "sound_stop": "$shutdown.mp3", "camera_exposure_mode": "auto", "prog_video_rec": "true", "prog_level": "basic_move", "prog_scrollbars": "true", "ctrl_fw_speed": "100", "move_fw_speed": "100", "sound_shutter": "$shutter.mp3", "show_page_prefs": "true", "prog_maxblocks": "5", "ctrl_hud_image": "", "button_func": "none", "move_motor_mode": "dc", "ctrl_fw_elapse": "-1", "ctrl_tr_elapse": "-1", "show_page_control": "true", "ctrl_tr_speed": "80"}

data/program_a b.data

@@ -0,0 +1 @@
+{"dom_code": "<xml xmlns=\"http://www.w3.org/1999/xhtml\"><block type=\"coderbot_moveForward\" id=\"6\" x=\"347\" y=\"30\"><next><block type=\"coderbot_moveForward\" id=\"7\"></block></next></block></xml>", "code": "get_bot().forward(speed=100, elapse=1.5)\nget_bot().forward(speed=100, elapse=1.5)\n", "name": "a b"}

static/js/program.js

@@ -149,10 +149,23 @@ $(document).on( "pagecreate", '#page-program', function( event ) {
 
       var bot = new CoderBot();
       // Generate JavaScript code and run it.
-      window.LoopTrap = 1000;
+      window.LoopTrap = 1000;  
       Blockly.Python.INFINITE_LOOP_TRAP = '  get_prog_eng().check_end()\n';
       var code = Blockly.Python.workspaceToCode();
-      Blockly.Python.INFINITE_LOOP_TRAP = null;
+
+      if(CODERBOT_PROG_SAVEONRUN) {
+        Blockly.Python.INFINITE_LOOP_TRAP = null;
+        var xml_code = Blockly.Xml.workspaceToDom(Blockly.mainWorkspace);
+        var dom_code = Blockly.Xml.domToText(xml_code);
+        var data =  {'name': prog.name, 'dom_code': dom_code, 'code': code};
+        try {
+          $.ajax({url: '/program/save', data: data, type: "POST", success:function(){
+            loadProgList();
+            }});
+        }catch (e) {
+          alert(e);
+        }
+      }
       try {
         var data =  {'name': prog.name,
                      'code': code};

templates/config.html

@@ -55,6 +55,8 @@ <h1>CoderBot</h1>
       <legend>{% trans %}Program editor details{% endtrans %}</legend>
       <label for="c_prog_scrollbars">{% trans %}Shows Editor scrollbars{% endtrans %}</label>
       <input type="checkbox" name="prog_scrollbars" id="c_prog_scrollbars" value="true" {%if config.prog_scrollbars=='true'%}checked="checked"{%endif%}>
+      <label for="c_prog_saveonrun">{% trans %}Save program before every run{% endtrans %}</label>
+      <input type="checkbox" name="prog_saveonrun" id="c_prog_saveonrun" value="true" {%if config.prog_saveonrun=='true'%}checiked="checked"{%endif%}>
      </fieldset>
      <div class="ui-field-contain">
       <label for="i_prog_move_mode">{% trans %}Movement assisted by vision{% endtrans %}</label>

templates/config_params.html

@@ -8,6 +8,7 @@
 var CODERBOT_PROG_LEVEL="{{config.prog_level}}";
 var CODERBOT_PROG_SCROLLBARS="{{config.prog_scrollbars}}"=="true";
 var CODERBOT_PROG_MAXBLOCKS={{config.prog_maxblocks}}<=0?Infinity:{{config.prog_maxblocks}};
+var CODERBOT_PROG_SAVEONRUN="{{config.prog_saveonrun}}"=="true";
 var CODERBOT_CTRL_FW_SPEED="{{config.ctrl_fw_speed}}";
 var CODERBOT_CTRL_FW_ELAPSE="{{config.ctrl_fw_elapse}}";
 var CODERBOT_CTRL_TR_SPEED="{{config.ctrl_tr_speed}}";

translations/it/LC_MESSAGES/messages.mo

@@ -257,7 +257,7 @@ msgstr "Salvato"
 
 #: templates/config_params.html:21
 msgid "Program saved"
-msgstr "Nome programma"
+msgstr "Programma salvato"
 
 #: templates/config_params.html:22
 msgid "Program name already in use, overwrite?"