Worked on flexible coloring of data rows and on changing the initial …

…index from 1 to 0 (#925) git-svn-id: https://src.heuristiclab.com/svn/core/trunk@4648 2abd9481-f8db-48e9-bd25-06bc13291c1b
heal-research · Oct 27, 2010 · d340d8f · d340d8f
1 parent c54f9c0
commit d340d8f
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 26 deletions.
diff --git a/sources/HeuristicLab.Analysis.Views/3.3/DataTableView.Designer.cs b/sources/HeuristicLab.Analysis.Views/3.3/DataTableView.Designer.cs
diff --git a/sources/HeuristicLab.Analysis.Views/3.3/DataTableView.cs b/sources/HeuristicLab.Analysis.Views/3.3/DataTableView.cs
@@ -124,6 +124,7 @@ private void AddDataRow(DataRow row) {
           break;
       }
       series.YAxisType = row.VisualProperties.SecondYAxis ? AxisType.Secondary : AxisType.Primary;
+      if (row.VisualProperties.Color != Color.Empty) series.Color = row.VisualProperties.Color;
       series.ToolTip = row.Name + " X = #INDEX, Y = #VAL";
       FillSeriesWithRowValues(series, row);
       chart.Series.Add(series);
@@ -255,6 +256,7 @@ private void Row_VisualPropertiesChanged(object sender, EventArgs e) {
             break;
         }
         chart.Series[row.Name].YAxisType = row.VisualProperties.SecondYAxis ? AxisType.Secondary : AxisType.Primary;
+        if (row.VisualProperties.Color != Color.Empty) chart.Series[row.Name].Color = row.VisualProperties.Color;
       }
     }
     private void Row_NameChanged(object sender, EventArgs e) {

diff --git a/sources/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalyzer.cs b/sources/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalyzer.cs
@@ -163,6 +163,7 @@ public override IOperation Apply() {
           DataRowVisualProperties visualProperties = new DataRowVisualProperties();
           visualProperties.ChartType = DataRowVisualProperties.DataRowChartType.Line;
           visualProperties.SecondYAxis = true;
+          visualProperties.StartIndexZero = true;
           allelesTable.Rows.Add(new DataRow("Unique Alleles of Best Known Solution", null, visualProperties));
           allelesTable.Rows.Add(new DataRow("Fixed Alleles", null, visualProperties));
           allelesTable.Rows.Add(new DataRow("Fixed Alleles of Best Known Solution", null, visualProperties));

diff --git a/sources/HeuristicLab.Analysis/3.3/DataRowVisualProperties.cs b/sources/HeuristicLab.Analysis/3.3/DataRowVisualProperties.cs
@@ -22,6 +22,7 @@
 using System.ComponentModel;
 using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using System.Drawing;
 
 namespace HeuristicLab.Analysis {
   /// <summary>
@@ -38,7 +39,6 @@ public enum DataRowChartType {
     }
     #endregion
 
-    [Storable(DefaultValue = DataRowChartType.Line)]
     private DataRowChartType chartType;
     public DataRowChartType ChartType {
       get { return chartType; }
@@ -49,7 +49,6 @@ public DataRowChartType ChartType {
         }
       }
     }
-    [Storable(DefaultValue = false)]
     private bool secondYAxis;
     public bool SecondYAxis {
       get { return secondYAxis; }
@@ -60,14 +59,61 @@ public bool SecondYAxis {
         }
       }
     }
+    private Color color;
+    public Color Color {
+      get { return color; }
+      set {
+        if (color != value) {
+          color = value;
+          OnPropertyChanged("Color");
+        }
+      }
+    }
+    private bool startIndexZero;
+    public bool StartIndexZero {
+      get { return startIndexZero; }
+      set {
+        if (startIndexZero != value) {
+          startIndexZero = value;
+          OnPropertyChanged("StartIndexZero");
+        }
+      }
+    }
+
+    #region Persistence Properties
+    [Storable(Name = "ChartType")]
+    private DataRowChartType StorableChartType {
+      get { return chartType; }
+      set { chartType = value; }
+    }
+    [Storable(Name = "SecondYAxis")]
+    private bool StorableSecondYAxis {
+      get { return secondYAxis; }
+      set { secondYAxis = value; }
+    }
+    [Storable(Name = "Color")]
+    private Color StorableColor {
+      get { return color; }
+      set { color = value; }
+    }
+    [Storable(Name = "StartIndexZero")]
+    private bool StorableStartIndexZero {
+      get { return startIndexZero; }
+      set { startIndexZero = value; }
+    }
+    #endregion
 
     public DataRowVisualProperties() {
       chartType = DataRowChartType.Line;
       secondYAxis = false;
+      color = Color.Empty;
+      startIndexZero = false;
     }
-    public DataRowVisualProperties(DataRowChartType chartType, bool secondYAxis) {
+    public DataRowVisualProperties(DataRowChartType chartType, bool secondYAxis, Color color, bool startIndexZero) {
       this.chartType = chartType;
       this.secondYAxis = secondYAxis;
+      this.color = color;
+      this.startIndexZero = startIndexZero;
     }
     [StorableConstructor]
     protected DataRowVisualProperties(bool deserializing) { }
@@ -76,6 +122,8 @@ public override IDeepCloneable Clone(Cloner cloner) {
       DataRowVisualProperties clone = (DataRowVisualProperties)base.Clone(cloner);
       clone.chartType = chartType;
       clone.secondYAxis = secondYAxis;
+      clone.color = color;
+      clone.startIndexZero = startIndexZero;
       return clone;
     }