X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fpainter.h;h=af591b8e0d59740513151dfe1c232b112ef20644;hb=84afe881653a02a16b19d4da37435b8701b1a826;hp=aeda1fdaf00cfd26f07ff52ee9ca66a124509e97;hpb=ba6723b86d8dd67ebc7b11b245de3e7ff64f06b1;p=architektonas

diff --git a/src/painter.h b/src/painter.h
index aeda1fd..af591b8 100644
--- 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,17 +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);
@@ -36,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;