X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.h;h=92ac72a692abc14945124569c45d8d6a699f66c4;hb=6533354910fbf76d9747deeae02b2e910ef9aa48;hp=b296f28e64c887f2a8276d5a775cd76f178fe5f6;hpb=bb8d0671717bac2c5350e34024273381be1d8175;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index b296f28..92ac72a 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -1,10 +1,14 @@
 #ifndef __DRAWINGVIEW_H__
 #define __DRAWINGVIEW_H__
 
-#include <QtGui>
+#include <QtWidgets>
 #include <stdint.h>
-#include "action.h"
-#include "container.h"
+#include "rect.h"
+#include "structs.h"
+
+enum { ToolMouseDown, ToolMouseMove, ToolMouseUp, ToolKeyDown, ToolKeyUp, ToolCleanup };
+
+class Painter;
 
 class DrawingView: public QWidget
 {
@@ -14,16 +18,35 @@ class DrawingView: public QWidget
 		DrawingView(QWidget * parent = NULL);
 
 	public:
-		void SetRotateToolActive(bool state = true);
-		void SetAddLineToolActive(bool state = true);
-		void SetAddCircleToolActive(bool state = true);
-		void SetAddArcToolActive(bool state = true);
-		void SetAddDimensionToolActive(bool state = true);
 		void SetGridSize(uint32_t);
 		void UpdateGridBackground(void);
+		Point SnapPointToGrid(Point);
+		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);
+		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 DeleteCurrentLayer(int);
+		void HandleLayerToggle(void);
+		void HandleLayerSwap(int, int);
+
+	signals:
+		void ObjectHovered(Object *);
 
 	protected:
 		void paintEvent(QPaintEvent * event);
@@ -31,40 +54,48 @@ class DrawingView: public QWidget
 		void mousePressEvent(QMouseEvent * event);
 		void mouseMoveEvent(QMouseEvent * event);
 		void mouseReleaseEvent(QMouseEvent * event);
+		void wheelEvent(QWheelEvent * event);
+		void keyPressEvent(QKeyEvent * event);
+		void keyReleaseEvent(QKeyEvent * event);
 
 	private:
 		QPoint GetAdjustedMousePosition(QMouseEvent * event);
 		QPoint GetAdjustedClientPosition(int x, int y);
-		Vector SnapPointToGrid(Vector);
 
 	public:
 		bool useAntialiasing;
+//		uint32_t numSelected;
+		uint32_t numHovered;
+		bool shiftDown;
+		bool ctrlDown;
 
 	private:
-//		QBrush * backgroundBrush;
 		QPixmap gridBackground;
 		double scale;							// Window scaling factor
 		int32_t offsetX, offsetY;				// Window offsets
 	public:
 		Container document;
-		double gridSpacing;						// Grid spacing in base units
 		uint32_t gridPixels;					// Grid size in pixels
-//		double gridBaseUnits;					// Grid size in base units
 	private:
 		bool collided;
-//Should this go into Object's class variables???
-		bool rotateTool;
-		double rx, ry;
 		bool scrollDrag;
 		Vector oldPoint;
-		bool addLineTool;
-		bool addCircleTool;
-		bool addDimensionTool;
-//		bool selectionInProgress;
-//		QRectF selection;
+		QString informativeText;
 
 	public:
-		Action * toolAction;
+		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__
+