X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.h;h=0d483926f049e62787b45bce2c7fa6a8a1a164c0;hb=41644f6a841b45cb6f1f7a96c93fd550f67a7974;hp=92ac72a692abc14945124569c45d8d6a699f66c4;hpb=6533354910fbf76d9747deeae02b2e910ef9aa48;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index 92ac72a..0d48392 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -18,14 +18,14 @@ 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 AddHoveredToSelection(void);
-		void GetSelection(std::vector<void *> &);
-		void GetHovered(std::vector<void *> &);
+		void RenderObjects(Painter *, VPVector &, int, bool ignoreLayer = false);
+		void HandleSelectionClick(VPVector &);
+		VPVector GetSelection(void);
+		VPVector GetHovered(bool exclude = false);
+		void MoveSelectedToLayer(int);
 		void ToolHandler(int, Point);
 		void ToolDraw(Painter *);
 		void LineHandler(int, Point);
@@ -33,22 +33,35 @@ class DrawingView: public QWidget
 		void ArcHandler(int, Point);
 		void RotateHandler(int, Point);
 		void MirrorHandler(int, Point);
+		void DimensionHandler(int, Point);
+		void DeleteHandler(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 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);
@@ -59,35 +72,44 @@ 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;
+		bool altDown;
 
 	private:
 		QPixmap gridBackground;
-		double scale;							// Window scaling factor
-		int32_t offsetX, offsetY;				// Window offsets
+		double scale;						// Window scaling factor
+		int32_t offsetX, offsetY;			// Window offsets
+		bool supressSelected;
+		QCursor curMarker;
+		QCursor curDropper;
+		uint32_t currentSelect;
 	public:
 		Container document;
-		uint32_t gridPixels;					// Grid size in pixels
-	private:
+		uint32_t gridPixels;				// Grid size in pixels
+		double gridPixelsF;					// Grid size in pixels (float)
 		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;
+		VPVector oldHover;
 		Point toolPoint[32];
+		Object * toolObj[32];
+		double toolParam[32];
 		Point intersectionPoint;
 		Point hoverPoint;
 		bool hoverPointValid;
@@ -95,7 +117,8 @@ class DrawingView: public QWidget
 		Object * dragged;
 		bool draggingObject;
 		bool angleSnap;
+		bool dirty;
+		bool scrollWheelSeen;
 };
 
 #endif	// __DRAWINGVIEW_H__
-