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

diff --git a/src/drawingview.h b/src/drawingview.h
index dfb9f8f..888737e 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,11 +15,18 @@ 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 SetAddDimensionToolActive(bool state = true);
+		void SetGridSize(uint32_t);
+		void UpdateGridBackground(void);
+
+	public slots:
+		void AddNewObjectToDocument(Object *);
 
 	protected:
 		void paintEvent(QPaintEvent * event);
+		void resizeEvent(QResizeEvent * event);
 		void mousePressEvent(QMouseEvent * event);
 		void mouseMoveEvent(QMouseEvent * event);
 		void mouseReleaseEvent(QMouseEvent * event);
@@ -31,34 +39,30 @@ 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;
+		double gridSpacing;						// Grid spacing in base units
+		uint32_t gridPixels;					// Grid size in pixels
+//		double gridBaseUnits;					// Grid size in base units
+	private:
 		bool collided;
 //Should this go into Object's class variables???
 		bool rotateTool;
 		double rx, ry;
 		bool scrollDrag;
 		Vector oldPoint;
-/*		QSize minimumSizeHint() const;
-		QSize sizeHint() const;
+		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__