X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.h;h=0c6cc46cf76d18390d908dd8447e7b4661355ac9;hb=eb39f1bb5e6518c5dc4f4dbd3c88912a97192e95;hp=55384fa48a3c7c686abc5ba2d44b46dd2d961718;hpb=642cf72c11b49a9e00128ab6258a2438c785a5ab;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index 55384fa..0c6cc46 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,52 +18,112 @@ class DrawingView: public QWidget
 		DrawingView(QWidget * parent = NULL);
 
 	public:
-		void SetRotateToolActive(bool state = true);
-		void SetToolActive(Action * action);
-		void SetGridSize(uint32_t);
-		void UpdateGridBackground(void);
+		void DrawBackground(Painter *);
+//		void SetGridSize(uint32_t);
+//		void SetGridSize(double);
+//		void UpdateGridBackground(void);
+//		void UpdateGridBackgroundF(void);
+		Point SnapPointToGrid(Point);
+		Point SnapPointToAngle(Point);
+		void RenderObjects(Painter *, VPVector &, int, bool ignoreLayer = false);
+		void AddHoveredToSelection(void);
+		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 SetCurrentLayer(int);
+		void DeleteCurrentLayer(int);
+		void HandleLayerToggle(void);
+		void HandleLayerSwap(int, int);
+		void HandlePenWidth(float);
+		void HandlePenStyle(int);
+		void HandlePenColor(uint32_t);
+		void HandlePenStamp(QAction *);
+		void HandlePenDropper(QAction *);
+
+	signals:
+		void ObjectHovered(Object *);
+		void ObjectSelected(Object *);
+		void NeedZoomUpdate(void);
 
 	protected:
+		void focusOutEvent(QFocusEvent * event);
+		void focusInEvent(QFocusEvent * event);
 		void paintEvent(QPaintEvent * event);
 		void resizeEvent(QResizeEvent * event);
 		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:
+		void HandleLayerSwap(int, int, VPVector &);
+		void DrawSubGrid(Painter *, uint32_t, double, Vector, Vector);
 		QPoint GetAdjustedMousePosition(QMouseEvent * event);
 		QPoint GetAdjustedClientPosition(int x, int y);
 
 	public:
 		bool useAntialiasing;
+		uint32_t numHovered;
+		bool shiftDown;
+		bool ctrlDown;
+		bool altDown;
 
 	private:
 		QPixmap gridBackground;
 		double scale;							// Window scaling factor
 		int32_t offsetX, offsetY;				// Window offsets
+		bool supressSelected;
+		QCursor curMarker;
+		QCursor curDropper;
 	public:
 		Container document;
 		uint32_t gridPixels;					// Grid size in pixels
-	private:
+		double gridPixelsF;						// Grid size in pixels (float)
+//	private:
+	public:
 		bool collided;
-//Should this go into Object's class variables???
-//maybe, maybe not... :-P
-		bool rotateTool;
-		double rx, ry;
 		bool scrollDrag;
 		Vector oldPoint;
-//		bool addLineTool;
-//		bool addCircleTool;
-//		bool addDimensionTool;
+		Vector oldScrollPoint;
+		QString informativeText;
 
 	public:
-		Action * toolAction;
+		VPVector select;
+		VPVector toolObjects;
+		std::vector<Object> toolScratch;
+		VPVector toolScratch2;
+		Point toolPoint[32];
+		Object * toolObj[32];
+		Point intersectionPoint;
+		Point hoverPoint;
+		bool hoverPointValid;
+		bool hoveringIntersection;
+		Object * dragged;
+		bool draggingObject;
+		bool angleSnap;
+		bool dirty;
+		bool scrollWheelSeen;
 };
 
 #endif	// __DRAWINGVIEW_H__
+