Changeset 1988

Timestamp:

06/01/09 12:34:56 (16 years ago)

Author:

cbahner

Message:

#639 added color and y axis assignment to persistance

Location:

trunk/sources/HeuristicLab.Visualization/3.2

Files:

• AvgAggregator.cs (modified) (2 diffs)
• AvgLineAggregator.cs (modified) (2 diffs)
• ChartDataRowsModel.cs (modified) (4 diffs)
• DataRow.cs (modified) (2 diffs)
• DataRowBase.cs (modified) (2 diffs)
• FloatingAvgAggregator.cs (modified) (2 diffs)
• IDataRow.cs (modified) (2 diffs)
• MaxAggregator.cs (modified) (2 diffs)
• MinAggregator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Visualization/3.2/AvgAggregator.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
+using System.Xml;
 
 namespace HeuristicLab.Visualization {
@@ -147 +148 @@
     }
 
+    public override XmlNode ToXml(IDataRow row, XmlDocument document)
+    {
+      throw new System.NotImplementedException();
+    }
+
+    public override IDataRow FromXml(XmlNode xmlNode)
+    {
+      throw new System.NotImplementedException();
+    }
+
     #endregion
   }

trunk/sources/HeuristicLab.Visualization/3.2/AvgLineAggregator.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
+using System.Xml;
 
 namespace HeuristicLab.Visualization {
@@ -158 +159 @@
     }
 
+    public override XmlNode ToXml(IDataRow row, XmlDocument document)
+    {
+      throw new System.NotImplementedException();
+    }
+
+    public override IDataRow FromXml(XmlNode xmlNode)
+    {
+      throw new System.NotImplementedException();
+    }
+
     #endregion
   }

trunk/sources/HeuristicLab.Visualization/3.2/ChartDataRowsModel.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Globalization;
 using System.Xml;
@@ -16 +17 @@
     private ViewSettings viewSettings = new ViewSettings();
     private readonly XAxisDescriptor xAxisDescriptor = new XAxisDescriptor();
-    private readonly YAxisDescriptor defaultYAxisDescriptor = new YAxisDescriptor();
+    private YAxisDescriptor defaultYAxisDescriptor = new YAxisDescriptor();
     private readonly List<IDataRow> rows = new List<IDataRow>();
 
@@ -122 +123 @@
     public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
       XmlNode node = base.GetXmlNode(name, document, persistedObjects);
-
+      
+      List<YAxisDescriptor> yAxis = new List<YAxisDescriptor>();
+      yAxis.Add(defaultYAxisDescriptor);
       foreach (IDataRow row in rows) {
-        XmlNode columnElement = document.CreateNode(XmlNodeType.Element, "row", null);
-
-        XmlAttribute idAttr = document.CreateAttribute("label");
-        idAttr.Value = row.RowSettings.Label;
-        columnElement.Attributes.Append(idAttr);
-
-        StringBuilder builder = new StringBuilder();
-
-        for (int i = 0; i < row.Count; i++) {
-          if (i == 0) {
-            builder.Append(row[i].ToString(CultureInfo.InvariantCulture.NumberFormat));
-            //columnElement.InnerText += row[i].ToString(CultureInfo.InvariantCulture.NumberFormat);
-          } else {
-            builder.Append(";" + row[i].ToString(CultureInfo.InvariantCulture.NumberFormat));
-            //columnElement.InnerText += ";" + row[i].ToString(CultureInfo.InvariantCulture.NumberFormat);
-          }
-        }
-        columnElement.InnerText += builder.ToString();
-        node.AppendChild(columnElement);
+        XmlNode rowElement = row.ToXml(row, document);
+        
+        if (!yAxis.Contains(row.YAxis)) {
+          yAxis.Add(row.YAxis);
+        }
+        
+        node.AppendChild(rowElement);
+      }
+
+      foreach (YAxisDescriptor axis in yAxis) {
+        XmlNode yAxisElement = document.CreateNode(XmlNodeType.Element, "yAxis", null);
+
+        XmlAttribute attrLabel = document.CreateAttribute("label");
+        attrLabel.Value = axis.Label;
+        yAxisElement.Attributes.Append(attrLabel);
+
+        if (axis == defaultYAxisDescriptor) {
+          XmlAttribute attrDefault = document.CreateAttribute("default");
+          attrDefault.Value = "true";
+          yAxisElement.Attributes.Append(attrDefault);
+        }
+        node.AppendChild(yAxisElement);
+        
       }
 
@@ -148 +155 @@
       node.AppendChild(labelProviderNode);
 
-      return node;    
+      return node;
     }
 
     public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
       base.Populate(node, restoredObjects);
+
+      List<YAxisDescriptor> yAxis = new List<YAxisDescriptor>();
+      foreach (XmlNode dataRow in node.ChildNodes)
+      {
+        if (dataRow.Name.Equals("yAxis"))
+        {
+          XmlAttributeCollection attrs = dataRow.Attributes;
+
+          XmlAttribute attrYAxisLabel = (XmlAttribute)attrs.GetNamedItem("label");
+          string axisLabel = attrYAxisLabel.Value;
+          YAxisDescriptor axis = new YAxisDescriptor();
+          axis.Label = axisLabel;
+          yAxis.Add(axis);
+
+          XmlAttribute attrDefault = (XmlAttribute)attrs.GetNamedItem("default");
+          if (attrDefault != null) {
+            defaultYAxisDescriptor = axis;
+          }
+        }
+      }
 
       foreach (XmlNode dataRow in node.ChildNodes) {
         if (dataRow.Name.Equals("LabelProvider")) {
           XAxis.LabelProvider = XAxis.LabelProvider.PopulateLabelProviderXmlNode(dataRow);
-        } else {
+        } else if (dataRow.Name.Equals("row")) {
           XmlAttributeCollection attrs = dataRow.Attributes;
           XmlAttribute rowIdAttr = (XmlAttribute)attrs.GetNamedItem("label");
           string rowLabel = rowIdAttr.Value;
+          string rowColor = attrs.GetNamedItem("color").Value;
+
           DataRow row = new DataRow();
           row.RowSettings.Label = rowLabel;
+          row.RowSettings.Color = Color.FromName(rowColor);
+
+          string yAxisLabel = attrs.GetNamedItem("yAxis").Value;
+          foreach (YAxisDescriptor axis in yAxis) {
+            if (axis.Label.Equals(yAxisLabel)) {
+              row.YAxis = axis;
+            }
+          }
 
           string[] tokens = dataRow.InnerText.Split(';');

trunk/sources/HeuristicLab.Visualization/3.2/DataRow.cs

@@ -2 +2 @@
 using System.Drawing;
 using System.Collections.Generic;
+using System.Globalization;
+using System.Text;
+using System.Xml;
 
 namespace HeuristicLab.Visualization {
@@ -174 +177 @@
     }
 
+    public override XmlNode ToXml(IDataRow row, XmlDocument document)
+    {
+      XmlNode columnElement = document.CreateNode(XmlNodeType.Element, "row", null);
+
+      XmlAttribute idAttr = document.CreateAttribute("label");
+      idAttr.Value = row.RowSettings.Label;
+      columnElement.Attributes.Append(idAttr);
+
+      XmlAttribute attrColor = document.CreateAttribute("color");
+      attrColor.Value = row.RowSettings.Color.Name;
+      columnElement.Attributes.Append(attrColor);
+
+      XmlAttribute attrYAxis = document.CreateAttribute("yAxis");
+      attrYAxis.Value = row.YAxis.Label;
+      columnElement.Attributes.Append(attrYAxis);
+
+      StringBuilder builder = new StringBuilder();
+
+      for (int i = 0; i < row.Count; i++)
+      {
+        if (i == 0)
+        {
+          builder.Append(row[i].ToString(CultureInfo.InvariantCulture.NumberFormat));
+          //columnElement.InnerText += row[i].ToString(CultureInfo.InvariantCulture.NumberFormat);
+        }
+        else
+        {
+          builder.Append(";" + row[i].ToString(CultureInfo.InvariantCulture.NumberFormat));
+          //columnElement.InnerText += ";" + row[i].ToString(CultureInfo.InvariantCulture.NumberFormat);
+        }
+      }
+      columnElement.InnerText += builder.ToString();
+      return columnElement;
+    }
+
+    public override IDataRow FromXml(XmlNode xmlNode)
+    {
+      throw new System.NotImplementedException();
+    }
+
     private void UpdateMinMaxValue(double newValue, int oldValueIndex) {
       if (minValue != dataRow[oldValueIndex] && maxValue != dataRow[oldValueIndex])

trunk/sources/HeuristicLab.Visualization/3.2/DataRowBase.cs

@@ +1 @@
+using System.Xml;
 using HeuristicLab.Visualization.Options;
 
@@ -128 +129 @@
     public abstract double MaxValue { get; }
 
+    public abstract XmlNode ToXml(IDataRow row, XmlDocument document);
+    public abstract IDataRow FromXml(XmlNode xmlNode);
+   
+
     public event ValuesChangedHandler ValuesChanged;
 

trunk/sources/HeuristicLab.Visualization/3.2/FloatingAvgAggregator.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
+using System.Xml;
 
 namespace HeuristicLab.Visualization {
@@ -181 +182 @@
     }
 
+    public override XmlNode ToXml(IDataRow row, XmlDocument document)
+    {
+      throw new System.NotImplementedException();
+    }
+
+    public override IDataRow FromXml(XmlNode xmlNode)
+    {
+      throw new System.NotImplementedException();
+    }
+
     #endregion
   }

trunk/sources/HeuristicLab.Visualization/3.2/IDataRow.cs

@@ +1 @@
+using System.Xml;
 using HeuristicLab.Visualization.Options;
 
@@ -35 +36 @@
     double MaxValue { get; }
 
+    XmlNode ToXml(IDataRow row, XmlDocument document);
+    IDataRow FromXml(XmlNode xmlNode);
+
     event ValuesChangedHandler ValuesChanged;
     event ValueChangedHandler ValueChanged;

trunk/sources/HeuristicLab.Visualization/3.2/MaxAggregator.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
+using System.Xml;
 
 namespace HeuristicLab.Visualization {
@@ -115 +116 @@
     }
 
+    public override XmlNode ToXml(IDataRow row, XmlDocument document)
+    {
+      throw new System.NotImplementedException();
+    }
+
+    public override IDataRow FromXml(XmlNode xmlNode)
+    {
+      throw new System.NotImplementedException();
+    }
+
     #endregion
   }

trunk/sources/HeuristicLab.Visualization/3.2/MinAggregator.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
+using System.Xml;
 
 namespace HeuristicLab.Visualization {
@@ -116 +117 @@
     }
 
+    public override XmlNode ToXml(IDataRow row, XmlDocument document)
+    {
+      throw new System.NotImplementedException();
+    }
+
+    public override IDataRow FromXml(XmlNode xmlNode)
+    {
+      throw new System.NotImplementedException();
+    }
+
     #endregion
   }