Rendering for Line, Circle, and Arc work.

[architektonas] / src / painter.h

diff --git a/src/painter.h b/src/painter.h
index a4d9dc020919df2b2f5c8da6415adbdd32c65733..af591b8e0d59740513151dfe1c232b112ef20644 100644 (file)
--- a/src/painter.h
+++ b/src/painter.h
@@ -1,10 +1,10 @@
 #ifndef __PAINTER_H__
 #define __PAINTER_H__
 
-#include <QtGui>
+#include <QtWidgets>
 #include "vector.h"
 
-#define SCREEN_ZOOM  (1.0 / 4.0)
+//#define SCREEN_ZOOM  (1.0 / 4.0)
 
 // Forward declarations
 
@@ -18,16 +18,22 @@ class Painter
                void SetBrush(QBrush);
                void SetFont(QFont);
                void SetPen(QPen);
-               void DrawAngledText(Vector, double, QString);
+               void DrawAngledText(Vector, double, QString, double);
                void DrawArc(Vector, double, double, double);
                void DrawEllipse(Vector, double, double);
                void DrawHandle(Vector);
+               void DrawArrowHandle(Vector, double);
+               void DrawArrowToLineHandle(Vector, double);
                void DrawLine(int, int, int, int);
                void DrawLine(Vector, Vector);
                void DrawPoint(int, int);
                void DrawRoundedRect(QRectF, double, double);
+               void DrawPaddedRect(QRectF);
+               void DrawRect(QRectF);
                void DrawText(QRectF, int, QString);
-               void DrawArrowhead(Vector, Vector);
+               void DrawArrowhead(Vector, Vector, double);
+               void DrawCrosshair(Vector);
+               void DrawInformativeText(QString);
 
        public:
                static Vector CartesianToQtCoords(Vector);
@@ -35,9 +41,9 @@ class Painter
 
        public:
                // Class variables
-               static Vector origin;           // The window origin, not location of the origin
-               static double zoom;                     // Window zoom factor
-               static Vector screenSize;       // Width & height of the window we're drawing on
+//             static Vector origin;           // The window origin, not location of the origin
+//             static double zoom;                     // Window zoom factor
+//             static Vector screenSize;       // Width & height of the window we're drawing on
 
        private:
                QPainter * painter;