Changeset 4870

Timestamp:

11/20/10 02:44:45 (14 years ago)

Author:

swagner

Message:

Added axis labels for data tables (#925)

Location:

trunk/sources

Files:

• HeuristicLab.Analysis.Views/3.3/DataTableView.cs (modified) (5 diffs)
• HeuristicLab.Analysis/3.3/AlleleFrequencyAnalyzer.cs (modified) (2 diffs)
• HeuristicLab.Analysis/3.3/DataRowVisualProperties.cs (modified) (1 diff)
• HeuristicLab.Analysis/3.3/DataTable.cs (modified) (3 diffs)
• HeuristicLab.Analysis/3.3/DataTableVisualProperties.cs (added)
• HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj (modified) (1 diff)
• HeuristicLab.Analysis/3.3/PopulationDiversityAnalyzer.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableView.cs

@@ -67 +67 @@
       foreach (DataRow row in Content.Rows)
         DeregisterDataRowEvents(row);
+      Content.VisualPropertiesChanged -= new EventHandler(Content_VisualPropertiesChanged);
       Content.Rows.ItemsAdded -= new CollectionItemsChangedEventHandler<DataRow>(Rows_ItemsAdded);
       Content.Rows.ItemsRemoved -= new CollectionItemsChangedEventHandler<DataRow>(Rows_ItemsRemoved);
@@ -80 +81 @@
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
+      Content.VisualPropertiesChanged += new EventHandler(Content_VisualPropertiesChanged);
       Content.Rows.ItemsAdded += new CollectionItemsChangedEventHandler<DataRow>(Rows_ItemsAdded);
       Content.Rows.ItemsRemoved += new CollectionItemsChangedEventHandler<DataRow>(Rows_ItemsRemoved);
@@ -92 +94 @@
       invisibleSeries.Clear();
       chart.Titles[0].Text = string.Empty;
+      chart.ChartAreas[0].AxisX.Title = string.Empty;
+      chart.ChartAreas[0].AxisY.Title = string.Empty;
+      chart.ChartAreas[0].AxisY2.Title = string.Empty;
       chart.Series.Clear();
       if (Content != null) {
@@ -97 +102 @@
         foreach (DataRow row in Content.Rows)
           AddDataRow(row);
+        chart.ChartAreas[0].AxisX.Title = Content.VisualProperties.XAxisTitle;
+        chart.ChartAreas[0].AxisY.Title = Content.VisualProperties.YAxisTitle;
+        chart.ChartAreas[0].AxisY2.Title = Content.VisualProperties.SecondYAxisTitle;
       }
     }
@@ -188 +196 @@
       }
     }
+    private void Content_VisualPropertiesChanged(object sender, EventArgs e) {
+      if (InvokeRequired)
+        Invoke(new EventHandler(Content_VisualPropertiesChanged), sender, e);
+      else {
+        chart.ChartAreas[0].AxisX.Title = Content.VisualProperties.XAxisTitle;
+        chart.ChartAreas[0].AxisY.Title = Content.VisualProperties.YAxisTitle;
+        chart.ChartAreas[0].AxisY2.Title = Content.VisualProperties.SecondYAxisTitle;
+      }
+    }
     private void Rows_ItemsAdded(object sender, CollectionItemsChangedEventArgs<DataRow> e) {
       if (InvokeRequired)

trunk/sources/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalyzer.cs

@@ -172 +172 @@
         if (!results.ContainsKey("Alleles")) {
           allelesTable = new DataTable("Alleles");
-          results.Add(new Result("Alleles", allelesTable));
+          allelesTable.VisualProperties.XAxisTitle = "Iteration";
+          allelesTable.VisualProperties.YAxisTitle = "Number of Alleles";
+          allelesTable.VisualProperties.SecondYAxisTitle = "Number of Alleles";
 
           allelesTable.Rows.Add(new DataRow("Unique Alleles"));
@@ -192 +194 @@
           allelesTable.Rows["Lost Alleles of Best Known Solution"].VisualProperties.SecondYAxis = true;
           allelesTable.Rows["Lost Alleles of Best Known Solution"].VisualProperties.StartIndexZero = true;
+
+          results.Add(new Result("Alleles", allelesTable));
         } else {
           allelesTable = (DataTable)results["Alleles"].Value;

trunk/sources/HeuristicLab.Analysis/3.3/DataRowVisualProperties.cs

@@ -119 +119 @@
       startIndexZero = false;
     }
-    public DataRowVisualProperties(DataRowChartType chartType, bool secondYAxis, Color color, bool startIndexZero) {
-      this.chartType = chartType;
-      this.secondYAxis = secondYAxis;
-      this.color = color;
-      this.startIndexZero = startIndexZero;
-    }
 
     public override IDeepCloneable Clone(Cloner cloner) {

trunk/sources/HeuristicLab.Analysis/3.3/DataTable.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Drawing;
 using System.Linq;
@@ -41 +42 @@
     }
 
-    [Storable]
+    private DataTableVisualProperties visualProperties;
+    public DataTableVisualProperties VisualProperties {
+      get { return visualProperties; }
+      set {
+        if (visualProperties != value) {
+          if (value == null) throw new ArgumentNullException("VisualProperties");
+          if (visualProperties != null) visualProperties.PropertyChanged -= new PropertyChangedEventHandler(VisualProperties_PropertyChanged);
+          visualProperties = value;
+          visualProperties.PropertyChanged += new PropertyChangedEventHandler(VisualProperties_PropertyChanged);
+          OnVisualPropertiesChanged();
+        }
+      }
+    }
+
     private NamedItemCollection<DataRow> rows;
     public NamedItemCollection<DataRow> Rows {
@@ -47 +61 @@
     }
 
-    #region Storing & Cloning
+    #region Persistence Properties
+    [Storable(Name = "VisualProperties")]
+    private DataTableVisualProperties StorableVisualProperties {
+      get { return VisualProperties; }
+      set { VisualProperties = value; }
+    }
+    [Storable(Name = "rows")]
+    private IEnumerable<DataRow> StorableRows {
+      get { return rows; }
+      set { rows = new NamedItemCollection<DataRow>(value); }
+    }
+    #endregion
+
     [StorableConstructor]
     private DataTable(bool deserializing) : base(deserializing) { }
     private DataTable(DataTable original, Cloner cloner)
       : base(original, cloner) {
+      this.VisualProperties = (DataTableVisualProperties)cloner.Clone(original.visualProperties);
       this.rows = cloner.Clone(original.rows);
       this.RegisterRowsEvents();
     }
+    public DataTable()
+      : base() {
+      VisualProperties = new DataTableVisualProperties();
+      rows = new NamedItemCollection<DataRow>();
+      this.RegisterRowsEvents();
+    }
+    public DataTable(string name)
+      : base(name) {
+      VisualProperties = new DataTableVisualProperties();
+      rows = new NamedItemCollection<DataRow>();
+      this.RegisterRowsEvents();
+    }
+    public DataTable(string name, string description)
+      : base(name, description) {
+      VisualProperties = new DataTableVisualProperties();
+      rows = new NamedItemCollection<DataRow>();
+      this.RegisterRowsEvents();
+    }
+
+    // BackwardsCompatibility3.3
+    #region Backwards compatible code, remove with 3.4
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      if (VisualProperties == null) VisualProperties = new DataTableVisualProperties();
+    }
+    #endregion
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new DataTable(this, cloner);
     }
-    #endregion
-    public DataTable()
-      : base() {
-      rows = new NamedItemCollection<DataRow>();
-      this.RegisterRowsEvents();
-    }
-    public DataTable(string name)
-      : base(name) {
-      rows = new NamedItemCollection<DataRow>();
-      this.RegisterRowsEvents();
-    }
-    public DataTable(string name, string description)
-      : base(name, description) {
-      rows = new NamedItemCollection<DataRow>();
-      this.RegisterRowsEvents();
+
+    public event EventHandler VisualPropertiesChanged;
+    private void OnVisualPropertiesChanged() {
+      EventHandler handler = VisualPropertiesChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+
+    private void VisualProperties_PropertyChanged(object sender, PropertyChangedEventArgs e) {
+      OnVisualPropertiesChanged();
     }
 

trunk/sources/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj

@@ -118 +118 @@
     <Compile Include="Allele.cs" />
     <Compile Include="AlleleFrequency.cs" />
+    <Compile Include="DataTableVisualProperties.cs" />
     <Compile Include="DataTableHistory.cs" />
     <Compile Include="HeatMapHistory.cs" />

trunk/sources/HeuristicLab.Analysis/3.3/PopulationDiversityAnalyzer.cs

@@ -186 +186 @@
           if (!results.ContainsKey("Average Minimum/Average/Maximum Solution Similarity")) {
             minAvgMaxSimilarityDataTable = new DataTable("Average Minimum/Average/Maximum Solution Similarity");
-            results.Add(new Result("Average Minimum/Average/Maximum Solution Similarity", minAvgMaxSimilarityDataTable));
+            minAvgMaxSimilarityDataTable.VisualProperties.XAxisTitle = "Iteration";
+            minAvgMaxSimilarityDataTable.VisualProperties.YAxisTitle = "Solution Similarity";
             minAvgMaxSimilarityDataTable.Rows.Add(new DataRow("Average Minimum Solution Similarity", null));
             minAvgMaxSimilarityDataTable.Rows["Average Minimum Solution Similarity"].VisualProperties.StartIndexZero = true;
@@ -193 +194 @@
             minAvgMaxSimilarityDataTable.Rows.Add(new DataRow("Average Maximum Solution Similarity", null));
             minAvgMaxSimilarityDataTable.Rows["Average Maximum Solution Similarity"].VisualProperties.StartIndexZero = true;
+            results.Add(new Result("Average Minimum/Average/Maximum Solution Similarity", minAvgMaxSimilarityDataTable));
           } else {
             minAvgMaxSimilarityDataTable = (DataTable)results["Average Minimum/Average/Maximum Solution Similarity"].Value;
@@ -202 +204 @@
           // store minimum, average, maximum similarities data table
           DataTable minAvgMaxSimilaritiesDataTable = new DataTable("Minimum/Average/Maximum Solution Similarities");
+          minAvgMaxSimilaritiesDataTable.VisualProperties.XAxisTitle = "Solution Index";
+          minAvgMaxSimilaritiesDataTable.VisualProperties.YAxisTitle = "Solution Similarity";
           minAvgMaxSimilaritiesDataTable.Rows.Add(new DataRow("Minimum Solution Similarity", null, minSimilarities));
           minAvgMaxSimilaritiesDataTable.Rows["Minimum Solution Similarity"].VisualProperties.ChartType = DataRowVisualProperties.DataRowChartType.Points;