Changeset 7199 for trunk/sources/HeuristicLab.Operators.Views.GraphVisualization.Views

Timestamp:

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

Author:

mkommend

Message:

#1715: Added type name to operator shapes.

Location:

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

Files:

• OperatorShape.cs (modified) (3 diffs)
• ShapeInfoExtensions.cs (modified) (3 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;