From: miettinen <miettinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Thu, 20 Mar 2014 12:10:02 +0000 (+0000)
Subject: Sysdyn Datasets have for some reason been made to ignore case. In Modelica case matte... 
X-Git-Tag: 1.8.1~112
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=6783acaa32d5263ca967227928ea457ca72cfea4;p=simantics%2Fsysdyn.git

Sysdyn Datasets have for some reason been made to ignore case. In Modelica case matters so changed that back (refs #4777).
Made dependency arrows more curved by default.
Added WeighedAverage molecule (refs #4343).

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

diff --git a/org.simantics.modelica/src/org/simantics/modelica/data/SimulationResult.java b/org.simantics.modelica/src/org/simantics/modelica/data/SimulationResult.java
index 315b1fc8..092ea62a 100644
--- a/org.simantics.modelica/src/org/simantics/modelica/data/SimulationResult.java
+++ b/org.simantics.modelica/src/org/simantics/modelica/data/SimulationResult.java
@@ -410,10 +410,10 @@ public class SimulationResult {
      */
     public DataSet getDataSet(String name) {
         for(DataSet set : variables)
-            if(set.name.equalsIgnoreCase(name))
+            if(set.name.equals(name)) // Why on earth had these been changed to equalsIgnoreCase???
                 return set;
         for(DataSet set : initials)
-            if(set.name.equalsIgnoreCase(name))
+            if(set.name.equals(name)) // Why on earth had these been changed to equalsIgnoreCase???
                 return set;
         return null;
     }
diff --git a/org.simantics.sysdyn.feature/rootfiles/molecules/WeighedAverage.sysdyn b/org.simantics.sysdyn.feature/rootfiles/molecules/WeighedAverage.sysdyn
new file mode 100644
index 00000000..c6c6facf
Binary files /dev/null and b/org.simantics.sysdyn.feature/rootfiles/molecules/WeighedAverage.sysdyn differ
diff --git a/org.simantics.sysdyn.feature/rootfiles/molecules/WeighedAverage.sysdynModule b/org.simantics.sysdyn.feature/rootfiles/molecules/WeighedAverage.sysdynModule
new file mode 100644
index 00000000..c797e336
Binary files /dev/null and b/org.simantics.sysdyn.feature/rootfiles/molecules/WeighedAverage.sysdynModule differ
diff --git a/org.simantics.sysdyn.ontology/graph.tg b/org.simantics.sysdyn.ontology/graph.tg
index b3619d0b..3136074a 100644
Binary files a/org.simantics.sysdyn.ontology/graph.tg and b/org.simantics.sysdyn.ontology/graph.tg differ
diff --git a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
index 4fc523d6..1e6a8c00 100644
--- a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
+++ b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
@@ -595,7 +595,7 @@ SYSDYN.DependencyConnection <T DIA.Connection <T DIA.FontProvider <T DIA.ColorPr
     >-- SYSDYN.DependencyConnection.strokeWidth --> L0.Float <R L0.HasProperty : L0.FunctionalRelation
     @L0.assert SYSDYN.DependencyConnection.strokeWidth 
         0.3 : L0.Float
-    @L0.assert SYSDYN.Dependency.angle 0.1
+    @L0.assert SYSDYN.Dependency.angle 0.3
     MOD.DiagramConnectionTypeToConnectionType
         SYSDYN.Dependency
     @L0.assert G2D.HasFont SYSDYN.DefaultFont
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/routing/DependencyRouter.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/routing/DependencyRouter.java
index 34f8fd71..2cab67ea 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/routing/DependencyRouter.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/routing/DependencyRouter.java
@@ -31,7 +31,7 @@ public class DependencyRouter implements IRouter2 {
         createArrowShape(shapes,
         		begin.parentObstacle,
         		end.parentObstacle,
-        		0.1,
+        		0.3,
         		null);
         
         Path2D path = new Path2D.Double();
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/DependencyNode.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/DependencyNode.java
index 96681fcb..2bd3a51c 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/DependencyNode.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/DependencyNode.java
@@ -64,7 +64,7 @@ public class DependencyNode extends TextNode implements ISelectionPainterNode, I
     private Stroke stroke;
     private Shape beginBounds;
     private Shape endBounds;
-    private double angle = 0.1;
+    private double angle = 0.3;
     private String side;
     private boolean delayMark = false;
     private boolean arrowHead = true;