issue OpenRoberta#887: add arduino circuit visualization

pretodev · Aug 30, 2020 · 3ea0c38 · 3ea0c38
1 parent a8cc67a
commit 3ea0c38
Show file tree

Hide file tree

Showing 9 changed files with 33,884 additions and 2 deletions.
diff --git a/OpenRobertaServer/staticResources/blockly/media/robots/arduino_mega.svg b/OpenRobertaServer/staticResources/blockly/media/robots/arduino_mega.svg
diff --git a/OpenRobertaServer/staticResources/blockly/media/robots/arduino_nano.svg b/OpenRobertaServer/staticResources/blockly/media/robots/arduino_nano.svg
diff --git a/OpenRobertaServer/staticResources/blockly/media/robots/arduino_uno.svg b/OpenRobertaServer/staticResources/blockly/media/robots/arduino_uno.svg
diff --git a/OpenRobertaServer/staticResources/blockly/media/robots/arduino_unowifirev2.svg b/OpenRobertaServer/staticResources/blockly/media/robots/arduino_unowifirev2.svg
diff --git a/OpenRobertaServer/staticResources/blockly/plugins/circuit_visualization.js b/OpenRobertaServer/staticResources/blockly/plugins/circuit_visualization.js
diff --git a/OpenRobertaServer/staticResources/blockly/plugins/circuit_visualization.js.map b/OpenRobertaServer/staticResources/blockly/plugins/circuit_visualization.js.map
diff --git a/OpenRobertaServer/staticResources/js/app/roberta/controller/configuration.controller.js b/OpenRobertaServer/staticResources/js/app/roberta/controller/configuration.controller.js
@@ -1,9 +1,10 @@
-define([ 'exports', 'log', 'util', 'comm', 'message', 'guiState.controller', 'blockly', 'configuration.model', 'jquery', 'jquery-validate' ], function(exports,
+define([ 'exports', 'log', 'util', 'comm', 'message', 'guiState.controller', 'blockly', 'configuration.model', 'jquery', 'jquery-validate', 'blockly.confvis' ], function(exports,
         LOG, UTIL, COMM, MSG, GUISTATE_C, Blockly, CONFIGURATION, $) {
 
     var $formSingleModal;
 
     var bricklyWorkspace;
+    var confVis;
     var listenToBricklyEvents = true;
     seen = false;
 
@@ -71,6 +72,7 @@ define([ 'exports', 'log', 'util', 'comm', 'message', 'guiState.controller', 'bl
                 UTIL.annotateBlocks(bricklyWorkspace, GUISTATE_C.confAnnos);
                 delete GUISTATE_C.confAnnos;
             }
+            confVis.refresh();
         }, 'tabConfiguration clicked');
 
         $('#tabConfiguration').on('hide.bs.tab', function(e) {
@@ -340,7 +342,20 @@ define([ 'exports', 'log', 'util', 'comm', 'message', 'guiState.controller', 'bl
     }
     exports.reloadView = reloadView;
 
+    function changeArduinoRobot(){
+        bricklyWorkspace.setDevice({
+            group : GUISTATE_C.getRobotGroup(),
+            robot : GUISTATE_C.getRobot()
+        });
+        confVis.resetRobot();
+    }
+    exports.changeArduinoRobot = changeArduinoRobot;
+
     function resetView() {
+        if(confVis){
+            confVis.dispose();
+            confVis = null;
+        }
         bricklyWorkspace.setDevice({
             group : GUISTATE_C.getRobotGroup(),
             robot : GUISTATE_C.getRobot()
@@ -362,7 +377,11 @@ define([ 'exports', 'log', 'util', 'comm', 'message', 'guiState.controller', 'bl
         bricklyWorkspace.clear();
         Blockly.svgResize(bricklyWorkspace);
         var dom = Blockly.Xml.textToDom(xml, bricklyWorkspace);
-        Blockly.Xml.domToWorkspace(dom, bricklyWorkspace);
+        if(bricklyWorkspace.device === 'arduino'){
+            confVis = CircuitVisualization.domToWorkspace(dom, bricklyWorkspace);
+        } else {
+            Blockly.Xml.domToWorkspace(dom, bricklyWorkspace);
+        }
         bricklyWorkspace.setVersion(dom.getAttribute('xmlversion'));
         var name = xml == GUISTATE_C.getConfigurationConf() ? GUISTATE_C.getRobotGroup().toUpperCase() + "basis" : '';
         GUISTATE_C.setConfigurationName(name);

diff --git a/OpenRobertaServer/staticResources/js/app/roberta/controller/robot.controller.js b/OpenRobertaServer/staticResources/js/app/roberta/controller/robot.controller.js
@@ -334,6 +334,7 @@ define([ 'exports', 'util', 'log', 'message', 'guiState.controller', 'guiState.m
                         PROGRAM_C.resetView();
                     } else {
                         GUISTATE_C.setRobot(robot, result);
+                        if(GUISTATE_C.findGroup(robot) === 'arduino') CONFIGURATION_C.changeArduinoRobot();
                     }
                     if (GUISTATE_C.getView() == 'tabConfList') {
                         $('#confList>.bootstrap-table').find('button[name="refresh"]').trigger('click');

diff --git a/OpenRobertaServer/staticResources/js/main.js b/OpenRobertaServer/staticResources/js/main.js
@@ -3,6 +3,7 @@ require.config({
 	paths: {
 		'codeflask': 'codeflask/codeflask.min',
 		'blockly': '../../blockly/blockly_compressed',
+		'blockly.confvis': '../../blockly/plugins/circuit_visualization',
 		'bootstrap': 'bootstrap/bootstrap-3.3.1-dist/dist/js/bootstrap.min',
 		'bootstrap-table': 'bootstrap/bootstrap-3.3.1-dist/dist/js/bootstrap-table.min',
 		'bootstrap-tagsinput': 'bootstrap/bootstrap-3.3.1-dist/dist/js/bootstrap-tagsinput.min',
@@ -101,6 +102,10 @@ require.config({
 		'blockly': {
 			exports: 'Blockly'
 		},
+		'blockly.confvis' : {
+			deps : [ 'blockly' ],
+			exports : 'CircuitVisualization'
+		},
 
 		'volume-meter': {
 			exports: "Volume",