X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fpainter.h;h=5e868d75764250e457d161f118f2ad8fd7ad4b36;hb=ab604f6b520f16e24aa2611db856b13505e28686;hp=ddd6a27ad7b73f616ff39f91455d0eed9ff59e23;hpb=6441dd1283d8a16b9a3a02df407f20434fa9dfa1;p=architektonas

diff --git a/src/painter.h b/src/painter.h
index ddd6a27..5e868d7 100644
--- a/src/painter.h
+++ b/src/painter.h
@@ -1,9 +1,12 @@
 #ifndef __PAINTER_H__
 #define __PAINTER_H__
 
-#include <QtGui>
+#include <stdint.h>
+#include <QtWidgets>
 #include "vector.h"
 
+//#define SCREEN_ZOOM  (1.0 / 4.0)
+
 // Forward declarations
 
 class Painter
@@ -13,19 +16,28 @@ class Painter
 		~Painter();
 
 		void SetRenderHint(int);
+		void SetPen(QPen);
+		void SetPen(uint32_t, float size = 0, int style = 0);
 		void SetBrush(QBrush);
+		void SetBrush(uint32_t);
 		void SetFont(QFont);
-		void SetPen(QPen);
-		void DrawAngledText(Vector, double, QString);
+		void DrawAngledText(Vector, double, QString, double);
+		void DrawTextObject(Vector, QString, double, double angle = 0);
 		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);
@@ -33,9 +45,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;