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 5df32f8addacc2df7a8907add6a3272a75f74d3f..da8f6ba4ac5cd28963ff2e9f8ba3280f337fc5cb 100644 (file)
--- 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\r
         */\r
        public static Process runModelica(SimulationLocation location, IModelicaMonitor monitor, HashMap<String, String> experimentParameters, HashMap<String, String> parameterChanges) throws IOException {\r
+               ArrayList<String> commands = new ArrayList<String>();\r
                try {\r
-                       ArrayList<String> commands = new ArrayList<String>();\r
-                       commands.add(location.executableFile.getAbsolutePath());\r
-\r
                        if(experimentParameters.get(RESULT_FILE_NAME) != null) {\r
                                commands.add("-r="+experimentParameters.get(RESULT_FILE_NAME));\r
                        }\r
@@ -566,7 +564,12 @@ public class ModelicaManager {
                        e.printStackTrace();\r
                }\r
                \r
-               return runWithEnvironment(location.omHome, location.getModelDir(), location.executableFile);\r
+               // Commands to String[]\r
+               String[] commandString = new String[commands.size()];\r
+               for (int i = 0; i < commands.size(); ++i)\r
+                        commandString[i] = commands.get(i);\r
+               \r
+               return runWithEnvironment(location.omHome, location.getModelDir(), location.executableFile, commandString);\r
        }\r
 \r
        public static String getFlatModelText(SimulationLocation location, IModelicaMonitor monitor, List<String> additional) {\r

diff --git a/org.simantics.sysdyn.ui/icons/dependency.png b/org.simantics.sysdyn.ui/icons/dependency.png
index 6a604a309e7996e66446f40a00738e16c33b4199..768b55f7eeb98402d74a6a3d5f77aed1c4442a75 100644 (file)
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 (file)
index 0000000..6a604a3
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 b1a1819238c6de8f9e50988f4151261fa6ba64ea..e90b3d28b295c0716bf0d4b59fcc0b36eb502f63 100644 (file)
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 (file)
index 0000000..b1a1819
Binary files /dev/null and b/org.simantics.sysdyn.ui/icons/flow_old.png differ