git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/server/-configuration/run-mediacube-server-local.launch b/server/-configuration/run-mediacube-server-local.launch
index 6b842065e5f037f4c7922b4540ca9d0747c648ce..492823008be518cf42c99e40cdc006cae52be1fc 100644 (file)
--- a/server/-configuration/run-mediacube-server-local.launch
+++ b/server/-configuration/run-mediacube-server-local.launch
@@ -30,7 +30,7 @@
     <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>\r
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>\r
-    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dlog4j.configurationFile=settings/log4j2.xml&#13;&#10;-Djetty.home=settings&#13;&#10;-Djetty.etc.config.urls=jetty.xml&#13;&#10;-Dgosh.home=configuration&#13;&#10;-Djava.io.tmpdir=tmp&#13;&#10;-Djna.library.path=${workspace_loc}&#13;&#10;-Djava.library.path=${workspace_loc}"/>\r
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dlog4j.configurationFile=settings/log4j2.xml&#13;&#10;-Djetty.home=settings&#13;&#10;-Djetty.etc.config.urls=jetty.xml&#13;&#10;-Dgosh.home=configuration&#13;&#10;-Djava.io.tmpdir=tmp&#13;&#10;-Djna.library.path=${workspace_loc}&#13;&#10;-Djava.library.path=${workspace_loc}&#13;&#10;-Dorg.slf4j.simpleLogger.defaultLogLevel=error"/>\r
     <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}\-product\production\LOCAL"/>\r
     <stringAttribute key="pde.version" value="3.3"/>\r
     <setAttribute key="selected_target_bundles">\r

diff --git a/server/user.mediacube.gui/js/processVisualizer.js b/server/user.mediacube.gui/js/processVisualizer.js
index 6376d7324f94552a15e11d5f3e473c5f9e38b7d0..e0630fe4e09dc9a090f6652855add4949118966b 100644 (file)
--- a/server/user.mediacube.gui/js/processVisualizer.js
+++ b/server/user.mediacube.gui/js/processVisualizer.js
@@ -1,4 +1,4 @@
-/* global $ */\r
+\r
 var defaultFlowchartData = {\r
        operators: {\r
                operator1: {\r
@@ -41,15 +41,53 @@ var defaultFlowchartData = {
        }\r
 };\r
 \r
+var otherFlowchartData = {\r
+       operators: {\r
+               operator1: {\r
+                       top: 20,\r
+                       left: 20,\r
+                       properties: {\r
+                               title: 'Operator 3',\r
+                               inputs: {},\r
+                               outputs: {\r
+                                       output_1: {\r
+                                               label: 'Output 1',\r
+                                       }\r
+                               }\r
+                       }\r
+               },\r
+               operator2: {\r
+                       top: 80,\r
+                       left: 300,\r
+                       properties: {\r
+                               title: 'Operator 4',\r
+                               inputs: {\r
+                                       input_1: {\r
+                                               label: 'Input 1',\r
+                                       },\r
+                                       input_2: {\r
+                                               label: 'Input 2',\r
+                                       },\r
+                               },\r
+                               outputs: {}\r
+                       }\r
+               },\r
+       },\r
+       links: {\r
+               link_1: {\r
+                       fromOperator: 'operator1',\r
+                       fromConnector: 'output_1',\r
+                       toOperator: 'operator2',\r
+                       toConnector: 'input_2',\r
+               },\r
+       }\r
+};\r
+\r
 $(document).ready(function() {\r
        var $flowchart = $('#flowchartworkspace');\r
-       var $container = $flowchart.parent();\r
 \r
-       console.log("$flowchart: ", $flowchart);\r
-       console.log("$container: ", $container);\r
-       \r
        // Apply the plugin on a standard, empty div...\r
-       $flowchart.flowchart({          \r
+       var widget = $flowchart.flowchart({             \r
                data: defaultFlowchartData,\r
                defaultSelectedLinkColor: '#000055',\r
                grid: 10,\r
@@ -57,31 +95,10 @@ $(document).ready(function() {
                multipleLinksOnOutput: true\r
        });     \r
        \r
-       function getOperatorData($element) {\r
-               var nbInputs = parseInt($element.data('nb-inputs'), 10);\r
-               var nbOutputs = parseInt($element.data('nb-outputs'), 10);\r
-               var data = {\r
-                       properties: {\r
-                               title: $element.text(),\r
-                               inputs: {},\r
-                               outputs: {}\r
-                       }\r
-               };\r
-       \r
-               var i = 0;\r
-               for (i = 0; i < nbInputs; i++) {\r
-                       data.properties.inputs['input_' + i] = {\r
-                               label: 'Input ' + (i + 1)\r
-                       };\r
-               }\r
-               for (i = 0; i < nbOutputs; i++) {\r
-                       data.properties.outputs['output_' + i] = {\r
-                               label: 'Output ' + (i + 1)\r
-                       };\r
-               }\r
-       \r
-               return data;\r
-       }\r
+       setTimeout(() => {\r
+               console.log("Changing data", widget.flowchart);\r
+               widget.flowchart("setData", otherFlowchartData); \r
+               \r
+       }, 500);        \r
 });\r
 \r
-if (true) console.log('remove lint unused warning', defaultFlowchartData);
\ No newline at end of file

diff --git a/server/user.mediacube.gui/pages/processVisualizer.zul b/server/user.mediacube.gui/pages/processVisualizer.zul
index fd4a9dd7599187ab4a9cdb014f4b139df2d98633..81e29229212f55299bd5e2d09419b752887e9f37 100644 (file)
--- a/server/user.mediacube.gui/pages/processVisualizer.zul
+++ b/server/user.mediacube.gui/pages/processVisualizer.zul
@@ -4,7 +4,7 @@
        <style src="/css/jquery.flowchart.css" />\r
        <h:script src="/js/jquery-ui.js" />\r
        <h:script src="/js/jquery.flowchart.js" />\r
-       <script src="/js/processVisualizer.js" />\r
+       <script src="/js/processVisualizer.js?v=7" />\r
        \r
        <h:div id="chart_container">\r
                <h:div class="flowchart-example-container" id="flowchartworkspace" />\r