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

diff --git a/src/drawingview.h b/src/drawingview.h
index 849ce76..d252ffc 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -3,6 +3,7 @@
 
 #include <QtWidgets>
 #include <stdint.h>
+#include "rect.h"
 #include "structs.h"
 
 enum { ToolMouseDown, ToolMouseMove, ToolMouseUp, ToolKeyDown, ToolKeyUp, ToolCleanup };
@@ -20,10 +21,11 @@ class DrawingView: public QWidget
 		void SetGridSize(uint32_t);
 		void UpdateGridBackground(void);
 		Point SnapPointToGrid(Point);
-		void RenderObjects(Painter *, std::vector<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 *> &);
+		VPVector GetSelection(void);
+		VPVector GetHovered(void);
 		void ToolHandler(int, Point);
 		void ToolDraw(Painter *);
 		void LineHandler(int, Point);
@@ -31,14 +33,33 @@ class DrawingView: public QWidget
 		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 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);
@@ -54,10 +75,10 @@ class DrawingView: public QWidget
 
 	public:
 		bool useAntialiasing;
-		uint32_t numSelected;
 		uint32_t numHovered;
 		bool shiftDown;
 		bool ctrlDown;
+		bool altDown;
 
 	private:
 		QPixmap gridBackground;
@@ -70,17 +91,25 @@ class DrawingView: public QWidget
 		bool collided;
 		bool scrollDrag;
 		Vector oldPoint;
+		Vector oldScrollPoint;
 		QString informativeText;
 
 	public:
-		std::vector<void *> select;
-		std::vector<void *> hover;
-		std::vector<void *> toolObjects;
+		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;
+		bool scrollWheelSeen;
 };
 
 #endif	// __DRAWINGVIEW_H__