Changeset 4644 for trunk/sources/HeuristicLab.Analysis

Timestamp:

10/25/10 15:06:21 (14 years ago)

Author:

swagner

Message:

Worked on visual appearance of data rows (#925)

Location:

trunk/sources/HeuristicLab.Analysis/3.3

Files:

• DataRow.cs (modified) (3 diffs)
• DataRowVisualProperties.cs (added)
• HeuristicLab.Analysis-3.3.csproj (modified) (1 diff)

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

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
@@ -32 +35 @@
   [StorableClass]
   public sealed class DataRow : NamedItem {
-    [Storable]
+    private DataRowVisualProperties visualProperties;
+    public DataRowVisualProperties 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 ObservableList<double> values;
     public IObservableList<double> Values {
@@ -38 +53 @@
     }
 
+    #region Persistence Properties
+    [Storable(Name = "VisualProperties")]
+    private DataRowVisualProperties StorableVisualProperties {
+      get { return VisualProperties; }
+      set { VisualProperties = value; }
+    }
+    [Storable(Name = "values")]
+    private IEnumerable<double> StorableValues {
+      get { return values; }
+      set { values = new ObservableList<double>(value); }
+    }
+    #endregion
+
     public DataRow()
       : base() {
+      VisualProperties = new DataRowVisualProperties();
       values = new ObservableList<double>();
     }
     public DataRow(string name)
       : base(name) {
+      VisualProperties = new DataRowVisualProperties();
       values = new ObservableList<double>();
     }
     public DataRow(string name, string description)
       : base(name, description) {
+      VisualProperties = new DataRowVisualProperties();
       values = new ObservableList<double>();
     }
+    public DataRow(string name, string description, DataRowVisualProperties visualProperties)
+      : base(name, description) {
+      VisualProperties = visualProperties;
+      values = new ObservableList<double>();
+    }
+    [StorableConstructor]
+    private DataRow(bool deserializing) { }
+
+    // BackwardsCompatibility3.3
+    #region Backwards compatible code, remove with 3.4
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      if (VisualProperties == null) VisualProperties = new DataRowVisualProperties();
+    }
+    #endregion
 
     public override IDeepCloneable Clone(Cloner cloner) {
       DataRow clone = new DataRow(Name, Description);
       cloner.RegisterClonedObject(this, clone);
+      clone.VisualProperties = (DataRowVisualProperties)cloner.Clone(visualProperties);
       clone.values.AddRange(values);
       return clone;
     }
+
+    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="DataRowVisualProperties.cs" />
     <Compile Include="QualityAnalyzer.cs" />
     <Compile Include="MinAverageMaxValueAnalyzer.cs" />