X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fpainter.h;h=5e868d75764250e457d161f118f2ad8fd7ad4b36;hb=da1348151182fe5340495ff8243e662b96c1fbfa;hp=178b7dbca605ad772f7b9d9c2f2ffe792c09e2e1;hpb=6c1279871f6bb86bc59e2561b6a7f74ab081f71e;p=architektonas

diff --git a/src/painter.h b/src/painter.h
index 178b7db..5e868d7 100644
--- a/src/painter.h
+++ b/src/painter.h
@@ -1,6 +1,7 @@
 #ifndef __PAINTER_H__
 #define __PAINTER_H__
 
+#include <stdint.h>
 #include <QtWidgets>
 #include "vector.h"
 
@@ -15,10 +16,13 @@ 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, double);
+		void DrawTextObject(Vector, QString, double, double angle = 0);
 		void DrawArc(Vector, double, double, double);
 		void DrawEllipse(Vector, double, double);
 		void DrawHandle(Vector);
@@ -41,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;