Changeset 7213 for branches/HeuristicLab.TimeSeries/HeuristicLab.Operators.Views.GraphVisualization/3.3

Timestamp:

12/20/11 11:45:18 (13 years ago)

Author:

gkronber

Message:

#1081 merged r7103:7209 from trunk into time series branch

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/IOperatorShapeInfo.cs (modified) (1 diff)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorShapeInfo.cs (modified) (3 diffs)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorShapeInfoFactory.cs (modified) (2 diffs)

branches/HeuristicLab.TimeSeries/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/IOperatorShapeInfo.cs

@@ -27 +27 @@
     bool Collapsed { get; set; }
     string Title { get; set; }
+    string TypeName { get; set; }
     Color Color { get; set; }
     Color LineColor { get; set; }

branches/HeuristicLab.TimeSeries/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorShapeInfo.cs

@@ -38 +38 @@
     [StorableConstructor]
     protected OperatorShapeInfo(bool deserializing) : base(deserializing) { }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      if (string.IsNullOrEmpty(this.typeName))
+        typeName = title;
+    }
     protected OperatorShapeInfo(OperatorShapeInfo original, Cloner cloner)
       : base(original, cloner) {
@@ -45 +50 @@
       lineWidth = original.lineWidth;
       title = original.title;
+      typeName = original.typeName;
 
       //mkommend: necessary because cloning a Bitmap is not threadsafe
@@ -129 +135 @@
 
     [Storable]
+    private string typeName;
+    public string TypeName {
+      get { return this.typeName; }
+      set {
+        if (this.typeName != value) {
+          this.typeName = value;
+          this.OnChanged();
+        }
+      }
+    }
+
+    [Storable]
     private Color color;
     public Color Color {

branches/HeuristicLab.TimeSeries/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorShapeInfoFactory.cs

@@ -23 +23 @@
 using System.Drawing;
 using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 
@@ -37 +38 @@
       operatorShapeInfo.Collapsed = true;
       operatorShapeInfo.Title = op.Name;
+      operatorShapeInfo.TypeName = op.GetType().GetPrettyName();
       operatorShapeInfo.Color = Color.LightBlue;
       operatorShapeInfo.LineWidth = 1;