diff -r c3ff11b0025c -r 75a29ac69c19 lemon/eps.h --- a/lemon/eps.h Wed Sep 06 11:39:22 2006 +0000 +++ b/lemon/eps.h Thu Sep 07 13:27:16 2006 +0000 @@ -24,7 +24,7 @@ #include #include #include -#include +#include ///\ingroup eps_io ///\file @@ -100,7 +100,7 @@ /// ///\c s determines the upper ///right corner of the bounding box. The lower left corner is (0,0). - EpsDrawer(std::ostream &os,xy s); + EpsDrawer(std::ostream &os,dim2::Point s); ///\e ///The generated file is put to \c os. @@ -108,7 +108,7 @@ ///\c a and \c b /// determine the lower left and the upper right corners of ///the bounding box, respectively. - EpsDrawer(std::ostream &os,xy a, xy b); + EpsDrawer(std::ostream &os,dim2::Point a, dim2::Point b); ///\e ///The generated picture is put to the file \c name. @@ -130,7 +130,7 @@ /// ///\c s determines the upper ///right corner of the bounding box. The lower left corner is (0,0). - EpsDrawer(const std::string &name,xy s); + EpsDrawer(const std::string &name,dim2::Point s); ///\e ///The generated picture is put to the file \c name. @@ -138,7 +138,7 @@ ///\c a and \c b /// determine the lower left and the upper right corners of ///the bounding box, respectively. - EpsDrawer(const std::string &name,xy a, xy b); + EpsDrawer(const std::string &name,dim2::Point a, dim2::Point b); // template EpsDrawer(std::ostream &os,BoundingBox b) // template EpsDrawer(std::ostream &os,BoundingBox b); @@ -168,22 +168,22 @@ EpsDrawer &circle(double x,double y, double r); ///Draw a line - template EpsDrawer &line(xy p1,xy p2) + template EpsDrawer &line(dim2::Point p1,dim2::Point p2) { return line(p1.x,p1.y,p2.x,p2.y); } ///Draw a line from the current point - template EpsDrawer &lineTo(xy p) + template EpsDrawer &lineTo(dim2::Point p) { return lineTo(p.x,p.y); } ///Move the current point - template EpsDrawer &moveTo(xy p) + template EpsDrawer &moveTo(dim2::Point p) { return moveTo(p.x,p.y); } ///Draw a circle - template EpsDrawer &circle(xy p, double r) + template EpsDrawer &circle(dim2::Point p, double r) { return circle(p.x,p.y,r); } @@ -296,7 +296,7 @@ ///\param col Color of the node. The default color is white ///\param brd Color of the node border. The default color is black template - EpsDrawer &node(NodeShapes t, xy pos, double r, + EpsDrawer &node(NodeShapes t, dim2::Point pos, double r, Color col=WHITE, Color brd=BLACK) { return node(t,pos.x,pos.y,r,col,brd); @@ -305,7 +305,7 @@ ///Translate the coordinate system EpsDrawer &translate(double x,double y); ///Translate the coordinate system - template EpsDrawer &translate(xy p) + template EpsDrawer &translate(dim2::Point p) { return translate(p.x,p.y); } @@ -316,7 +316,7 @@ ///Scale the coordinate system EpsDrawer &scale(double s) { return scale(s,s); } ///Scale the coordinate system - template EpsDrawer &scale(xy p) + template EpsDrawer &scale(dim2::Point p) { return scale(p.x,p.y); } @@ -336,7 +336,7 @@ EpsDrawer &operator<<(double d); ///Print a coordinate at the current point template - EpsDrawer &operator<<(xy p) + EpsDrawer &operator<<(dim2::Point p) { out << "((" << p.x << ',' << p.y <<")) show\n"; return *this;