X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.h;h=08f347f6cac05e26193f9df07e9114f30a86296c;hb=acd27aa62a4c78b6aeee523e3145a8aa53f4bcde;hp=780c81214bf81c360bf53901478fb1421d390d6d;hpb=e78daf62eb771ee29a59035d16cf63c1e6ebe144;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index 780c812..08f347f 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -21,6 +21,7 @@ class DrawingView: public QWidget
 		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 *> &);
@@ -32,19 +33,25 @@ class DrawingView: public QWidget
 		void ArcHandler(int, Point);
 		void RotateHandler(int, Point);
 		void MirrorHandler(int, Point);
+		void DimensionHandler(int, Point);
 		Rect GetObjectExtents(Object *);
 		void CheckObjectBounds(void);
 		bool HitTestObjects(Point);
 		bool HitTest(Object *, Point);
+		bool HandleObjectClicked(void);
 		void HandleObjectMovement(Point);
 
 	public slots:
 		void DeleteCurrentLayer(int);
 		void HandleLayerToggle(void);
 		void HandleLayerSwap(int, int);
+		void HandlePenWidth(float);
+		void HandlePenStyle(int);
+		void HandlePenColor(uint32_t);
 
 	signals:
 		void ObjectHovered(Object *);
+		void ObjectSelected(Object *);
 
 	protected:
 		void paintEvent(QPaintEvent * event);
@@ -66,6 +73,7 @@ class DrawingView: public QWidget
 		uint32_t numHovered;
 		bool shiftDown;
 		bool ctrlDown;
+		bool altDown;
 
 	private:
 		QPixmap gridBackground;
@@ -78,6 +86,7 @@ class DrawingView: public QWidget
 		bool collided;
 		bool scrollDrag;
 		Vector oldPoint;
+		Vector oldScrollPoint;
 		QString informativeText;
 
 	public:
@@ -87,10 +96,12 @@ class DrawingView: public QWidget
 		std::vector<Object> toolScratch;
 		Point toolPoint[32];
 		Point intersectionPoint;
+		Point hoverPoint;
+		bool hoverPointValid;
 		bool hoveringIntersection;
-
-//	public:
-//		static Container document;
+		Object * dragged;
+		bool draggingObject;
+		bool angleSnap;
 };
 
 #endif	// __DRAWINGVIEW_H__