X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.h;h=08f347f6cac05e26193f9df07e9114f30a86296c;hb=acd27aa62a4c78b6aeee523e3145a8aa53f4bcde;hp=1046f9c0938164b49cac58e07991d634f89f31b3;hpb=8d80165e3ab9173b8689b3b3420b40bf3020161f;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index 1046f9c..08f347f 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -3,8 +3,11 @@
 
 #include <QtWidgets>
 #include <stdint.h>
+#include "rect.h"
 #include "structs.h"
 
+enum { ToolMouseDown, ToolMouseMove, ToolMouseUp, ToolKeyDown, ToolKeyUp, ToolCleanup };
+
 class Painter;
 
 class DrawingView: public QWidget
@@ -15,17 +18,40 @@ 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 *, Container *);
-		void DeleteSelectedItems(void);
+		Point SnapPointToAngle(Point);
+		void RenderObjects(Painter *, std::vector<void *> &, int, bool ignoreLayer = false);
+		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 DimensionHandler(int, Point);
+		Rect GetObjectExtents(Object *);
+		void CheckObjectBounds(void);
+		bool HitTestObjects(Point);
+		bool HitTest(Object *, Point);
+		bool HandleObjectClicked(void);
+		void HandleObjectMovement(Point);
 
 	public slots:
-		void AddNewObjectToDocument(Object *);
-		void HandleActionUpdate(void);
-		void SetCurrentLayer(int);
+		void DeleteCurrentLayer(int);
+		void HandleLayerToggle(void);
+		void HandleLayerSwap(int, int);
+		void HandlePenWidth(float);
+		void HandlePenStyle(int);
+		void HandlePenColor(uint32_t);
+
+	signals:
+		void ObjectHovered(Object *);
+		void ObjectSelected(Object *);
 
 	protected:
 		void paintEvent(QPaintEvent * event);
@@ -43,7 +69,11 @@ class DrawingView: public QWidget
 
 	public:
 		bool useAntialiasing;
-		uint32_t numSelected;
+//		uint32_t numSelected;
+		uint32_t numHovered;
+		bool shiftDown;
+		bool ctrlDown;
+		bool altDown;
 
 	private:
 		QPixmap gridBackground;
@@ -56,12 +86,22 @@ class DrawingView: public QWidget
 		bool collided;
 		bool scrollDrag;
 		Vector oldPoint;
+		Vector oldScrollPoint;
+		QString informativeText;
 
 	public:
-//		Action * toolAction;
-
-//	public:
-//		static Container document;
+		std::vector<void *> select;
+		std::vector<void *> hover;
+		std::vector<void *> toolObjects;
+		std::vector<Object> toolScratch;
+		Point toolPoint[32];
+		Point intersectionPoint;
+		Point hoverPoint;
+		bool hoverPointValid;
+		bool hoveringIntersection;
+		Object * dragged;
+		bool draggingObject;
+		bool angleSnap;
 };
 
 #endif	// __DRAWINGVIEW_H__