Changeset 10831

Timestamp:

05/09/14 15:14:38 (11 years ago)

Author:

bburlacu

Message:

#1265: Added MaximumFontSize property to RectangularPrimitiveBase.

File:

• branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3/Primitives/RectangularPrimitiveBase.cs (modified) (3 diffs)

branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3/Primitives/RectangularPrimitiveBase.cs

@@ -43 +43 @@
     public string Text { get; set; }
     public Font Font { get; set; }
+    public float MaximumFontSize { get; set; }
 
     protected RectangularPrimitiveBase(IChart chart, PointD lowerLeft, PointD upperRight)
@@ -48 +49 @@
       selectionRectangles = new Group(chart);
       SetPosition(lowerLeft, upperRight);
+
+      MaximumFontSize = 12;
     }
     protected RectangularPrimitiveBase(IChart chart, double x1, double y1, double x2, double y2)
@@ -137 +140 @@
     }
 
-    protected virtual void DrawText(Graphics graphics) {  // draw the text in the center of the bounding rectangle4
+    protected virtual void DrawText(Graphics graphics) {
+      // draw the text in the center of the bounding rectangle
       var p = Chart.TransformWorldToPixel(new PointD(LowerLeft.X, LowerLeft.Y));
       var s = Chart.TransformWorldToPixel(Size);
+
       var stringSize = graphics.MeasureString(Text, Font);
-      var fontSize = Font.Size * s.Width / stringSize.Width;
-      if (fontSize > 12) fontSize = 12; // limit maximum font size so that nodes look nicer
+      float fontSize = (int)(Math.Round(Font.Size * s.Width / stringSize.Width));
+      if (fontSize > MaximumFontSize) { fontSize = MaximumFontSize; }
       Font = new Font(Font.FontFamily, fontSize, GraphicsUnit.Pixel);
       stringSize = graphics.MeasureString(Text, Font);