X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fpainter.h;h=d460ebcc2c9c349dd3782989150ada6b2cab1fdc;hb=3c890e51a9763ffcee49e15753453a7da248272b;hp=50c79a429f8747fbe73303c8d99c2f2da080f31b;hpb=57056be35f9295400dd873a17d8468b3287ebc0c;p=architektonas

diff --git a/src/painter.h b/src/painter.h
index 50c79a4..d460ebc 100644
--- a/src/painter.h
+++ b/src/painter.h
@@ -1,11 +1,11 @@
 #ifndef __PAINTER_H__
 #define __PAINTER_H__
 
-#include <QtGui>
+#include <stdint.h>
+#include <QtWidgets>
+#include "rect.h"
 #include "vector.h"
 
-//#define SCREEN_ZOOM  (1.0 / 4.0)
-
 // Forward declarations
 
 class Painter
@@ -15,21 +15,32 @@ 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);
+		Rect MeasureTextObject(QString text, double size);
 		void DrawArc(Vector, double, double, double);
 		void DrawEllipse(Vector, double, double);
 		void DrawHandle(Vector);
+		void DrawSmallHandle(Vector);
+		void DrawCross(Vector);
+		void DrawRectCorners(Rect);
 		void DrawArrowHandle(Vector, double);
+		void DrawArrowToLineHandle(Vector, double);
 		void DrawLine(int, int, int, int);
 		void DrawLine(Vector, Vector);
+		void DrawHLine(double);
+		void DrawVLine(double);
 		void DrawPoint(int, int);
+		void DrawRoundedRect(Rect, double, double);
 		void DrawRoundedRect(QRectF, double, double);
-		void DrawPaddedRect(QRectF);
-		void DrawRect(QRectF);
-		void DrawText(QRectF, int, QString);
+		void DrawPaddedRect(Rect);
+		void DrawRect(Rect);
+		void DrawText(Rect, int, QString);
 		void DrawArrowhead(Vector, Vector, double);
 		void DrawCrosshair(Vector);
 		void DrawInformativeText(QString);
@@ -38,12 +49,6 @@ class Painter
 		static Vector CartesianToQtCoords(Vector);
 		static Vector QtToCartesianCoords(Vector);
 
-	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
-
 	private:
 		QPainter * painter;
 };