1.1 --- a/lemon/eps.h	Wed Sep 06 11:39:22 2006 +0000
     1.2 +++ b/lemon/eps.h	Thu Sep 07 13:27:16 2006 +0000
     1.3 @@ -24,7 +24,7 @@
     1.4  #include<fstream>
     1.5  #include<sstream>
     1.6  #include<lemon/color.h>
     1.7 -#include<lemon/xy.h>
     1.8 +#include<lemon/dim2.h>
     1.9  
    1.10    ///\ingroup eps_io
    1.11    ///\file
    1.12 @@ -100,7 +100,7 @@
    1.13      ///
    1.14      ///\c s determines the upper
    1.15      ///right corner of the bounding box. The lower left corner is (0,0).
    1.16 -    EpsDrawer(std::ostream &os,xy<double> s);
    1.17 +    EpsDrawer(std::ostream &os,dim2::Point<double> s);
    1.18      ///\e
    1.19  
    1.20      ///The generated file is put to \c os.
    1.21 @@ -108,7 +108,7 @@
    1.22      ///\c a and \c b
    1.23      /// determine the lower left and the upper right corners of
    1.24      ///the bounding box, respectively.
    1.25 -    EpsDrawer(std::ostream &os,xy<double> a, xy<double> b);
    1.26 +    EpsDrawer(std::ostream &os,dim2::Point<double> a, dim2::Point<double> b);
    1.27      ///\e
    1.28  
    1.29      ///The generated picture is put to the file \c name.
    1.30 @@ -130,7 +130,7 @@
    1.31      ///
    1.32      ///\c s determines the upper
    1.33      ///right corner of the bounding box. The lower left corner is (0,0).
    1.34 -    EpsDrawer(const std::string &name,xy<double> s);
    1.35 +    EpsDrawer(const std::string &name,dim2::Point<double> s);
    1.36      ///\e
    1.37  
    1.38      ///The generated picture is put to the file \c name.
    1.39 @@ -138,7 +138,7 @@
    1.40      ///\c a and \c b
    1.41      /// determine the lower left and the upper right corners of
    1.42      ///the bounding box, respectively.
    1.43 -    EpsDrawer(const std::string &name,xy<double> a, xy<double> b);
    1.44 +    EpsDrawer(const std::string &name,dim2::Point<double> a, dim2::Point<double> b);
    1.45  
    1.46  //     template<class T> EpsDrawer(std::ostream &os,BoundingBox<T> b) 
    1.47  //     template<class T> EpsDrawer(std::ostream &os,BoundingBox<T> b);
    1.48 @@ -168,22 +168,22 @@
    1.49      EpsDrawer &circle(double x,double y, double r);
    1.50      
    1.51      ///Draw a line
    1.52 -    template<class T> EpsDrawer &line(xy<T> p1,xy<T> p2) 
    1.53 +    template<class T> EpsDrawer &line(dim2::Point<T> p1,dim2::Point<T> p2) 
    1.54      {
    1.55        return line(p1.x,p1.y,p2.x,p2.y);
    1.56      }
    1.57      ///Draw a line from the current point
    1.58 -    template<class T> EpsDrawer &lineTo(xy<T> p)
    1.59 +    template<class T> EpsDrawer &lineTo(dim2::Point<T> p)
    1.60      {
    1.61        return lineTo(p.x,p.y);
    1.62      }
    1.63      ///Move the current point
    1.64 -    template<class T> EpsDrawer &moveTo(xy<T> p)
    1.65 +    template<class T> EpsDrawer &moveTo(dim2::Point<T> p)
    1.66      {
    1.67        return moveTo(p.x,p.y);
    1.68      }
    1.69      ///Draw a circle
    1.70 -    template<class T> EpsDrawer &circle(xy<T> p, double r)
    1.71 +    template<class T> EpsDrawer &circle(dim2::Point<T> p, double r)
    1.72      {
    1.73        return circle(p.x,p.y,r);
    1.74      }
    1.75 @@ -296,7 +296,7 @@
    1.76      ///\param col Color of the node. The default color is white
    1.77      ///\param brd Color of the node border. The default color is black
    1.78      template<class T>
    1.79 -    EpsDrawer &node(NodeShapes t, xy<T> pos, double r,
    1.80 +    EpsDrawer &node(NodeShapes t, dim2::Point<T> pos, double r,
    1.81  		    Color col=WHITE, Color brd=BLACK)
    1.82      {
    1.83        return node(t,pos.x,pos.y,r,col,brd);
    1.84 @@ -305,7 +305,7 @@
    1.85      ///Translate the coordinate system
    1.86      EpsDrawer &translate(double x,double y);
    1.87      ///Translate the coordinate system
    1.88 -    template<class T> EpsDrawer &translate(xy<T> p)
    1.89 +    template<class T> EpsDrawer &translate(dim2::Point<T> p)
    1.90      {
    1.91        return translate(p.x,p.y);
    1.92      }
    1.93 @@ -316,7 +316,7 @@
    1.94      ///Scale the coordinate system
    1.95      EpsDrawer &scale(double s) { return scale(s,s); }
    1.96      ///Scale the coordinate system
    1.97 -    template<class T> EpsDrawer &scale(xy<T> p)
    1.98 +    template<class T> EpsDrawer &scale(dim2::Point<T> p)
    1.99      {
   1.100        return scale(p.x,p.y);
   1.101      }
   1.102 @@ -336,7 +336,7 @@
   1.103      EpsDrawer &operator<<(double d);
   1.104      ///Print a coordinate at the current point
   1.105      template<class T>
   1.106 -    EpsDrawer &operator<<(xy<T> p) 
   1.107 +    EpsDrawer &operator<<(dim2::Point<T> p) 
   1.108      {
   1.109        out << "((" << p.x << ',' << p.y <<")) show\n";
   1.110        return *this;