X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fdrawingview.h;h=c4a7234fe733314ffc34bbebfcf98b3232a314e0;hb=4bc000ba003a53fb11428a2eb71e3b4471a15c7a;hp=bd3e07e43307fe4d1256fa4898d70a683a243390;hpb=921bf050ffe5fc81a9ab377e634180e659ee5d5d;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index bd3e07e..c4a7234 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -1,10 +1,11 @@
 #ifndef __DRAWINGVIEW_H__
 #define __DRAWINGVIEW_H__
 
-#include <QtGui>
+#include <QtWidgets>
 #include <stdint.h>
-#include "action.h"
-#include "container.h"
+#include "structs.h"
+
+class Painter;
 
 class DrawingView: public QWidget
 {
@@ -14,13 +15,20 @@ class DrawingView: public QWidget
 		DrawingView(QWidget * parent = NULL);
 
 	public:
-//		void SetRotateToolActive(bool state = true);
-		void SetToolActive(Action * action);
+//		void SetToolActive(Action * action);
 		void SetGridSize(uint32_t);
 		void UpdateGridBackground(void);
+		Point SnapPointToGrid(Point);
+		void RenderObjects(Painter *, Container *);
+		void DeleteSelectedItems(void);
+		void ClearSelection(void);
+		void AddHoveredToSelection(void);
+		void GetSelection(std::vector<void *> &);
+		void GetHovered(std::vector<void *> &);
 
 	public slots:
 		void AddNewObjectToDocument(Object *);
+		void HandleActionUpdate(void);
 		void SetCurrentLayer(int);
 
 	protected:
@@ -29,6 +37,7 @@ 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);
 
@@ -38,6 +47,10 @@ class DrawingView: public QWidget
 
 	public:
 		bool useAntialiasing;
+		uint32_t numSelected;
+		uint32_t numHovered;
+		bool shiftDown;
+		bool ctrlDown;
 
 	private:
 		QPixmap gridBackground;
@@ -48,18 +61,17 @@ class DrawingView: public QWidget
 		uint32_t gridPixels;					// Grid size in pixels
 	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;
-//		bool addDimensionTool;
 
 	public:
-		Action * toolAction;
+		std::vector<void *> select;
+		std::vector<void *> hover;
+//		Action * toolAction;
+
+//	public:
+//		static Container document;
 };
 
 #endif	// __DRAWINGVIEW_H__
+