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

diff --git a/src/drawingview.h b/src/drawingview.h
index b8f1760..b296f28 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -17,6 +17,9 @@ class DrawingView: public QWidget
 		void SetRotateToolActive(bool state = true);
 		void SetAddLineToolActive(bool state = true);
 		void SetAddCircleToolActive(bool state = true);
+		void SetAddArcToolActive(bool state = true);
+		void SetAddDimensionToolActive(bool state = true);
+		void SetGridSize(uint32_t);
 		void UpdateGridBackground(void);
 
 	public slots:
@@ -24,6 +27,7 @@ class DrawingView: public QWidget
 
 	protected:
 		void paintEvent(QPaintEvent * event);
+		void resizeEvent(QResizeEvent * event);
 		void mousePressEvent(QMouseEvent * event);
 		void mouseMoveEvent(QMouseEvent * event);
 		void mouseReleaseEvent(QMouseEvent * event);
@@ -31,6 +35,7 @@ class DrawingView: public QWidget
 	private:
 		QPoint GetAdjustedMousePosition(QMouseEvent * event);
 		QPoint GetAdjustedClientPosition(int x, int y);
+		Vector SnapPointToGrid(Vector);
 
 	public:
 		bool useAntialiasing;
@@ -42,7 +47,9 @@ class DrawingView: public QWidget
 		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???
@@ -52,25 +59,12 @@ class DrawingView: public QWidget
 		Vector oldPoint;
 		bool addLineTool;
 		bool addCircleTool;
-		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 addDimensionTool;
+//		bool selectionInProgress;
+//		QRectF selection;
 
-		ToolWindow * toolPalette;
-		QCursor cur[8];
-*/
+	public:
+		Action * toolAction;
 };
 
 #endif	// __DRAWINGVIEW_H__