diff -r d85834ad8c54 -r 16a8ef1d82b2 misc.cpp --- a/misc.cpp Mon Aug 24 14:39:07 2009 +0000 +++ b/misc.cpp Fri Oct 02 09:40:57 2009 +0000 @@ -1,20 +1,21 @@ #include #include -#include +//#include #include #include "misc.h" +#include "geometry.h" + QString qpointToString (const QPoint &p) -{ - return "(" + QString("%1").arg(p.x()) +","+ QString ("%1").arg (p.y()) +")"; -} +{ return "(" + QString("%1").arg(p.x()) +","+ QString ("%1").arg (p.y()) +")"; } -QString qpointfToString (const QPointF &p) -{ - return "(" + QString("%1").arg(p.x()) +","+ QString ("%1").arg (p.y()) +")"; -} +QString qpointFToString (const QPointF &p) +{ return "(" + QString("%1").arg(p.x()) +","+ QString ("%1").arg (p.y()) +")"; } + +QString VectorToString (const Vector &p) +{ return "(" + QString("%1").arg(p.x()) +","+ QString ("%1").arg (p.y()) +")"; } ostream &operator<< (ostream &stream, QPoint const &p) { @@ -28,6 +29,12 @@ return stream; } +ostream &operator<< (ostream &stream, Vector const &p) +{ + stream << "("<