Changeset 4648 for trunk/sources/HeuristicLab.Analysis

Timestamp:

10/28/10 00:38:56 (14 years ago)

Author:

swagner

Message:

Worked on flexible coloring of data rows and on changing the initial index from 1 to 0 (#925)

Location:

trunk/sources/HeuristicLab.Analysis/3.3

Files:

• AlleleFrequencyAnalyzer.cs (modified) (1 diff)
• DataRowVisualProperties.cs (modified) (5 diffs)

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

@@ -164 +164 @@
           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));

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

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using System.Drawing;
 
 namespace HeuristicLab.Analysis {
@@ -39 +40 @@
     #endregion
 
-    [Storable(DefaultValue = DataRowChartType.Line)]
     private DataRowChartType chartType;
     public DataRowChartType ChartType {
@@ -50 +50 @@
       }
     }
-    [Storable(DefaultValue = false)]
     private bool secondYAxis;
     public bool SecondYAxis {
@@ -61 +60 @@
       }
     }
+    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]
@@ -77 +123 @@
       clone.chartType = chartType;
       clone.secondYAxis = secondYAxis;
+      clone.color = color;
+      clone.startIndexZero = startIndexZero;
       return clone;
     }