X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.h;h=ba35affc022ecbde8c3a54f4c78ae8b4639cf573;hb=06456047e6476969e45be5b1f31b8336ea74c45f;hp=eaf8826f564e4d6ab747ed78bd61bb6044de6c8a;hpb=ef811c836c00cc94ce1eaea5c2e77e5278298b18;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index eaf8826..ba35aff 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -1,10 +1,13 @@
 #ifndef __DRAWINGVIEW_H__
 #define __DRAWINGVIEW_H__
 
-#include <QtGui>
+#include <QtWidgets>
 #include <stdint.h>
-#include "action.h"
-#include "container.h"
+#include "structs.h"
+
+enum { ToolMouseDown, ToolMouseMove, ToolMouseUp, ToolKeyDown, ToolKeyUp, ToolCleanup };
+
+class Painter;
 
 class DrawingView: public QWidget
 {
@@ -14,20 +17,33 @@ 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 SetAddDimensionToolActive(bool state = true);
+		void SetGridSize(uint32_t);
 		void UpdateGridBackground(void);
+		Point SnapPointToGrid(Point);
+		void RenderObjects(Painter *, std::vector<void *> &);
+		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 RotateHandler(int, Point);
+		void CheckObjectBounds(void);
+		bool HitTestObjects(Point);
+		void HandleObjectMovement(Point);
 
 	public slots:
-		void AddNewObjectToDocument(Object *);
+		void SetCurrentLayer(int);
 
 	protected:
 		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:
 		QPoint GetAdjustedMousePosition(QMouseEvent * event);
@@ -35,30 +51,33 @@ class DrawingView: public QWidget
 
 	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;
+		uint32_t gridPixels;					// Grid size in pixels
 	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;
 
 	public:
-		Action * toolAction;
+		std::vector<void *> select;
+		std::vector<void *> hover;
+		std::vector<void *> toolObjects;
+		std::vector<Object> toolScratch;
+		Point toolPoint[32];
+
+//	public:
+//		static Container document;
 };
 
 #endif	// __DRAWINGVIEW_H__
+