Skip to content

Commit 7f8cd1d

Browse files
author
Roberto Previtera
committed
fix blockly INDENT
1 parent aa5a7de commit 7f8cd1d

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

src/components/Activity.vue

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,8 @@ export default {
446446
var serializedToolbox = this.$base64.decode(b64Toolbox)
447447
448448
// Initialise Blockly Instance
449-
this.workspace = Blockly.inject(
449+
//Blockly.Generator.prototype.INDENT = ' ';
450+
this.workspace = Blockly.inject(
450451
// Blockly container
451452
this.$refs.blocklyDiv,
452453
// Options
@@ -498,7 +499,10 @@ export default {
498499
var CODERBOT_CTRL_COUNTER = true; // to check, never used
499500
var CODERBOT_CTRL_MOVE_MOTION = false; //t o check
500501
var CODERBOT_CTRL_MOVE_MPU = false; // to check
501-
var CODERBOT_CNN_MODEL_LIST = ""
502+
var CODERBOT_CNN_MODEL_LIST = [['base_high_slow', 'base_high_slow'],
503+
['base_low_fast', 'base_low_fast'],
504+
['object_detect', 'object_detect'],
505+
['object_detect_mobile', 'object_detect_mobile']];
502506
503507
var BotMessages = Object();
504508
BotMessages.Input = "Say what:";
@@ -1423,12 +1427,13 @@ export default {
14231427
14241428
var coderbot_generator_id = 1;
14251429
Blockly.Python['coderbot_event_generator'] = function(block) {
1426-
Blockly.Generator.prototype.INDENT = ' ';
1430+
var INDENT_saved = Blockly.Generator.prototype.INDENT;
1431+
Blockly.Generator.prototype.INDENT = Blockly.Generator.prototype.INDENT + Blockly.Generator.prototype.INDENT;
14271432
var statements_event_generator = Blockly.Python.statementToCode(block, 'generator_statements');
1428-
Blockly.Generator.prototype.INDENT = ' ';
1433+
Blockly.Generator.prototype.INDENT = INDENT_saved;
14291434
var code = 'def event_generator_' + coderbot_generator_id + '():\n' +
1430-
' while True:\n' +
1431-
' get_prog_eng().check_end()\n' +
1435+
INDENT_saved + 'while True:\n' +
1436+
INDENT_saved + INDENT_saved + 'get_prog_eng().check_end()\n' +
14321437
statements_event_generator + '\n' +
14331438
'get_event().register_event_generator(event_generator_' + coderbot_generator_id + ')'
14341439
coderbot_generator_id++;
@@ -1807,7 +1812,7 @@ export default {
18071812
let isDefault = this.isDefault
18081813
18091814
window.LoopTrap = 1000;
1810-
Blockly.Python.INFINITE_LOOP_TRAP = ' get_prog_eng().check_end()\n';
1815+
Blockly.Python.INFINITE_LOOP_TRAP = 'get_prog_eng().check_end()\n';
18111816
let code = Blockly.Python.workspaceToCode(workspace);
18121817
Blockly.Python.INFINITE_LOOP_TRAP = null;
18131818
@@ -2055,7 +2060,7 @@ export default {
20552060
var xml_code = Blockly.Xml.workspaceToDom(this.workspace);
20562061
var dom_code = Blockly.Xml.domToText(xml_code);
20572062
window.LoopTrap = 1000;
2058-
Blockly.Python.INFINITE_LOOP_TRAP = ' get_prog_eng().check_end()\n';
2063+
Blockly.Python.INFINITE_LOOP_TRAP = 'get_prog_eng().check_end()\n';
20592064
var code = Blockly.Python.workspaceToCode(this.workspace);
20602065
Blockly.Python.INFINITE_LOOP_TRAP = null;
20612066
@@ -2085,7 +2090,7 @@ export default {
20852090
var xml_code = Blockly.Xml.workspaceToDom(this.workspace);
20862091
var dom_code = Blockly.Xml.domToText(xml_code);
20872092
window.LoopTrap = 1000;
2088-
Blockly.Python.INFINITE_LOOP_TRAP = ' get_prog_eng().check_end()\n';
2093+
Blockly.Python.INFINITE_LOOP_TRAP = 'get_prog_eng().check_end()\n';
20892094
var code = Blockly.Python.workspaceToCode(this.workspace);
20902095
Blockly.Python.INFINITE_LOOP_TRAP = null;
20912096

0 commit comments

Comments
 (0)