Changeset 6628 for trunk/sources/HeuristicLab.Analysis/3.3/DataVisualization

Timestamp:

08/04/11 10:04:09 (13 years ago)

Author:

abeham

Message:

#1541, #1603, #1606, #1607

• merged to trunk

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Analysis (modified) (1 prop)
• HeuristicLab.Analysis/3.3/DataVisualization/DataRow.cs (modified) (1 diff)
• HeuristicLab.Analysis/3.3/DataVisualization/DataRowVisualProperties.cs (modified) (5 diffs)

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

@@ -83 +83 @@
     public DataRow(string name)
       : base(name) {
-      VisualProperties = new DataRowVisualProperties();
+      VisualProperties = new DataRowVisualProperties(name);
       values = new ObservableList<double>();
     }
     public DataRow(string name, string description)
       : base(name, description) {
-      VisualProperties = new DataRowVisualProperties();
+      VisualProperties = new DataRowVisualProperties(name);
       values = new ObservableList<double>();
     }
     public DataRow(string name, string description, IEnumerable<double> values)
       : base(name, description) {
-      VisualProperties = new DataRowVisualProperties();
+      VisualProperties = new DataRowVisualProperties(name);
       this.values = new ObservableList<double>(values);
     }

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.ComponentModel;
 using System.Drawing;
@@ -141 +142 @@
       }
     }
+    private string displayName;
+    public string DisplayName {
+      get { return displayName == null ? String.Empty : displayName; }
+      set {
+        if (displayName != value) {
+          if (value == null && displayName != String.Empty) {
+            displayName = String.Empty;
+            OnPropertyChanged("DisplayName");
+          } else if (value != null) {
+            displayName = value;
+            OnPropertyChanged("DisplayName");
+          }
+        }
+      }
+    }
 
     #region Persistence Properties
@@ -187 +203 @@
       get { return exactBins; }
       set { exactBins = value; }
+    }
+    [Storable(Name = "DisplayName")]
+    private string StorableDisplayName {
+      get { return displayName; }
+      set { displayName = value; }
     }
     #endregion
@@ -203 +224 @@
       this.bins = original.bins;
       this.exactBins = original.exactBins;
+      this.displayName = original.displayName;
     }
     public DataRowVisualProperties() {
@@ -214 +236 @@
       bins = 10;
       exactBins = false;
+      displayName = String.Empty;
+    }
+    public DataRowVisualProperties(string displayName)
+      : this() {
+      this.displayName = displayName;
     }