X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.cpp;h=838d45aae4f62e59827d082a9c6b34eb8c6eca18;hb=143b369c0308a8cd524cb0ed51c5d67d6be69603;hp=5bbcddf62ffeb0396b5f5edc5924e46ceaea9a5e;hpb=89b8b0c60579d8ef0cf9a13521e7bf7c7864883f;p=architektonas

diff --git a/src/drawingview.cpp b/src/drawingview.cpp
index 5bbcddf..838d45a 100644
--- a/src/drawingview.cpp
+++ b/src/drawingview.cpp
@@ -47,7 +47,7 @@ DrawingView::DrawingView(QWidget * parent/*= NULL*/): QWidget(parent),
 	gridBackground(BACKGROUND_MAX_SIZE, BACKGROUND_MAX_SIZE),
 	scale(1.0), offsetX(-10), offsetY(-10),
 	document(Vector(0, 0)),
-	gridSpacing(12.0), gridPixels(0), collided(false), rotateTool(false),
+	/*gridSpacing(12.0),*/ gridPixels(0), collided(false), rotateTool(false),
 	rx(150.0), ry(150.0),
 	scrollDrag(false), addLineTool(false), addCircleTool(false),
 	addDimensionTool(false),
@@ -57,6 +57,7 @@ DrawingView::DrawingView(QWidget * parent/*= NULL*/): QWidget(parent),
 	setBackgroundRole(QPalette::Base);
 	setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 
+	Object::gridSpacing = 12.0;
 //	toolPalette = new ToolWindow();
 //	CreateCursors();
 //	setCursor(cur[TOOLSelect]);
@@ -168,7 +169,8 @@ void DrawingView::SetGridSize(uint32_t size)
 	pmp.end();
 
 	// Set up new BG brush & zoom level (pixels per base unit)
-	Painter::zoom = gridPixels / gridSpacing;
+//	Painter::zoom = gridPixels / gridSpacing;
+	Painter::zoom = gridPixels / Object::gridSpacing;
 	UpdateGridBackground();
 }
 
@@ -282,6 +284,7 @@ QPoint DrawingView::GetAdjustedClientPosition(int x, int y)
 }
 
 
+#if 0
 //
 // This looks strange, but it's really quite simple: We want a point that's
 // more than half-way to the next grid point to snap there while conversely we
@@ -300,6 +303,7 @@ Vector DrawingView::SnapPointToGrid(Vector point)
 	point *= gridSpacing;
 	return point;
 }
+#endif
 
 
 void DrawingView::paintEvent(QPaintEvent * /*event*/)
@@ -375,9 +379,13 @@ So, how to fix this? Have the Object check itself?
 Maybe we can fix this by having the initial point not be snapped, but when there's
 a drag, we substitute the snapped point 'oldPoint' which the Object keeps track of
 internally to know how far it was dragged...
+
+Now we do... :-/
 */
+#if 0
 		if (Object::snapToGrid)
-			point = SnapPointToGrid(point);
+			point = Object::SnapPointToGrid(point);
+#endif
 
 		collided = document.Collided(point);
 
@@ -385,7 +393,12 @@ internally to know how far it was dragged...
 			update();	// Do an update if collided with at least *one* object in the document
 
 		if (toolAction)
+		{
+			if (Object::snapToGrid)
+				point = Object::SnapPointToGrid(point);
+
 			toolAction->MouseDown(point);
+		}
 
 		// Didn't hit any object and not using a tool, so do a selection rectangle
 		if (!(collided || toolAction))
@@ -427,25 +440,11 @@ void DrawingView::mouseMoveEvent(QMouseEvent * event)
 	}
 
 	// Grid processing...
-#if 1
 	if ((event->buttons() & Qt::LeftButton) && Object::snapToGrid)
 	{
-#if 0
-		point += gridSpacing / 2.0;					// *This* adds to Z!!!
-		point /= gridSpacing;
-//200% is ok, gridSpacing = 6 in this case...
-//won't run into problems until gridSpacing = 1.5 (zoom = 800%)
-//run into problems with this approach: when zoom level is 200% this truncates to
-//integers, which is *not* what's wanted here...
-		point.x = floor(point.x);//need to fix this for negative numbers...
-		point.y = floor(point.y);
-		point.z = 0;								// Make *sure* Z doesn't go anywhere!!!
-		point *= gridSpacing;
-#else
-		point = SnapPointToGrid(point);
-#endif
+		point = Object::SnapPointToGrid(point);
 	}
-#endif
+
 	oldPoint = point;
 //we should keep track of the last point here and only pass this down *if* the point
 //changed...
@@ -458,7 +457,7 @@ void DrawingView::mouseMoveEvent(QMouseEvent * event)
 	{
 		if (Object::snapToGrid)
 		{
-			point = SnapPointToGrid(point);
+			point = Object::SnapPointToGrid(point);
 			oldPoint = point;
 		}