X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.h;h=c4a7234fe733314ffc34bbebfcf98b3232a314e0;hb=4bc000ba003a53fb11428a2eb71e3b4471a15c7a;hp=989693c870f76477774de10890d0bee1ac2ba0e4;hpb=5446001bd9adfd9f4787f5de5a2a7afd8d7cdb5a;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index 989693c..c4a7234 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -1,10 +1,11 @@
 #ifndef __DRAWINGVIEW_H__
 #define __DRAWINGVIEW_H__
 
-#include <QtGui>
+#include <QtWidgets>
 #include <stdint.h>
-#include "action.h"
-#include "container.h"
+#include "structs.h"
+
+class Painter;
 
 class DrawingView: public QWidget
 {
@@ -14,19 +15,31 @@ 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 SetToolActive(Action * action);
+		void SetGridSize(uint32_t);
 		void UpdateGridBackground(void);
+		Point SnapPointToGrid(Point);
+		void RenderObjects(Painter *, Container *);
+		void DeleteSelectedItems(void);
+		void ClearSelection(void);
+		void AddHoveredToSelection(void);
+		void GetSelection(std::vector<void *> &);
+		void GetHovered(std::vector<void *> &);
 
 	public slots:
 		void AddNewObjectToDocument(Object *);
+		void HandleActionUpdate(void);
+		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);
@@ -34,43 +47,31 @@ 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
-		Container document;
 	public:
-		double gridSpacing;
+		Container document;
+		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;
-		Action * toolAction;
-/*		QSize minimumSizeHint() const;
-		QSize sizeHint() const;
 
-	private:
-		void CreateCursors(void);
-		QPoint GetAdjustedMousePosition(QMouseEvent * event);
-		QPoint GetAdjustedClientPosition(int x, int y);
-
-		QImage image;
-		QPoint pt, ptOffset, ptPrevious;
-		ToolType tool;							// Current tool
-		GlyphPoints pts;						// Glyph point structure
-		int32 ptHighlight, oldPtHighlight, ptNextHighlight, oldPtNextHighlight;
-		bool polyFirstPoint;
+	public:
+		std::vector<void *> select;
+		std::vector<void *> hover;
+//		Action * toolAction;
 
-		ToolWindow * toolPalette;
-		QCursor cur[8];
-*/
+//	public:
+//		static Container document;
 };
 
 #endif	// __DRAWINGVIEW_H__
+