X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.h;h=1e050e8f1d72917c14f487d8e306dffc0d5d7fbc;hb=deb5512a6b35e73dc2c19ac4d2800cff87dd2e71;hp=5cbd53b8952411808ec7ebb9622d72251613df17;hpb=db0a3d91f37031e155cc8eac7cfdec9889f233ee;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index 5cbd53b..1e050e8 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -3,10 +3,10 @@
 
 #include <QtWidgets>
 #include <stdint.h>
-//#include "action.h"
-//#include "container.h"
 #include "structs.h"
 
+class Painter;
+
 class DrawingView: public QWidget
 {
 	Q_OBJECT
@@ -15,10 +15,22 @@ class DrawingView: public QWidget
 		DrawingView(QWidget * parent = NULL);
 
 	public:
-//		void SetToolActive(Action * action);
 		void SetGridSize(uint32_t);
 		void UpdateGridBackground(void);
 		Point SnapPointToGrid(Point);
+		void RenderObjects(Painter *, std::vector<void *> &);
+		void DeleteSelectedItems(void);
+		void ClearSelection(void);
+		void AddHoveredToSelection(void);
+		void GetSelection(std::vector<void *> &);
+		void GetHovered(std::vector<void *> &);
+		void ToolMouse(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 *);
@@ -41,6 +53,11 @@ class DrawingView: public QWidget
 
 	public:
 		bool useAntialiasing;
+		uint32_t numSelected;
+		uint32_t numHovered;
+		bool shiftDown;
+		bool ctrlDown;
+		bool overrideColor;
 
 	private:
 		QPixmap gridBackground;
@@ -55,7 +72,10 @@ class DrawingView: public QWidget
 		Vector oldPoint;
 
 	public:
-//		Action * toolAction;
+		std::vector<void *> select;
+		std::vector<void *> hover;
+		std::vector<void *> toolObjects;
+		Point toolPoint[32];
 
 //	public:
 //		static Container document;