X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.h;h=2cc4bcdac8676e0118e2214eff3f5c4ddfbb9e5b;hb=c58b8a9f8b1ae5494857fc423ed8e33b2bbcf329;hp=02baa301121a2d0ad0fd9989232532aba25ee101;hpb=d41ddd699001f6bbf6ac621f5c467bd13efb6087;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index 02baa30..2cc4bcd 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
@@ -13,13 +14,25 @@ class DrawingView: public QWidget
 		DrawingView(QWidget * parent = NULL);
 
 	public:
-		void SetRotateToolActive(bool state = true);
+//		void SetRotateToolActive(bool state = true);
+		void SetToolActive(Action * action);
+		void SetGridSize(uint32_t);
+		void UpdateGridBackground(void);
+
+	public slots:
+		void AddNewObjectToDocument(Object *);
+		void HandleActionUpdate(void);
+		void SetCurrentLayer(int);
 
 	protected:
 		void paintEvent(QPaintEvent * event);
+		void resizeEvent(QResizeEvent * event);
 		void mousePressEvent(QMouseEvent * event);
 		void mouseMoveEvent(QMouseEvent * event);
 		void mouseReleaseEvent(QMouseEvent * event);
+		void wheelEvent(QWheelEvent * event);
+		void keyPressEvent(QKeyEvent * event);
+		void keyReleaseEvent(QKeyEvent * event);
 
 	private:
 		QPoint GetAdjustedMousePosition(QMouseEvent * event);
@@ -29,32 +42,30 @@ class DrawingView: public QWidget
 		bool useAntialiasing;
 
 	private:
+		QPixmap gridBackground;
 		double scale;							// Window scaling factor
 		int32_t offsetX, offsetY;				// Window offsets
+	public:
 		Container document;
-		double gridSpacing;
+		uint32_t gridPixels;					// Grid size in pixels
+	private:
 		bool collided;
 //Should this go into Object's class variables???
-		bool rotateTool;
-		double rx, ry;
-/*		QSize minimumSizeHint() const;
-		QSize sizeHint() const;
+//maybe, maybe not... :-P
+//		bool rotateTool;
+//		double rx, ry;
+		bool scrollDrag;
+		Vector oldPoint;
+//		bool addLineTool;
+//		bool addCircleTool;
+//		bool addDimensionTool;
 
-	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;
+	public:
+		Action * toolAction;
 
-		ToolWindow * toolPalette;
-		QCursor cur[8];
-*/
+//	public:
+//		static Container document;
 };
 
 #endif	// __DRAWINGVIEW_H__
+