X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fdrawingview.h;h=888737eb82286b38d3b2fbfe75151828da08e1d3;hb=11802354d1ddc5bc571d83d8fc9b600618cb4372;hp=e8dc3af86c1522d61b2244f9f4bf7d6bd55e5bc1;hpb=fc498c685147e3173130e2df8953cc52705553e9;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index e8dc3af..888737e 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -16,12 +16,17 @@ 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 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);
@@ -34,10 +39,16 @@ 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;
@@ -45,25 +56,13 @@ class DrawingView: public QWidget
 		bool scrollDrag;
 		Vector oldPoint;
 		bool addLineTool;
-		Action * toolAction;
-/*		QSize minimumSizeHint() const;
-		QSize sizeHint() const;
-
-	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;
+		bool addCircleTool;
+		bool addDimensionTool;
+//		bool selectionInProgress;
+//		QRectF selection;
 
-		ToolWindow * toolPalette;
-		QCursor cur[8];
-*/
+	public:
+		Action * toolAction;
 };
 
 #endif	// __DRAWINGVIEW_H__