From: vasary.daniel <TFS\vasary.daniel>
Date: Wed, 13 Apr 2022 14:31:10 +0000 (+0000)
Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... 
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=dcad9276b6a0ffddbc08befbacace19ed37c081d;p=mediacube.git

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

diff --git a/server/-configuration/run-mediacube-server-local.launch b/server/-configuration/run-mediacube-server-local.launch
index 6b842065..49282300 100644
--- 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"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-    <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}"/>
+    <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"/>
     <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}\-product\production\LOCAL"/>
     <stringAttribute key="pde.version" value="3.3"/>
     <setAttribute key="selected_target_bundles">
diff --git a/server/user.mediacube.gui/js/processVisualizer.js b/server/user.mediacube.gui/js/processVisualizer.js
index 6376d732..e0630fe4 100644
--- a/server/user.mediacube.gui/js/processVisualizer.js
+++ b/server/user.mediacube.gui/js/processVisualizer.js
@@ -1,4 +1,4 @@
-/* global $ */
+
 var defaultFlowchartData = {
 	operators: {
 		operator1: {
@@ -41,15 +41,53 @@ var defaultFlowchartData = {
 	}
 };
 
+var otherFlowchartData = {
+	operators: {
+		operator1: {
+			top: 20,
+			left: 20,
+			properties: {
+				title: 'Operator 3',
+				inputs: {},
+				outputs: {
+					output_1: {
+						label: 'Output 1',
+					}
+				}
+			}
+		},
+		operator2: {
+			top: 80,
+			left: 300,
+			properties: {
+				title: 'Operator 4',
+				inputs: {
+					input_1: {
+						label: 'Input 1',
+					},
+					input_2: {
+						label: 'Input 2',
+					},
+				},
+				outputs: {}
+			}
+		},
+	},
+	links: {
+		link_1: {
+			fromOperator: 'operator1',
+			fromConnector: 'output_1',
+			toOperator: 'operator2',
+			toConnector: 'input_2',
+		},
+	}
+};
+
 $(document).ready(function() {
 	var $flowchart = $('#flowchartworkspace');
-	var $container = $flowchart.parent();
 
-	console.log("$flowchart: ", $flowchart);
-	console.log("$container: ", $container);
-	
 	// Apply the plugin on a standard, empty div...
-	$flowchart.flowchart({		
+	var widget = $flowchart.flowchart({		
 		data: defaultFlowchartData,
 		defaultSelectedLinkColor: '#000055',
 		grid: 10,
@@ -57,31 +95,10 @@ $(document).ready(function() {
 		multipleLinksOnOutput: true
 	});	
 	
-	function getOperatorData($element) {
-		var nbInputs = parseInt($element.data('nb-inputs'), 10);
-		var nbOutputs = parseInt($element.data('nb-outputs'), 10);
-		var data = {
-			properties: {
-				title: $element.text(),
-				inputs: {},
-				outputs: {}
-			}
-		};
-	
-		var i = 0;
-		for (i = 0; i < nbInputs; i++) {
-			data.properties.inputs['input_' + i] = {
-				label: 'Input ' + (i + 1)
-			};
-		}
-		for (i = 0; i < nbOutputs; i++) {
-			data.properties.outputs['output_' + i] = {
-				label: 'Output ' + (i + 1)
-			};
-		}
-	
-		return data;
-	}
+	setTimeout(() => {
+		console.log("Changing data", widget.flowchart);
+		widget.flowchart("setData", otherFlowchartData); 
+		
+	}, 500);	
 });
 
-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 fd4a9dd7..81e29229 100644
--- 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" />
  	<h:script src="/js/jquery-ui.js" />
  	<h:script src="/js/jquery.flowchart.js" />
-	<script src="/js/processVisualizer.js" />
+	<script src="/js/processVisualizer.js?v=7" />
 	
 	<h:div id="chart_container">
 		<h:div class="flowchart-example-container" id="flowchartworkspace" />