X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.h;h=b8f1760230700ecdb00d06c6b251c713397aa25f;hb=9d59b5831000704a1ed39c22a6043ba658993159;hp=dfb9f8fc0b43c18dc96d5872a41415487ef7d667;hpb=f19a3a172c425b7fcc5a648a94870f0247c6be89;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index dfb9f8f..b8f1760 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,8 +15,12 @@ class DrawingView: public QWidget
 
 	public:
 		void SetRotateToolActive(bool state = true);
-//		void ZoomIn(void);
-//		void ZoomOut(void);
+		void SetAddLineToolActive(bool state = true);
+		void SetAddCircleToolActive(bool state = true);
+		void UpdateGridBackground(void);
+
+	public slots:
+		void AddNewObjectToDocument(Object *);
 
 	protected:
 		void paintEvent(QPaintEvent * event);
@@ -31,16 +36,23 @@ 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;
 		bool scrollDrag;
 		Vector oldPoint;
+		bool addLineTool;
+		bool addCircleTool;
+		Action * toolAction;
 /*		QSize minimumSizeHint() const;
 		QSize sizeHint() const;