X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fdrawingview.cpp;h=acfad409c2f22e685e49c646de30c355039684df;hb=8a5bf49d09b5a00ebea3ffc449519ad05b0326cc;hp=9341a76279044ef78c64e3d21a39f95d85cda41c;hpb=c58b8a9f8b1ae5494857fc423ed8e33b2bbcf329;p=architektonas

diff --git a/src/drawingview.cpp b/src/drawingview.cpp
index 9341a76..acfad40 100644
--- a/src/drawingview.cpp
+++ b/src/drawingview.cpp
@@ -49,23 +49,14 @@ DrawingView::DrawingView(QWidget * parent/*= NULL*/): QWidget(parent),
 	// The value in the settings file will override this.
 	useAntialiasing(true),
 	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),
-//	rx(150.0), ry(150.0),
-//	scrollDrag(false), addLineTool(false), addCircleTool(false),
-//	addDimensionTool(false),
-	toolAction(NULL)
+	scale(1.0), offsetX(-10), offsetY(-10), document(Vector(0, 0)),
+	gridPixels(0), collided(false), toolAction(NULL)
 {
 	document.isTopLevelContainer = true;
 	setBackgroundRole(QPalette::Base);
 	setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 
-	Object::gridSpacing = 12.0;
-//	toolPalette = new ToolWindow();
-//	CreateCursors();
-//	setCursor(cur[TOOLSelect]);
-//	setMouseTracking(true);
+	Object::gridSpacing = 12.0;		// In base units (inch is default)
 
 	Line * line = new Line(Vector(5, 5), Vector(50, 40), &document);
 	document.Add(line);
@@ -130,7 +121,7 @@ need a thickness parameter similar to the "size" param for dimensions. (And now
 we do! :-)
 
 */
-	SetGridSize(12);
+	SetGridSize(12);	// This is in pixels
 }
 
 
@@ -341,26 +332,11 @@ void DrawingView::mousePressEvent(QMouseEvent * event)
 	if (event->button() == Qt::LeftButton)
 	{
 		Vector point = Painter::QtToCartesianCoords(Vector(event->x(), event->y()));
-
-// Problem with this: Can't select stuff very well with the snap grid on.
-// Completely screws things up, as sometimes things don't fall on the grid.
-/*
-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 = Object::SnapPointToGrid(point);
-#endif
-
 		collided = document.Collided(point);
 
+		// Do an update if collided with at least *one* object in the document
 		if (collided)
-			update();	// Do an update if collided with at least *one* object in the document
+			update();
 
 		if (toolAction)
 		{
@@ -398,7 +374,8 @@ void DrawingView::mouseMoveEvent(QMouseEvent * event)
 		point = Vector(event->x(), event->y());
 		// Since we're using Qt coords for scrolling, we have to adjust them here to
 		// conform to Cartesian coords, since the origin is using Cartesian. :-)
-		Vector delta(point, oldPoint);
+//		Vector delta(point, oldPoint);
+		Vector delta(oldPoint, point);
 		delta /= Painter::zoom;
 		delta.y = -delta.y;
 		Painter::origin -= delta;
@@ -470,10 +447,11 @@ void DrawingView::mouseReleaseEvent(QMouseEvent * event)
 void DrawingView::wheelEvent(QWheelEvent * event)
 {
 	double zoomFactor = 1.25;
-	QSize sizeWin = /*drawing->*/size();
+	QSize sizeWin = size();
 	Vector center(sizeWin.width() / 2.0, sizeWin.height() / 2.0);
 	center = Painter::QtToCartesianCoords(center);
 
+	// This is not centering for some reason. Need to figure out why. :-/
 	if (event->delta() > 0)
 	{
 		Vector newOrigin = center - ((center - Painter::origin) / zoomFactor);
@@ -487,10 +465,10 @@ void DrawingView::wheelEvent(QWheelEvent * event)
 		Painter::zoom /= zoomFactor;
 	}
 
-//	Object::gridSpacing = /*drawing->*/gridPixels / Painter::zoom;
+//	Object::gridSpacing = gridPixels / Painter::zoom;
+//	UpdateGridBackground();
 	SetGridSize(Object::gridSpacing * Painter::zoom);
-//	/*drawing->*/UpdateGridBackground();
-	/*drawing->*/update();
+	update();
 //	zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(Object::gridSpacing));
 }