X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.h;h=819ab78d226c3a92a26fb0d7a49a22880e4bd7b7;hb=e8987f4028a1f9c0eeb33a45bd11b2e409b9c2c5;hp=989693c870f76477774de10890d0bee1ac2ba0e4;hpb=5446001bd9adfd9f4787f5de5a2a7afd8d7cdb5a;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index 989693c..819ab78 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -15,8 +15,15 @@ class DrawingView: public QWidget
 
 	public:
 		void SetRotateToolActive(bool state = true);
+#if 0
 		void SetAddLineToolActive(bool state = true);
 		void SetAddCircleToolActive(bool state = true);
+		void SetAddArcToolActive(bool state = true);
+		void SetAddDimensionToolActive(bool state = true);
+#endif
+//		void SetToolActive(Action * action, bool state = true);
+		void SetToolActive(Action * action);//, bool state = true);
+		void SetGridSize(uint32_t);
 		void UpdateGridBackground(void);
 
 	public slots:
@@ -24,6 +31,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 +39,7 @@ class DrawingView: public QWidget
 	private:
 		QPoint GetAdjustedMousePosition(QMouseEvent * event);
 		QPoint GetAdjustedClientPosition(int x, int y);
+//		Vector SnapPointToGrid(Vector);
 
 	public:
 		bool useAntialiasing;
@@ -40,37 +49,25 @@ class DrawingView: public QWidget
 		QPixmap gridBackground;
 		double scale;							// Window scaling factor
 		int32_t offsetX, offsetY;				// Window offsets
-		Container document;
 	public:
-		double gridSpacing;
+		Container document;
+//		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???
+//maybe, maybe not... :-P
 		bool rotateTool;
 		double rx, ry;
 		bool scrollDrag;
 		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;
 
-		ToolWindow * toolPalette;
-		QCursor cur[8];
-*/
+	public:
+		Action * toolAction;
 };
 
 #endif	// __DRAWINGVIEW_H__