From: miettinen <miettinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Wed, 6 Nov 2013 08:19:54 +0000 (+0000)
Subject: Fix to (refs #4521)
X-Git-Tag: 1.8.1~202
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=06cd4c71b46975c2d863d060117a829601125fe6;p=simantics%2Fsysdyn.git

Fix to (refs #4521)

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@28182 ac1ea38d-2e2b-0410-8846-a27921b304fc
---

diff --git a/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java b/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java
index 5df32f8a..da8f6ba4 100644
--- a/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java
+++ b/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java
@@ -526,10 +526,8 @@ public class ModelicaManager {
 	 * @throws IOException
 	 */
 	public static Process runModelica(SimulationLocation location, IModelicaMonitor monitor, HashMap<String, String> experimentParameters, HashMap<String, String> parameterChanges) throws IOException {
+		ArrayList<String> commands = new ArrayList<String>();
 		try {
-			ArrayList<String> commands = new ArrayList<String>();
-			commands.add(location.executableFile.getAbsolutePath());
-
 			if(experimentParameters.get(RESULT_FILE_NAME) != null) {
 				commands.add("-r="+experimentParameters.get(RESULT_FILE_NAME));
 			}
@@ -566,7 +564,12 @@ public class ModelicaManager {
 			e.printStackTrace();
 		}
 		
-		return runWithEnvironment(location.omHome, location.getModelDir(), location.executableFile);
+		// Commands to String[]
+		String[] commandString = new String[commands.size()];
+		for (int i = 0; i < commands.size(); ++i)
+			 commandString[i] = commands.get(i);
+		
+		return runWithEnvironment(location.omHome, location.getModelDir(), location.executableFile, commandString);
 	}
 
 	public static String getFlatModelText(SimulationLocation location, IModelicaMonitor monitor, List<String> additional) {
diff --git a/org.simantics.sysdyn.ui/icons/dependency.png b/org.simantics.sysdyn.ui/icons/dependency.png
index 6a604a30..768b55f7 100644
Binary files a/org.simantics.sysdyn.ui/icons/dependency.png and b/org.simantics.sysdyn.ui/icons/dependency.png differ
diff --git a/org.simantics.sysdyn.ui/icons/dependency_old.png b/org.simantics.sysdyn.ui/icons/dependency_old.png
new file mode 100644
index 00000000..6a604a30
Binary files /dev/null and b/org.simantics.sysdyn.ui/icons/dependency_old.png differ
diff --git a/org.simantics.sysdyn.ui/icons/flow.png b/org.simantics.sysdyn.ui/icons/flow.png
index b1a18192..e90b3d28 100644
Binary files a/org.simantics.sysdyn.ui/icons/flow.png and b/org.simantics.sysdyn.ui/icons/flow.png differ
diff --git a/org.simantics.sysdyn.ui/icons/flow_old.png b/org.simantics.sysdyn.ui/icons/flow_old.png
new file mode 100644
index 00000000..b1a18192
Binary files /dev/null and b/org.simantics.sysdyn.ui/icons/flow_old.png differ