X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fpainter.h;h=e89f045b7d55a16eb852eb38996e90e2a9b3d777;hb=d9f34cb7917e396a1df805687234d5473d82283b;hp=e32ba975f80263868c52609fe5d6af85f835bf68;hpb=43cc5bc5121cd05dc8696d653369c756950f3fba;p=architektonas

diff --git a/src/painter.h b/src/painter.h
index e32ba97..e89f045 100644
--- a/src/painter.h
+++ b/src/painter.h
@@ -1,7 +1,9 @@
 #ifndef __PAINTER_H__
 #define __PAINTER_H__
 
-#include <QtGui>
+#include <stdint.h>
+#include <QtWidgets>
+#include "rect.h"
 #include "vector.h"
 
 // Forward declarations
@@ -13,27 +15,38 @@ 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);
+		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(QRectF, double, double);
+		void DrawPaddedRect(QRectF);
+		void DrawRect(QRectF);
 		void DrawText(QRectF, int, QString);
+		void DrawArrowhead(Vector, Vector, double);
+		void DrawCrosshair(Vector);
+		void DrawInformativeText(QString);
 
 	public:
-		Vector CartesianToQtCoords(Vector);
-		Vector QtCoordsToCartesian(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
+		static Vector CartesianToQtCoords(Vector);
+		static Vector QtToCartesianCoords(Vector);
 
 	private:
 		QPainter * painter;