Changeset 1385 for trunk/sources

Timestamp:

03/21/09 10:07:16 (16 years ago)

Author:

gkragl

Message:

Implemented persistence mechanism for XAxisLabelProvider (#434)

Location:

trunk/sources/HeuristicLab.Visualization

Files:

• ChartDataRowsModel.cs (modified) (2 diffs)
• LabelProvider/ContinuousLabelProvider.cs (modified) (2 diffs)
• LabelProvider/DiscreteLabelProvider.cs (modified) (2 diffs)
• LabelProvider/ILabelProvider.cs (modified) (1 diff)
• LabelProvider/StringLabelProvider.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Visualization/ChartDataRowsModel.cs

@@ -204 +204 @@
         node.AppendChild(columnElement);
       }
+
+      XmlNode labelProviderNode = document.ImportNode(labelProvider.GetLabelProviderXmlNode(), true);
+      node.AppendChild(labelProviderNode);
+
       return node;    
     }
@@ -211 +215 @@
 
       foreach (XmlNode dataRow in node.ChildNodes) {
-        XmlAttributeCollection attrs = dataRow.Attributes;
-        XmlAttribute rowIdAttr = (XmlAttribute)attrs.GetNamedItem("label");
-        string rowLabel = rowIdAttr.Value;
-        DataRow row = new DataRow();
-        row.Label = rowLabel;
-
-        string[] tokens = dataRow.InnerText.Split(';');
-        double[] data = new double[tokens.Length];
-        for (int i = 0; i < data.Length; i++) {
-          if (tokens[i].Length != 0) {
-            if (
-              double.TryParse(tokens[i], NumberStyles.Float, CultureInfo.InvariantCulture.NumberFormat, out data[i]) ==
-              false) {
-              throw new FormatException("Can't parse " + tokens[i] + " as double value.");
+        if (dataRow.Name.Equals("LabelProvider")) {
+          labelProvider = labelProvider.PopulateLabelProviderXmlNode(dataRow);
+        } else {
+          XmlAttributeCollection attrs = dataRow.Attributes;
+          XmlAttribute rowIdAttr = (XmlAttribute)attrs.GetNamedItem("label");
+          string rowLabel = rowIdAttr.Value;
+          DataRow row = new DataRow();
+          row.Label = rowLabel;
+
+          string[] tokens = dataRow.InnerText.Split(';');
+          double[] data = new double[tokens.Length];
+          for (int i = 0; i < data.Length; i++) {
+            if (tokens[i].Length != 0) {
+              if (
+                double.TryParse(tokens[i], NumberStyles.Float, CultureInfo.InvariantCulture.NumberFormat, out data[i]) ==
+                false) {
+                throw new FormatException("Can't parse " + tokens[i] + " as double value.");
+              }
             }
           }
-        }
-        row.AddValues(data);
-
-        AddDataRow(row);
+          row.AddValues(data);
+          AddDataRow(row);
+        }
       }
     }

trunk/sources/HeuristicLab.Visualization/LabelProvider/ContinuousLabelProvider.cs

@@ -1 +1 @@
 using System.Globalization;
+using System.Xml;
 
 namespace HeuristicLab.Visualization.LabelProvider {
@@ -14 +15 @@
       return value.ToString(format, CultureInfo.InvariantCulture);
     }
+
+    public XmlNode GetLabelProviderXmlNode()
+    {
+      XmlDocument Xdoc = new XmlDocument();
+
+      XmlNode lblProvInfo = Xdoc.CreateNode(XmlNodeType.Element, "LabelProvider", null);
+      lblProvInfo.InnerText = "ContinuousLabelProvider";
+
+      XmlAttribute idFormat = Xdoc.CreateAttribute("format");
+      idFormat.Value = this.format;
+
+      lblProvInfo.Attributes.Append(idFormat);
+
+      return lblProvInfo;
+    }
+
+    public ILabelProvider PopulateLabelProviderXmlNode(XmlNode node) {
+      var labelProvider = new ContinuousLabelProvider(node.SelectSingleNode("//LabelProvider").Attributes[0].Value);
+      return labelProvider;
+    }
   }
 }

trunk/sources/HeuristicLab.Visualization/LabelProvider/DiscreteLabelProvider.cs

@@ -1 +1 @@
 using System;
+using System.Xml;
 
 namespace HeuristicLab.Visualization.LabelProvider {
@@ -12 +13 @@
         return string.Empty;
     }
+
+    public XmlNode GetLabelProviderXmlNode()
+    {
+      XmlDocument Xdoc = new XmlDocument();
+
+      XmlNode lblProvInfo = Xdoc.CreateNode(XmlNodeType.Element, "LabelProvider", null);
+      lblProvInfo.InnerText = "DiscreteLabelProvider";
+
+      return lblProvInfo;
+    }
+
+    public ILabelProvider PopulateLabelProviderXmlNode(XmlNode node) {
+      var labelProvider = new DiscreteLabelProvider();
+      return labelProvider;
+    }
   }
 }

trunk/sources/HeuristicLab.Visualization/LabelProvider/ILabelProvider.cs

@@ +1 @@
+using System.Xml;
+
 namespace HeuristicLab.Visualization.LabelProvider {
   public interface ILabelProvider {
     string GetLabel(double value);
+    XmlNode GetLabelProviderXmlNode();
+    ILabelProvider PopulateLabelProviderXmlNode(XmlNode node);
   }
 }

trunk/sources/HeuristicLab.Visualization/LabelProvider/StringLabelProvider.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using HeuristicLab.Visualization.LabelProvider;
+using System.Xml;
 
 namespace HeuristicLab.Visualization.LabelProvider {
@@ -26 +27 @@
         return string.Empty;
     }
+
+    public XmlNode GetLabelProviderXmlNode() {
+      XmlDocument Xdoc = new XmlDocument();
+
+      XmlNode lblProvInfo = Xdoc.CreateNode(XmlNodeType.Element, "LabelProvider", null);
+      lblProvInfo.InnerText = "StringLabelProvider";
+
+      foreach (KeyValuePair<int, string> pair in labels)
+      {
+        XmlNode strLbl = Xdoc.CreateNode(XmlNodeType.Element, "String", null);
+
+        XmlAttribute idStrLbl = Xdoc.CreateAttribute("id");
+        idStrLbl.Value = pair.Key.ToString();
+        strLbl.Attributes.Append(idStrLbl);
+
+        strLbl.InnerText = pair.Value;
+        lblProvInfo.AppendChild(strLbl);
+      }
+      return lblProvInfo;
+    }
+
+    public ILabelProvider PopulateLabelProviderXmlNode(XmlNode node) {
+      var labelProvider = new StringLabelProvider();
+
+      foreach (XmlNode strLbl in node.SelectNodes("//String"))
+      {
+        labelProvider.SetLabel(int.Parse(strLbl.Attributes[0].Value), strLbl.InnerText);
+      }
+      return labelProvider;
+    }
   }
 }