X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.h;h=0d483926f049e62787b45bce2c7fa6a8a1a164c0;hb=10cf4c797bed05831e976068b7504908279dc997;hp=0c6cc46cf76d18390d908dd8447e7b4661355ac9;hpb=eb39f1bb5e6518c5dc4f4dbd3c88912a97192e95;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index 0c6cc46..0d48392 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -19,16 +19,13 @@ class DrawingView: public QWidget
 
 	public:
 		void DrawBackground(Painter *);
-//		void SetGridSize(uint32_t);
-//		void SetGridSize(double);
-//		void UpdateGridBackground(void);
-//		void UpdateGridBackgroundF(void);
 		Point SnapPointToGrid(Point);
 		Point SnapPointToAngle(Point);
 		void RenderObjects(Painter *, VPVector &, int, bool ignoreLayer = false);
-		void AddHoveredToSelection(void);
+		void HandleSelectionClick(VPVector &);
 		VPVector GetSelection(void);
-		VPVector GetHovered(void);
+		VPVector GetHovered(bool exclude = false);
+		void MoveSelectedToLayer(int);
 		void ToolHandler(int, Point);
 		void ToolDraw(Painter *);
 		void LineHandler(int, Point);
@@ -37,6 +34,7 @@ class DrawingView: public QWidget
 		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);
@@ -52,9 +50,7 @@ class DrawingView: public QWidget
 		void DeleteCurrentLayer(int);
 		void HandleLayerToggle(void);
 		void HandleLayerSwap(int, int);
-		void HandlePenWidth(float);
-		void HandlePenStyle(int);
-		void HandlePenColor(uint32_t);
+		void HandleLayerSwap(int, int, VPVector &);
 		void HandlePenStamp(QAction *);
 		void HandlePenDropper(QAction *);
 
@@ -76,7 +72,6 @@ class DrawingView: public QWidget
 		void keyReleaseEvent(QKeyEvent * event);
 
 	private:
-		void HandleLayerSwap(int, int, VPVector &);
 		void DrawSubGrid(Painter *, uint32_t, double, Vector, Vector);
 		QPoint GetAdjustedMousePosition(QMouseEvent * event);
 		QPoint GetAdjustedClientPosition(int x, int y);
@@ -90,17 +85,16 @@ class DrawingView: public QWidget
 
 	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
-		double gridPixelsF;						// Grid size in pixels (float)
-//	private:
-	public:
+		uint32_t gridPixels;				// Grid size in pixels
+		double gridPixelsF;					// Grid size in pixels (float)
 		bool collided;
 		bool scrollDrag;
 		Vector oldPoint;
@@ -112,8 +106,10 @@ class DrawingView: public QWidget
 		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;
@@ -126,4 +122,3 @@ class DrawingView: public QWidget
 };
 
 #endif	// __DRAWINGVIEW_H__
-