X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.h;h=e22634c00d936eda7afd7ad2a87752f611e8d5b0;hb=9426a17d7752f82b27c47f12df0062b882df3077;hp=5cbd53b8952411808ec7ebb9622d72251613df17;hpb=db0a3d91f37031e155cc8eac7cfdec9889f233ee;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index 5cbd53b..e22634c 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -3,10 +3,12 @@
 
 #include <QtWidgets>
 #include <stdint.h>
-//#include "action.h"
-//#include "container.h"
 #include "structs.h"
 
+enum { ToolMouseDown, ToolMouseMove, ToolMouseUp, ToolKeyDown, ToolKeyUp, ToolCleanup };
+
+class Painter;
+
 class DrawingView: public QWidget
 {
 	Q_OBJECT
@@ -15,14 +17,24 @@ class DrawingView: public QWidget
 		DrawingView(QWidget * parent = NULL);
 
 	public:
-//		void SetToolActive(Action * action);
 		void SetGridSize(uint32_t);
 		void UpdateGridBackground(void);
 		Point SnapPointToGrid(Point);
+		void RenderObjects(Painter *, std::vector<void *> &);
+		void AddHoveredToSelection(void);
+		void GetSelection(std::vector<void *> &);
+		void GetHovered(std::vector<void *> &);
+		void ToolHandler(int, Point);
+		void ToolDraw(Painter *);
+		void LineHandler(int, Point);
+		void CircleHandler(int, Point);
+		void ArcHandler(int, Point);
+		void RotateHandler(int, Point);
+		void CheckObjectBounds(void);
+		bool HitTestObjects(Point);
+		void HandleObjectMovement(Point);
 
 	public slots:
-		void AddNewObjectToDocument(Object *);
-		void HandleActionUpdate(void);
 		void SetCurrentLayer(int);
 
 	protected:
@@ -41,6 +53,10 @@ class DrawingView: public QWidget
 
 	public:
 		bool useAntialiasing;
+		uint32_t numSelected;
+		uint32_t numHovered;
+		bool shiftDown;
+		bool ctrlDown;
 
 	private:
 		QPixmap gridBackground;
@@ -53,9 +69,14 @@ class DrawingView: public QWidget
 		bool collided;
 		bool scrollDrag;
 		Vector oldPoint;
+		QString informativeText;
 
 	public:
-//		Action * toolAction;
+		std::vector<void *> select;
+		std::vector<void *> hover;
+		std::vector<void *> toolObjects;
+		std::vector<Object> toolScratch;
+		Point toolPoint[32];
 
 //	public:
 //		static Container document;