X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.h;h=7e5a9d1db52b212509ef5041ba283e7a4c8f9ded;hb=bf5a50feb0f84a4627a65c5b82c3ca2d2eefe54b;hp=9095e53fa2e63cc97d1141ec73eca65790bb5dac;hpb=8fdd047c1ee3688f5538cae30e0acc98b96a2150;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index 9095e53..7e5a9d1 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
@@ -18,22 +21,46 @@ class DrawingView: public QWidget
 		void SetGridSize(uint32_t);
 		void UpdateGridBackground(void);
 		Point SnapPointToGrid(Point);
-		void RenderObjects(Painter *, Container *);
-		void DeleteSelectedItems(void);
-		void ClearSelection(void);
+		Point SnapPointToAngle(Point);
+		void RenderObjects(Painter *, VPVector &, int, bool ignoreLayer = false);
 		void AddHoveredToSelection(void);
-		void GetSelection(std::vector<void *> &);
-		void GetHovered(std::vector<void *> &);
-		void ToolMouse(int, Point);
+		void GetSelection(VPVector &);
+		VPVector GetSelection(void);
+		VPVector GetHovered(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);
+		void TriangulateHandler(int, Point);
+		void TrimHandler(int, Point);
+		void ParallelHandler(int, Point);
+		Rect GetObjectExtents(Object *);
+		void CheckObjectBounds(void);
+		bool HitTestObjects(Point);
+		bool HitTest(Object *, Point);
+		bool HandleObjectClicked(void);
+		void HandleObjectMovement(Point);
+		void AddDimensionTo(void * obj);
 
 	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);
+		void HandlePenStamp(void);
+
+	signals:
+		void ObjectHovered(Object *);
+		void ObjectSelected(Object *);
 
 	protected:
+		void focusOutEvent(QFocusEvent * event);
 		void paintEvent(QPaintEvent * event);
 		void resizeEvent(QResizeEvent * event);
 		void mousePressEvent(QMouseEvent * event);
@@ -49,10 +76,10 @@ class DrawingView: public QWidget
 
 	public:
 		bool useAntialiasing;
-		uint32_t numSelected;
 		uint32_t numHovered;
 		bool shiftDown;
 		bool ctrlDown;
+		bool altDown;
 
 	private:
 		QPixmap gridBackground;
@@ -65,14 +92,24 @@ class DrawingView: public QWidget
 		bool collided;
 		bool scrollDrag;
 		Vector oldPoint;
+		Vector oldScrollPoint;
+		QString informativeText;
 
 	public:
-		std::vector<void *> select;
-		std::vector<void *> hover;
+		VPVector select;
+		VPVector toolObjects;
+		std::vector<Object> toolScratch;
+		VPVector toolScratch2;
 		Point toolPoint[32];
-
-//	public:
-//		static Container document;
+		Object * toolObj[32];
+		Point intersectionPoint;
+		Point hoverPoint;
+		bool hoverPointValid;
+		bool hoveringIntersection;
+		Object * dragged;
+		bool draggingObject;
+		bool angleSnap;
+		bool dirty;
 };
 
 #endif	// __DRAWINGVIEW_H__