From f584865cbd8ecd4b4876088abc2a16fc591219c0 Mon Sep 17 00:00:00 2001
From: lempinen <lempinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Thu, 24 Oct 2013 11:44:14 +0000
Subject: [PATCH] Fixed history datasets when variable has spaces

refs #4494

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@28115 ac1ea38d-2e2b-0410-8846-a27921b304fc
---
 .../sysdyn/adapter/ActiveDatasetsIndexVariable.java         | 6 ++++--
 .../org/simantics/sysdyn/manager/HistoryDatasetResult.java  | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/ActiveDatasetsIndexVariable.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/ActiveDatasetsIndexVariable.java
index 176fd467..24293812 100644
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/ActiveDatasetsIndexVariable.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/ActiveDatasetsIndexVariable.java
@@ -45,12 +45,14 @@ public class ActiveDatasetsIndexVariable extends IndexVariable< ArrayList<DataSe
 		            String askedName = variableNames.get(i);
 		            if(askedName.contains("["))
 		                askedName = askedName.substring(0, askedName.indexOf("["));
-		            String datasetname = ds.name;
+		            String datasetname = ds.name.replace("_", " ");
 		            if(datasetname.contains("["))
 		                datasetname = datasetname.substring(0, datasetname.indexOf("["));
 		            
-		            if(askedName.equals(datasetname))
+		            if(askedName.equals(datasetname.replace("_", " ")))
 		                ds.name = askedName;
+		            else
+		                ds.name = datasetname;
 		            
 		            datasets.add(ds);
 		        }
diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/HistoryDatasetResult.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/HistoryDatasetResult.java
index a4963b8b..9805a7cb 100644
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/HistoryDatasetResult.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/HistoryDatasetResult.java
@@ -220,6 +220,9 @@ public class HistoryDatasetResult extends SimulationResult {
                         if(variable != null)
                             name = IndexUtils.equationRangesToIndexes(variable, name);
                     }
+                    
+                    // Replace spaces with '_'. That is how they are stored elsewhere
+                    name = name.replace(" ", "_");
 
                     // Read values to SysdynDataSet
                     SysdynDataSet ds = new SysdynDataSet(name, datasetName, new double[doubles.size()], new double[doubles.size()]);
-- 
2.47.1