X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.h;h=1e050e8f1d72917c14f487d8e306dffc0d5d7fbc;hb=deb5512a6b35e73dc2c19ac4d2800cff87dd2e71;hp=af0fa9265afdade5a85430e35b5a6905aad0dd64;hpb=6c1279871f6bb86bc59e2561b6a7f74ab081f71e;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index af0fa92..1e050e8 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -3,8 +3,9 @@
 
 #include <QtWidgets>
 #include <stdint.h>
-#include "action.h"
-#include "container.h"
+#include "structs.h"
+
+class Painter;
 
 class DrawingView: public QWidget
 {
@@ -14,10 +15,22 @@ 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 DeleteSelectedItems(void);
+		void ClearSelection(void);
+		void AddHoveredToSelection(void);
+		void GetSelection(std::vector<void *> &);
+		void GetHovered(std::vector<void *> &);
+		void ToolMouse(int, Point);
+		void ToolDraw(Painter *);
+		void LineHandler(int, Point);
+		void RotateHandler(int, Point);
+		void CheckObjectBounds(void);
+		bool HitTestObjects(Point);
+		void HandleObjectMovement(Point);
 
 	public slots:
 		void AddNewObjectToDocument(Object *);
@@ -40,6 +53,11 @@ class DrawingView: public QWidget
 
 	public:
 		bool useAntialiasing;
+		uint32_t numSelected;
+		uint32_t numHovered;
+		bool shiftDown;
+		bool ctrlDown;
+		bool overrideColor;
 
 	private:
 		QPixmap gridBackground;
@@ -50,18 +68,14 @@ 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;
+		std::vector<void *> toolObjects;
+		Point toolPoint[32];
 
 //	public:
 //		static Container document;