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

diff --git a/src/painter.h b/src/painter.h
index 5e868d7..98c81f3 100644
--- a/src/painter.h
+++ b/src/painter.h
@@ -3,10 +3,9 @@
 
 #include <stdint.h>
 #include <QtWidgets>
+#include "rect.h"
 #include "vector.h"
 
-//#define SCREEN_ZOOM  (1.0 / 4.0)
-
 // Forward declarations
 
 class Painter
@@ -23,9 +22,13 @@ class Painter
 		void SetFont(QFont);
 		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);
@@ -43,14 +46,9 @@ 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;
 };
 
 #endif	// __PAINTER_H__
+