Sysdyn Datasets have for some reason been made to ignore case. In Modelica case matte...

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 315b1fc847a800ad6f4b3e98236356fe46893bf8..092ea62ab110939067f15424071ff272dbcb4bc9 100644 (file)
--- 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 {
      */\r
     public DataSet getDataSet(String name) {\r
         for(DataSet set : variables)\r
-            if(set.name.equalsIgnoreCase(name))\r
+            if(set.name.equals(name)) // Why on earth had these been changed to equalsIgnoreCase???\r
                 return set;\r
         for(DataSet set : initials)\r
-            if(set.name.equalsIgnoreCase(name))\r
+            if(set.name.equals(name)) // Why on earth had these been changed to equalsIgnoreCase???\r
                 return set;\r
         return null;\r
     }\r

diff --git a/org.simantics.sysdyn.feature/rootfiles/molecules/WeighedAverage.sysdyn b/org.simantics.sysdyn.feature/rootfiles/molecules/WeighedAverage.sysdyn
new file mode 100644 (file)
index 0000000..c6c6fac
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 (file)
index 0000000..c797e33
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 b3619d0b2257ce3c33e7db0e739050165bf44dfd..3136074ab11d3b057a312707bef16311e135aeca 100644 (file)
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 4fc523d69f5eba066de40a5da247e3649e6e050d..1e6a8c00fc1ec359777172aa7c693f033ea13675 100644 (file)
--- 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 34f8fd71761f030702b4ccb76abc0ba4a64457c0..2cab67ead25c790d2452bb793227e738913237f9 100644 (file)
--- 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,\r
                        begin.parentObstacle,\r
                        end.parentObstacle,\r
-                       0.1,\r
+                       0.3,\r
                        null);\r
         \r
         Path2D path = new Path2D.Double();\r

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 96681fcb3219cc29307eb5d4efb0c2d9699559af..2bd3a51c15c0a6dd8ae32b671e0430758c7abdb4 100644 (file)
--- 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;\r
     private Shape beginBounds;\r
     private Shape endBounds;\r
-    private double angle = 0.1;\r
+    private double angle = 0.3;\r
     private String side;\r
     private boolean delayMark = false;\r
     private boolean arrowHead = true;\r