Changeset 7199 for trunk/sources

Timestamp:

12/16/11 18:25:47 (13 years ago)

Author:

mkommend

Message:

#1715: Added type name to operator shapes.

Location:

trunk/sources

Files:

• HeuristicLab.Operators.Views.GraphVisualization.Views/3.3/OperatorShape.cs (modified) (3 diffs)
• HeuristicLab.Operators.Views.GraphVisualization.Views/3.3/ShapeInfoExtensions.cs (modified) (3 diffs)
• 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)

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization.Views/3.3/OperatorShape.cs

@@ -78 +78 @@
       set { title = value; }
     }
+
+    public string TypeName { get; set; }
 
     private IconMaterial iconMaterial;
@@ -219 +221 @@
 
       SizeF titleSize = g.MeasureString(this.Title, ArtPalette.DefaultBoldFont, Rectangle.Width - 45);
-      if (titleSize.Height + 10 > Rectangle.Height) {
-        headerHeight = (int)titleSize.Height + 10;
+      titleSize.Height += 10; //add spacing
+      SizeF typeNameSize = g.MeasureString(this.TypeName, ArtPalette.DefaultFont, Rectangle.Width - 45);
+      typeNameSize.Height += 10;  //add spacing
+      if (this.Title == this.TypeName) typeNameSize = new SizeF(0, 0);
+
+      if (titleSize.Height + typeNameSize.Height > Rectangle.Height) {
+        headerHeight = (int)titleSize.Height + (int)typeNameSize.Height;
         this.UpdateLabels();
       }
@@ -264 +271 @@
 
       //the title
-      g.DrawString(this.Title, ArtPalette.DefaultBoldFont, Brushes.Black, new Rectangle(Rectangle.X + 25, Rectangle.Y + 5, Rectangle.Width - 45, Rectangle.Height - 5));
+      g.DrawString(this.Title, ArtPalette.DefaultBoldFont, Brushes.Black,
+        new Rectangle(Rectangle.X + 25, Rectangle.Y + 5,
+                      Rectangle.Width - 45, Rectangle.Height - 5 - (int)typeNameSize.Height));
+
+      //the typeName
+      if (this.Title != this.TypeName) {
+        g.DrawString(this.TypeName, ArtPalette.DefaultFont, Brushes.Black,
+          new Rectangle(Rectangle.X + 25, Rectangle.Y + (int)titleSize.Height,
+                        Rectangle.Width - 45, Rectangle.Height - 5));
+      }
 
 

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization.Views/3.3/ShapeInfoExtensions.cs

@@ -50 +50 @@
       shape.Location = shapeInfo.Location;
       shape.Title = shapeInfo.Title;
+      shape.TypeName = shapeInfo.TypeName;
       shape.Color = shapeInfo.Color;
       shape.LineColor = shapeInfo.LineColor;
@@ -65 +66 @@
     public static void UpdateShape(IOperatorShapeInfo operatorShapeInfo, OperatorShape operatorShape) {
       operatorShape.Title = operatorShapeInfo.Title;
+      operatorShape.TypeName = operatorShapeInfo.TypeName;
       operatorShape.Color = operatorShapeInfo.Color;
       operatorShape.LineColor = operatorShapeInfo.LineColor;
@@ -105 +107 @@
     public static void UpdateShapeInfo(IOperatorShapeInfo operatorShapeInfo, OperatorShape operatorShape) {
       operatorShapeInfo.Title = operatorShape.Title;
+      operatorShapeInfo.TypeName = operatorShape.TypeName;
       operatorShapeInfo.Color = operatorShape.Color;
       operatorShapeInfo.LineColor = operatorShape.LineColor;

trunk/sources/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; }

trunk/sources/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 {

trunk/sources/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;