Fixed: Charts work with Sysdyn variables which have spaces in their names (refs ...

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

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/IndexVariable.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/IndexVariable.java
index f73c313cde277610c8eecf645d59ee755b9cd914..3afc87f746c766417cba6723b8f96503465f3ac7 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/IndexVariable.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/IndexVariable.java
@@ -220,8 +220,8 @@ public abstract class IndexVariable<T> extends AbstractPropertyVariable {
         for(String k : rvis.keySet()) {\r
                if(k.matches(test)) {\r
                        String value = rvis.get(k);\r
-                       result.first.add(k.substring(1).replace("/", "."));\r
-                       result.second.add(value.substring(1).replace("/", "."));\r
+                       result.first.add(k.substring(1).replace("/", ".").replace("%20", "_"));\r
+                       result.second.add(value.substring(1).replace("/", ".").replace("%20", " "));\r
                }\r
         }\r
         \r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.java
index 0c38a0e9cbd10815f8f361aa828c8c063ec86c49..b7bb6f4a8a00a7e242e9d7050a1104cd58b6fd72 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.java
@@ -493,7 +493,6 @@ public class ExpressionParser implements ExpressionParserConstants {
     tempToken.endLine = token.endLine;\r
     tempToken.endColumn = token.endColumn;\r
         concatToken = tempToken;\r
-        System.out.println(concatToken.image);\r
       break;\r
     default:\r
       jj_la1[21] = jj_gen;\r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.jj b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.jj
index 7c79449e0b059c6673bb4ceacc4180d80435255d..eab29f8c16ec297144068c1d4abc1fd0a143b0ce 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.jj
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.jj
@@ -231,7 +231,6 @@ Token ident() : {
     tempToken.endLine = token.endLine;\r
     tempToken.endColumn = token.endColumn;\r
        concatToken = tempToken;\r
-       System.out.println(concatToken.image);\r
   }\r
   )?\r
   {\r    return concatToken;\r