Changeset 1091:c756973cd53c in lemon-0.x

Timestamp:

01/20/05 15:16:40 (20 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

Now, the actual drawing is made by run() instead of the destructor.

Location:

src

Files:

• demo/graph_to_eps_demo.cc (modified) (3 diffs)
• lemon/graph_to_eps.h (modified) (3 diffs)

src/demo/graph_to_eps_demo.cc

@@ -96 +96 @@
     edgeColors(composeMap(colorSet,ecolors)).
     edgeWidthScale(.4).edgeWidths(widths).
-    nodeTexts(id).nodeTextSize(3);
+    nodeTexts(id).nodeTextSize(3).
+    run();
 
-  graphToEps(g,"graph_to_eps_demo_out_arr.eps").scale(10).coords(coords).
+  graphToEps(g,"graph_to_eps_demo_out_arr.eps").scale(10).
+    nodeColors(composeMap(colorSet,colors)).
+    coords(coords).
     nodeScale(2).nodeSizes(sizes).
     nodeShapes(shapes).
-    nodeColors(composeMap(colorSet,colors)).
     edgeColors(composeMap(colorSet,ecolors)).
     edgeWidthScale(.4).edgeWidths(widths).
     nodeTexts(id).nodeTextSize(3).
-    drawArrows().arrowWidth(1).arrowLength(1);
+    drawArrows().arrowWidth(1).arrowLength(1).
+    run();
 
   e=g.addEdge(n1,n4); ecolors[e]=2; widths[e]=1;
@@ -118 +121 @@
   e=g.addEdge(n1,n2); ecolors[e]=7; widths[e]=1;
 
-  graphToEps(g,"graph_to_eps_demo_out_par.eps").scale(10).coords(coords).
+  graphToEps(g,"graph_to_eps_demo_out_par.eps").scale(10).
+    nodeShapes(shapes).
+    coords(coords).
     nodeScale(2).nodeSizes(sizes).
-    nodeShapes(shapes).
     nodeColors(composeMap(colorSet,colors)).
     edgeColors(composeMap(colorSet,ecolors)).
     edgeWidthScale(.4).edgeWidths(widths).
     nodeTexts(id).nodeTextSize(3).
-    enableParallel().parEdgeDist(1.5);
-
-  graphToEps(g,"graph_to_eps_demo_out_par_arr.eps").scale(10).coords(coords).
+    enableParallel().parEdgeDist(1.5).
+    run();
+  
+  graphToEps(g,"graph_to_eps_demo_out_par_arr.eps").scale(10).
     nodeScale(2).nodeSizes(sizes).
+    coords(coords).
     nodeShapes(shapes).
     nodeColors(composeMap(colorSet,colors)).
@@ -136 +142 @@
     enableParallel().parEdgeDist(1).
     //    hideNodes().
-    drawArrows().arrowWidth(1).arrowLength(1);
+    drawArrows().arrowWidth(1).arrowLength(1).
+    run();;
 }

src/lemon/graph_to_eps.h

@@ -422 +422 @@
 
 public:
-  ~GraphToEps() 
-  {
+  ~GraphToEps() { }
+  
+  ///Draws the graph.
+
+  ///Like other functions using
+  ///\ref named-templ-func-param "named template parameters",
+  ///this function calles the algorithm itself, i.e. in this case
+  ///it draws the graph.
+  void run() {
     if(dontPrint) return;
     
@@ -668 +675 @@
 ///By default it is <tt>std::cout</tt>
 ///
-///This function also has a lot of \ref named-templ-param "named parameters",
+///This function also has a lot of
+///\ref named-templ-func-param "named parameters",
 ///they are declared as the members of class \ref GraphToEps. The following
 ///example shows how to use these parameters.
@@ -674 +682 @@
 /// graphToEps(g).scale(10).coords(coords)
 ///              .nodeScale(2).nodeSizes(sizes)
-///              .edgeWidthScale(.4);
+///              .edgeWidthScale(.4).run();
 ///\endcode
+///\warning Don't forget to put the \ref GraphToEps::run() "run()"
+///to the end of the parameter list.
 ///\sa GraphToEps
 ///\sa graphToEps(G &g, char *file_name)