Add support for specifying DecimalFormat format for static info

gitlab #59

Change-Id: I718671cf0d91ab402e83b7570d3fc2170b1349c2
(cherry picked from commit 4082549fe417eb372b215e6199ce43b8e223367d)

diff --git a/org.simantics.district.network/scl/Simantics/District/DynamicVisualisations/StaticDynamicContribution.scl b/org.simantics.district.network/scl/Simantics/District/DynamicVisualisations/StaticDynamicContribution.scl
index 2a82d3427a9aabdd0afd2aa57afdd1030b39f634..9f461999ac2b3ac2590b1c9a5d0228687eee9b69 100644 (file)
--- a/org.simantics.district.network/scl/Simantics/District/DynamicVisualisations/StaticDynamicContribution.scl
+++ b/org.simantics.district.network/scl/Simantics/District/DynamicVisualisations/StaticDynamicContribution.scl
@@ -5,7 +5,7 @@ importJava "org.simantics.district.network.visualisations.model.StaticInformatio
     data StaticInformationContribution
     
     @JavaName "<init>"
-    staticInformationContribution :: String -> String -> String -> String -> StaticInformationContribution
+    staticInformationContribution :: String -> String -> String -> String -> String -> StaticInformationContribution
 
 importJava "org.simantics.district.network.visualisations.model.DynamicSymbolContribution" where
     data DynamicSymbolContribution

diff --git a/org.simantics.district.network/src/org/simantics/district/network/visualisations/model/StaticInformationContribution.java b/org.simantics.district.network/src/org/simantics/district/network/visualisations/model/StaticInformationContribution.java
index 6e8b9363b4c3fb1429f2c106be2165f928a0c149..a76e6765c0967e0720bb7ef9f1c0bdcf6fcddb58 100644 (file)
--- a/org.simantics.district.network/src/org/simantics/district/network/visualisations/model/StaticInformationContribution.java
+++ b/org.simantics.district.network/src/org/simantics/district/network/visualisations/model/StaticInformationContribution.java
@@ -6,16 +6,18 @@ public class StaticInformationContribution {
     private String moduleName;
     private String attributeName;
     private String unit;
+    private String format;
     
     // for graph persistence only
     private boolean used;
     private boolean useDefault;
 
-    public StaticInformationContribution(String label, String moduleName, String attributeName, String unit) {
+    public StaticInformationContribution(String label, String moduleName, String attributeName, String unit, String format) {
         this.label = label;
         this.moduleName = moduleName;
         this.attributeName = attributeName;
         this.unit = unit;
+        this.format = format;
     }
 
     public String getLabel() {
@@ -33,7 +35,11 @@ public class StaticInformationContribution {
     public String getUnit() {
         return unit;
     }
-    
+
+    public String getFormat() {
+        return format;
+    }
+
     public boolean isUsed() {
         return used;
     }
@@ -49,5 +55,4 @@ public class StaticInformationContribution {
     public void setUseDefault(boolean useDefault) {
         this.useDefault = useDefault;
     }
-
 }
\ No newline at end of file