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

diff --git a/src/drawingview.h b/src/drawingview.h
index 888737e..3531291 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -1,10 +1,13 @@
 #ifndef __DRAWINGVIEW_H__
 #define __DRAWINGVIEW_H__
 
-#include <QtGui>
+#include <QtWidgets>
 #include <stdint.h>
-#include "action.h"
-#include "container.h"
+//#include "action.h"
+//#include "container.h"
+#include "structs.h"
+
+class Painter;
 
 class DrawingView: public QWidget
 {
@@ -14,15 +17,16 @@ class DrawingView: public QWidget
 		DrawingView(QWidget * parent = NULL);
 
 	public:
-		void SetRotateToolActive(bool state = true);
-		void SetAddLineToolActive(bool state = true);
-		void SetAddCircleToolActive(bool state = true);
-		void SetAddDimensionToolActive(bool state = true);
+//		void SetToolActive(Action * action);
 		void SetGridSize(uint32_t);
 		void UpdateGridBackground(void);
+		Point SnapPointToGrid(Point);
+		void RenderObjects(Painter *, Container *);
 
 	public slots:
 		void AddNewObjectToDocument(Object *);
+		void HandleActionUpdate(void);
+		void SetCurrentLayer(int);
 
 	protected:
 		void paintEvent(QPaintEvent * event);
@@ -30,6 +34,9 @@ class DrawingView: public QWidget
 		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);
@@ -39,30 +46,23 @@ 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;						// 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;
-		bool addLineTool;
-		bool addCircleTool;
-		bool addDimensionTool;
-//		bool selectionInProgress;
-//		QRectF selection;
 
 	public:
-		Action * toolAction;
+//		Action * toolAction;
+
+//	public:
+//		static Container document;
 };
 
 #endif	// __DRAWINGVIEW_H__
+