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

diff --git a/src/drawingview.h b/src/drawingview.h
index 2cc4bcd..849ce76 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 "structs.h"
+
+enum { ToolMouseDown, ToolMouseMove, ToolMouseUp, ToolKeyDown, ToolKeyUp, ToolCleanup };
+
+class Painter;
 
 class DrawingView: public QWidget
 {
@@ -14,14 +17,25 @@ 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 *, 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 MirrorHandler(int, Point);
+		void CheckObjectBounds(void);
+		bool HitTestObjects(Point);
+		void HandleObjectMovement(Point);
 
 	public slots:
-		void AddNewObjectToDocument(Object *);
-		void HandleActionUpdate(void);
 		void SetCurrentLayer(int);
 
 	protected:
@@ -40,6 +54,10 @@ class DrawingView: public QWidget
 
 	public:
 		bool useAntialiasing;
+		uint32_t numSelected;
+		uint32_t numHovered;
+		bool shiftDown;
+		bool ctrlDown;
 
 	private:
 		QPixmap gridBackground;
@@ -50,18 +68,16 @@ 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;
+		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;