git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@17660 ac1ea38d-2e2b...

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ExpressionTypes.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ExpressionTypes.java
index 3741a34ed21e07ec3850f42bdeb2fe9605c2a0c5..8b73d0b3bf6f701d140fd4910ea3d70cffa2a040 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ExpressionTypes.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ExpressionTypes.java
@@ -12,10 +12,10 @@ public class ExpressionTypes {
     public static enum ExpressionType {Auxiliary, Parameter, Constant, Lookup, WithLookup, Stock, Delay, Empty};\r
 \r
     public static ExpressionType[] auxiliaryExpressions = new ExpressionType[] {\r
-        ExpressionType.Parameter, \r
         ExpressionType.Auxiliary, \r
+        ExpressionType.Parameter, \r
         ExpressionType.Constant, \r
-        ExpressionType.Lookup, \r
+       // ExpressionType.Lookup, \r
         ExpressionType.WithLookup};\r
 \r
     public static ExpressionType[] valveExpressions = new ExpressionType[] {\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ExpressionWidget.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ExpressionWidget.java
index d569cd9629c163c4420646f2a0669e574b6f3fd6..a3ad7704c07ddbcb5dcaf3795529edc2d0e3c5d0 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ExpressionWidget.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ExpressionWidget.java
@@ -66,6 +66,7 @@ public class ExpressionWidget implements Widget {
         ExpressionType et = ExpressionTypes.getExpressionTypeForVariable(variable);\r
         \r
         displayExpression(et.toString(), true);\r
+        \r
     }\r
     \r
     \r
@@ -109,6 +110,8 @@ public class ExpressionWidget implements Widget {
             this.expression = exp;\r
             this.parent.layout();\r
             validateFields();\r
+            \r
+            save();\r
         }  \r
     }\r
     \r