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

diff --git a/src/drawingview.h b/src/drawingview.h
index 0c6cc46..136380c 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);
 		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,6 +50,7 @@ class DrawingView: public QWidget
 		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);
@@ -76,7 +75,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);
@@ -114,6 +112,7 @@ class DrawingView: public QWidget
 		VPVector toolScratch2;
 		Point toolPoint[32];
 		Object * toolObj[32];
+		double toolParam[32];
 		Point intersectionPoint;
 		Point hoverPoint;
 		bool hoverPointValid;
@@ -126,4 +125,3 @@ class DrawingView: public QWidget
 };
 
 #endif	// __DRAWINGVIEW_H__
-