X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.h;h=7e5a9d1db52b212509ef5041ba283e7a4c8f9ded;hb=bf5a50feb0f84a4627a65c5b82c3ca2d2eefe54b;hp=29a47a7083e7c2f801d5deda81e6c1f3d543fd03;hpb=4708212b56a0c5645226e728f9a26ee1fd2d027d;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index 29a47a7..7e5a9d1 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -22,10 +22,11 @@ class DrawingView: public QWidget
 		void UpdateGridBackground(void);
 		Point SnapPointToGrid(Point);
 		Point SnapPointToAngle(Point);
-		void RenderObjects(Painter *, std::vector<void *> &, int, bool ignoreLayer = false);
+		void RenderObjects(Painter *, VPVector &, int, bool ignoreLayer = false);
 		void AddHoveredToSelection(void);
-		void GetSelection(std::vector<void *> &);
-		void GetHovered(std::vector<void *> &);
+		void GetSelection(VPVector &);
+		VPVector GetSelection(void);
+		VPVector GetHovered(void);
 		void ToolHandler(int, Point);
 		void ToolDraw(Painter *);
 		void LineHandler(int, Point);
@@ -33,12 +34,17 @@ class DrawingView: public QWidget
 		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 DeleteCurrentLayer(int);
@@ -47,12 +53,14 @@ class DrawingView: public QWidget
 		void HandlePenWidth(float);
 		void HandlePenStyle(int);
 		void HandlePenColor(uint32_t);
+		void HandlePenStamp(void);
 
 	signals:
 		void ObjectHovered(Object *);
 		void ObjectSelected(Object *);
 
 	protected:
+		void focusOutEvent(QFocusEvent * event);
 		void paintEvent(QPaintEvent * event);
 		void resizeEvent(QResizeEvent * event);
 		void mousePressEvent(QMouseEvent * event);
@@ -68,10 +76,10 @@ class DrawingView: public QWidget
 
 	public:
 		bool useAntialiasing;
-//		uint32_t numSelected;
 		uint32_t numHovered;
 		bool shiftDown;
 		bool ctrlDown;
+		bool altDown;
 
 	private:
 		QPixmap gridBackground;
@@ -84,14 +92,16 @@ class DrawingView: public QWidget
 		bool collided;
 		bool scrollDrag;
 		Vector oldPoint;
+		Vector oldScrollPoint;
 		QString informativeText;
 
 	public:
-		std::vector<void *> select;
-		std::vector<void *> hover;
-		std::vector<void *> toolObjects;
+		VPVector select;
+		VPVector toolObjects;
 		std::vector<Object> toolScratch;
+		VPVector toolScratch2;
 		Point toolPoint[32];
+		Object * toolObj[32];
 		Point intersectionPoint;
 		Point hoverPoint;
 		bool hoverPointValid;
@@ -99,6 +109,7 @@ class DrawingView: public QWidget
 		Object * dragged;
 		bool draggingObject;
 		bool angleSnap;
+		bool dirty;
 };
 
 #endif	// __DRAWINGVIEW_H__