Changeset 1930:92b70deed0c5 in lemon-0.x

Timestamp:

01/30/06 10:37:41 (18 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2505

Message:

Solve bug #23: Floating versus Integer Coordinates

• BoundingBox? values rounds to integer
• The generated .eps rescales if the bounding box were too small otherwise.

Files:

• demo/graph_to_eps_demo.cc (modified) (5 diffs)
• lemon/graph_to_eps.h (modified) (1 diff)

demo/graph_to_eps_demo.cc

@@ -80 +80 @@
 
   cout << "Create 'graph_to_eps_demo_out.eps'" << endl;
-  graphToEps(g,"graph_to_eps_demo_out.eps").scale(10).coords(coords).
+  graphToEps(g,"graph_to_eps_demo_out.eps").
+    //scale(10).
+    coords(coords).
     title("Sample .eps figure").
     copyright("(C) 2006 LEMON Project").
@@ -93 +95 @@
 
   cout << "Create 'graph_to_eps_demo_out_arr.eps'" << endl;
-  graphToEps(g,"graph_to_eps_demo_out_arr.eps").scale(10).
+  graphToEps(g,"graph_to_eps_demo_out_arr.eps").
+    //scale(10).
     title("Sample .eps figure (with arrowheads)").
     copyright("(C) 2006 LEMON Project").
@@ -118 +121 @@
 
   cout << "Create 'graph_to_eps_demo_out_par.eps'" << endl;
-  graphToEps(g,"graph_to_eps_demo_out_par.eps").scale(10).
+  graphToEps(g,"graph_to_eps_demo_out_par.eps").
+    //scale(10).
     title("Sample .eps figure (parallel edges)").
     copyright("(C) 2006 LEMON Project").
@@ -132 +136 @@
   
   cout << "Create 'graph_to_eps_demo_out_par_arr.eps'" << endl;
-  graphToEps(g,"graph_to_eps_demo_out_par_arr.eps").scale(10).
+  graphToEps(g,"graph_to_eps_demo_out_par_arr.eps").
+    //scale(10).
     title("Sample .eps figure (parallel edges and arrowheads)").
     copyright("(C) 2006 LEMON Project").
@@ -173 +178 @@
   
   cout << "Create 'graph_to_eps_demo_out_colors.eps'" << endl;
-  graphToEps(h,"graph_to_eps_demo_out_colors.eps").scale(60).
+  graphToEps(h,"graph_to_eps_demo_out_colors.eps").
+    //scale(60).
     title("Sample .eps figure (ColorSet demo)").
     copyright("(C) 2006 LEMON Project").

lemon/graph_to_eps.h

@@ -852 +852 @@
     if(_scaleToA4)
       os <<"%%BoundingBox: 0 0 596 842\n%%DocumentPaperSizes: a4\n";
-    else os << "%%BoundingBox: "
-            << bb.left()   * _scale - _xBorder << ' '
-            << bb.bottom() * _scale - _yBorder << ' '
-            << bb.right()  * _scale + _xBorder << ' '
-            << bb.top()    * _scale + _yBorder << '\n';
+    else {
+      //Rescale so that BoundingBox won't be neither to big nor too small.
+      while(bb.height()*_scale>1000||bb.width()*_scale>1000) _scale/=10;
+      while(bb.height()*_scale<100||bb.width()*_scale<100) _scale*=10;
+    
+      os << "%%BoundingBox: "
+         << int(floor(bb.left()   * _scale - _xBorder)) << ' '
+         << int(floor(bb.bottom() * _scale - _yBorder)) << ' '
+         << int(ceil(bb.right()  * _scale + _xBorder)) << ' '
+         << int(ceil(bb.top()    * _scale + _yBorder)) << '\n';
+    }
     
     os << "%%EndComments\n";