X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.h;h=3d22b44e83e97224b9e1c38eee3201d56972d2b0;hb=a398911ea125eb6b25320e96599e0ae39b720cf8;hp=21220e88a99c4479e28a525ef481638204b480fe;hpb=dbfab6256efe6b03e9750e33081d9dcdcdfc1c34;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index 21220e8..3d22b44 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,10 +15,19 @@ class DrawingView: public QWidget
 		DrawingView(QWidget * parent = NULL);
 
 	public:
-//		void SetRotateToolActive(bool state = true);
-		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 *> &);
+		void ToolMouseDown(Point);
+		void ToolMouseMove(Point);
+		void ToolMouseUp(Point);
+		void ToolDraw(Painter *);
 
 	public slots:
 		void AddNewObjectToDocument(Object *);
@@ -30,6 +40,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);
 
@@ -39,6 +50,10 @@ class DrawingView: public QWidget
 
 	public:
 		bool useAntialiasing;
+		uint32_t numSelected;
+		uint32_t numHovered;
+		bool shiftDown;
+		bool ctrlDown;
 
 	private:
 		QPixmap gridBackground;
@@ -49,19 +64,19 @@ 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;
+//		int toolState;
+		Point toolPoint[32];
+//		Object * toolObject;
 
+	// Tool methods (static)
+	public:
+//		static void foo();
 //	public:
 //		static Container document;
 };