Added 1st stab at grouping capability.

[architektonas] / src / painter.cpp

diff --git a/src/painter.cpp b/src/painter.cpp
index 73e5bf6e5fc539cca3984500d1822f9383fde030..7d146b1888cdfb3d5b430cf0c2e269860e4c2aee 100644 (file)
--- a/src/painter.cpp
+++ b/src/painter.cpp
@@ -27,10 +27,12 @@ Painter::Painter(QPainter * p/*= NULL*/): painter(p)
 {
 }
 
+
 Painter::~Painter()
 {
 }
 
+
 Vector Painter::CartesianToQtCoords(Vector v)
 {
        // Convert regular Cartesian coordinates to the inverted Y-axis Qt coordinates
@@ -38,6 +40,7 @@ Vector Painter::CartesianToQtCoords(Vector v)
        return Vector((v.x - origin.x) * zoom, screenSize.y - ((v.y - origin.y) * zoom));
 }
 
+
 Vector Painter::QtToCartesianCoords(Vector v)
 {
        // Convert screen location, with inverted Y-axis coordinates, to regular
@@ -66,6 +69,7 @@ The way we calculate the Cartesian to Qt shows the 2nd (origin is cartesian) to
 */
 }
 
+
 void Painter::SetRenderHint(int hint)
 {
        if (!painter)
@@ -74,6 +78,7 @@ void Painter::SetRenderHint(int hint)
        painter->setRenderHint((QPainter::RenderHint)hint);
 }
 
+
 void Painter::SetBrush(QBrush brush)
 {
        if (!painter)
@@ -82,6 +87,7 @@ void Painter::SetBrush(QBrush brush)
        painter->setBrush(brush);
 }
 
+
 void Painter::SetFont(QFont font)
 {
        if (!painter)
@@ -90,6 +96,7 @@ void Painter::SetFont(QFont font)
        painter->setFont(font);
 }
 
+
 void Painter::SetPen(QPen pen)
 {
        if (!painter)
@@ -98,6 +105,7 @@ void Painter::SetPen(QPen pen)
        painter->setPen(pen);
 }
 
+
 void Painter::DrawAngledText(Vector center, double angle, QString text)
 {
        if (!painter)
@@ -143,6 +151,7 @@ void Painter::DrawAngledText(Vector center, double angle, QString text)
        painter->restore();
 }
 
+
 void Painter::DrawArc(Vector center, double radius, double startAngle, double span)
 {
        center = CartesianToQtCoords(center);
@@ -155,6 +164,7 @@ void Painter::DrawArc(Vector center, double radius, double startAngle, double sp
        painter->drawArc(rectangle, angle1, angle2);
 }
 
+
 void Painter::DrawEllipse(Vector center, double axis1, double axis2)
 {
        // Need to multiply scalar quantities by the zoom factor as well...
@@ -162,6 +172,7 @@ void Painter::DrawEllipse(Vector center, double axis1, double axis2)
        painter->drawEllipse(QPointF(center.x, center.y), axis1 * zoom, axis2 * zoom);
 }
 
+
 // This function is for drawing object handles without regard for zoom level;
 // we don't want our object handle size to depend on the zoom level!
 void Painter::DrawHandle(Vector center)
@@ -171,6 +182,7 @@ void Painter::DrawHandle(Vector center)
        painter->drawEllipse(QPointF(center.x, center.y), 4.0, 4.0);
 }
 
+
 void Painter::DrawLine(int x1, int y1, int x2, int y2)
 {
        if (!painter)
@@ -181,6 +193,7 @@ void Painter::DrawLine(int x1, int y1, int x2, int y2)
        painter->drawLine(v1.x, v1.y, v2.x, v2.y);
 }
 
+
 void Painter::DrawLine(Vector v1, Vector v2)
 {
        if (!painter)
@@ -191,6 +204,7 @@ void Painter::DrawLine(Vector v1, Vector v2)
        painter->drawLine(QPointF(v1.x, v1.y), QPointF(v2.x, v2.y));
 }
 
+
 void Painter::DrawPoint(int x, int y)
 {
        if (!painter)
@@ -200,6 +214,7 @@ void Painter::DrawPoint(int x, int y)
        painter->drawPoint(v.x, v.y);
 }
 
+
 void Painter::DrawRoundedRect(QRectF rect, double radiusX, double radiusY)
 {
        if (!painter)
@@ -208,6 +223,19 @@ void Painter::DrawRoundedRect(QRectF rect, double radiusX, double radiusY)
        painter->drawRoundedRect(rect, radiusX, radiusY);
 }
 
+
+void Painter::DrawRect(QRectF rect)
+{
+       if (!painter)
+               return;
+
+       Vector v1 = CartesianToQtCoords(Vector(rect.x(), rect.y()));
+       Vector v2 = CartesianToQtCoords(Vector(rect.right(), rect.bottom()));
+       QRectF screenRect(QPointF(v1.x, v1.y), QPointF(v2.x, v2.y));
+       painter->drawRect(screenRect);
+}
+
+
 void Painter::DrawText(QRectF rect, int type, QString text)
 {
        if (!painter)
@@ -216,6 +244,7 @@ void Painter::DrawText(QRectF rect, int type, QString text)
        painter->drawText(rect, (Qt::AlignmentFlag)type, text);
 }
 
+
 void Painter::DrawArrowhead(Vector head, Vector tail)
 {
        QPolygonF arrow;