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

diff --git a/src/drawingview.h b/src/drawingview.h
index 3d22b44..cf70e40 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -5,6 +5,8 @@
 #include <stdint.h>
 #include "structs.h"
 
+enum { ToolMouseDown, ToolMouseMove, ToolMouseUp, ToolKeyDown, ToolKeyUp, ToolCleanup };
+
 class Painter;
 
 class DrawingView: public QWidget
@@ -18,21 +20,25 @@ class DrawingView: public QWidget
 		void SetGridSize(uint32_t);
 		void UpdateGridBackground(void);
 		Point SnapPointToGrid(Point);
-		void RenderObjects(Painter *, Container *);
-		void DeleteSelectedItems(void);
-		void ClearSelection(void);
+		void RenderObjects(Painter *, std::vector<void *> &, int);
 		void AddHoveredToSelection(void);
 		void GetSelection(std::vector<void *> &);
 		void GetHovered(std::vector<void *> &);
-		void ToolMouseDown(Point);
-		void ToolMouseMove(Point);
-		void ToolMouseUp(Point);
+		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);
+		void DeleteCurrentLayer(int);
+		void HandleLayerToggle(void);
+		void HandleLayerSwap(int, int);
 
 	protected:
 		void paintEvent(QPaintEvent * event);
@@ -66,17 +72,17 @@ class DrawingView: public QWidget
 		bool collided;
 		bool scrollDrag;
 		Vector oldPoint;
+		QString informativeText;
 
 	public:
 		std::vector<void *> select;
 		std::vector<void *> hover;
-//		int toolState;
+		std::vector<void *> toolObjects;
+		std::vector<Object> toolScratch;
 		Point toolPoint[32];
-//		Object * toolObject;
+		Point intersectionPoint;
+		bool hoveringIntersection;
 
-	// Tool methods (static)
-	public:
-//		static void foo();
 //	public:
 //		static Container document;
 };