X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.h;h=cd76d1e9aba034be6e7e93ce335280bc42e48530;hb=d549bfdc8c872b966b9d787c00e5e8027366093c;hp=02baa301121a2d0ad0fd9989232532aba25ee101;hpb=d41ddd699001f6bbf6ac621f5c467bd13efb6087;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index 02baa30..cd76d1e 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -3,6 +3,7 @@
 
 #include <QtGui>
 #include <stdint.h>
+#include "action.h"
 #include "container.h"
 
 class DrawingView: public QWidget
@@ -14,6 +15,13 @@ class DrawingView: public QWidget
 
 	public:
 		void SetRotateToolActive(bool state = true);
+		void SetAddLineToolActive(bool state = true);
+		void SetAddCircleToolActive(bool state = true);
+		void SetAddDimensionToolActive(bool state = true);
+		void UpdateGridBackground(void);
+
+	public slots:
+		void AddNewObjectToDocument(Object *);
 
 	protected:
 		void paintEvent(QPaintEvent * event);
@@ -29,32 +37,28 @@ class DrawingView: public QWidget
 		bool useAntialiasing;
 
 	private:
+//		QBrush * backgroundBrush;
+		QPixmap gridBackground;
 		double scale;							// Window scaling factor
 		int32_t offsetX, offsetY;				// Window offsets
+	public:
 		Container document;
 		double gridSpacing;
+	private:
 		bool collided;
 //Should this go into Object's class variables???
 		bool rotateTool;
 		double rx, ry;
-/*		QSize minimumSizeHint() const;
-		QSize sizeHint() const;
+		bool scrollDrag;
+		Vector oldPoint;
+		bool addLineTool;
+		bool addCircleTool;
+		bool addDimensionTool;
+//		bool selectionInProgress;
+//		QRectF selection;
 
-	private:
-		void CreateCursors(void);
-		QPoint GetAdjustedMousePosition(QMouseEvent * event);
-		QPoint GetAdjustedClientPosition(int x, int y);
-
-		QImage image;
-		QPoint pt, ptOffset, ptPrevious;
-		ToolType tool;							// Current tool
-		GlyphPoints pts;						// Glyph point structure
-		int32 ptHighlight, oldPtHighlight, ptNextHighlight, oldPtNextHighlight;
-		bool polyFirstPoint;
-
-		ToolWindow * toolPalette;
-		QCursor cur[8];
-*/
+	public:
+		Action * toolAction;
 };
 
 #endif	// __DRAWINGVIEW_H__