Changeset 7255 for branches/RegressionBenchmarks/HeuristicLab.Operators.Views.GraphVisualization.Views/3.3/OperatorShape.cs

Timestamp:

01/02/12 11:40:31 (12 years ago)

Author:

sforsten

Message:

#1708: merged r7209 from trunk

• adjusted GUI
• added toggle for the different series
• X Axis labels are rounded to useful values
• added ToolTip

Location:

branches/RegressionBenchmarks

Files:

• . (modified) (1 prop)
• HeuristicLab.Operators.Views.GraphVisualization.Views/3.3/OperatorShape.cs (modified) (3 diffs)

branches/RegressionBenchmarks/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));
+      }