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

diff --git a/src/drawingview.h b/src/drawingview.h
index 08f347f..704b79d 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -18,14 +18,13 @@ class DrawingView: public QWidget
 		DrawingView(QWidget * parent = NULL);
 
 	public:
-		void SetGridSize(uint32_t);
-		void UpdateGridBackground(void);
+		void DrawBackground(Painter *);
 		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 *> &);
+		VPVector GetSelection(void);
+		VPVector GetHovered(void);
 		void ToolHandler(int, Point);
 		void ToolDraw(Painter *);
 		void LineHandler(int, Point);
@@ -34,26 +33,36 @@ class DrawingView: public QWidget
 		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);
 		void HandleLayerToggle(void);
 		void HandleLayerSwap(int, int);
+		void HandleLayerSwap(int, int, VPVector &);
 		void HandlePenWidth(float);
 		void HandlePenStyle(int);
 		void HandlePenColor(uint32_t);
+		void HandlePenStamp(QAction *);
+		void HandlePenDropper(QAction *);
 
 	signals:
 		void ObjectHovered(Object *);
 		void ObjectSelected(Object *);
+		void NeedZoomUpdate(void);
 
 	protected:
+		void focusOutEvent(QFocusEvent * event);
+		void focusInEvent(QFocusEvent * event);
 		void paintEvent(QPaintEvent * event);
 		void resizeEvent(QResizeEvent * event);
 		void mousePressEvent(QMouseEvent * event);
@@ -64,12 +73,12 @@ class DrawingView: public QWidget
 		void keyReleaseEvent(QKeyEvent * event);
 
 	private:
+		void DrawSubGrid(Painter *, uint32_t, double, Vector, Vector);
 		QPoint GetAdjustedMousePosition(QMouseEvent * event);
 		QPoint GetAdjustedClientPosition(int x, int y);
 
 	public:
 		bool useAntialiasing;
-//		uint32_t numSelected;
 		uint32_t numHovered;
 		bool shiftDown;
 		bool ctrlDown;
@@ -79,10 +88,15 @@ class DrawingView: public QWidget
 		QPixmap gridBackground;
 		double scale;							// Window scaling factor
 		int32_t offsetX, offsetY;				// Window offsets
+		bool supressSelected;
+		QCursor curMarker;
+		QCursor curDropper;
 	public:
 		Container document;
 		uint32_t gridPixels;					// Grid size in pixels
-	private:
+		double gridPixelsF;						// Grid size in pixels (float)
+//	private:
+	public:
 		bool collided;
 		bool scrollDrag;
 		Vector oldPoint;
@@ -90,11 +104,12 @@ class DrawingView: public QWidget
 		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;
@@ -102,6 +117,8 @@ class DrawingView: public QWidget
 		Object * dragged;
 		bool draggingObject;
 		bool angleSnap;
+		bool dirty;
+		bool scrollWheelSeen;
 };
 
 #endif	// __DRAWINGVIEW_H__