Added glue layer to Qt painting, to properly render cartesian coordinates.

[architektonas] / src / circle.cpp

diff --git a/src/circle.cpp b/src/circle.cpp
index d395b68edd828ffd20076de5fc44bbfc1e060ed8..a8902cc4da11d38449e10f2a8f595991df01c881 100644 (file)
--- a/src/circle.cpp
+++ b/src/circle.cpp
@@ -14,6 +14,8 @@
 #include "circle.h"
 
 #include <QtGui>
+#include "painter.h"
+
 
 Circle::Circle(Vector p1, double r, Object * p/*= NULL*/): Object(p1, p), radius(r),
        dragging(false), draggingHandle1(false), draggingHandle2(false)//, needUpdate(false)
@@ -24,24 +26,24 @@ Circle::~Circle()
 {
 }
 
-/*virtual*/ void Circle::Draw(QPainter * painter)
+/*virtual*/ void Circle::Draw(Painter * painter)
 {
        if (state == OSSelected)
-               painter->setPen(QPen(Qt::red, 2.0, Qt::DotLine));
+               painter->SetPen(QPen(Qt::red, 2.0, Qt::DotLine));
        else
-               painter->setPen(QPen(Qt::black, 1.0, Qt::SolidLine));
+               painter->SetPen(QPen(Qt::black, 1.0, Qt::SolidLine));
 
 //     if (draggingHandle1)
        if (state == OSSelected)
-               painter->drawEllipse(QPointF(position.x, position.y), 4.0, 4.0);
+               painter->DrawEllipse(position, 4.0, 4.0);
 
 //     if (draggingHandle2)
 //     if (state == OSSelected)
 //             painter->drawEllipse(QPointF(endpoint.x, endpoint.y), 4.0, 4.0);
        if (state == OSSelected && dragging)
-               painter->drawEllipse(QPointF(oldPoint.x, oldPoint.y), 4.0, 4.0);
+               painter->DrawEllipse(oldPoint, 4.0, 4.0);
 
-       painter->drawEllipse(QPointF(position.x, position.y), radius, radius);
+       painter->DrawEllipse(position, radius, radius);
 }
 
 /*virtual*/ Vector Circle::Center(void)