X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.cpp;h=07d7d9fa0265a67073769ab880e0af5712bd388a;hb=9590e4ed45fd4e05eccc16bd8e9d51596aea5a6d;hp=656545b945c3738442e47513b96878f2843fe2f1;hpb=dbfab6256efe6b03e9750e33081d9dcdcdfc1c34;p=architektonas

diff --git a/src/drawingview.cpp b/src/drawingview.cpp
index 656545b..07d7d9f 100644
--- a/src/drawingview.cpp
+++ b/src/drawingview.cpp
@@ -398,7 +398,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;
@@ -467,26 +468,45 @@ void DrawingView::mouseReleaseEvent(QMouseEvent * event)
 }
 
 
-void DrawingView::keyPressEvent(QKeyEvent * event)
+void DrawingView::wheelEvent(QWheelEvent * event)
 {
-	if (toolAction)
-	{
-		/*bool needUpdate =*/ toolAction->KeyDown(event->key());
+	double zoomFactor = 1.25;
+	QSize sizeWin = size();
+	Vector center(sizeWin.width() / 2.0, sizeWin.height() / 2.0);
+	center = Painter::QtToCartesianCoords(center);
 
-//		if (needUpdate)
-//			update();
+	// This is not centering for some reason. Need to figure out why. :-/
+	if (event->delta() > 0)
+	{
+		Vector newOrigin = center - ((center - Painter::origin) / zoomFactor);
+		Painter::origin = newOrigin;
+		Painter::zoom *= zoomFactor;
 	}
+	else
+	{
+		Vector newOrigin = center + ((-center + Painter::origin) * zoomFactor);
+		Painter::origin = newOrigin;
+		Painter::zoom /= zoomFactor;
+	}
+
+//	Object::gridSpacing = gridPixels / Painter::zoom;
+//	UpdateGridBackground();
+	SetGridSize(Object::gridSpacing * Painter::zoom);
+	update();
+//	zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(Object::gridSpacing));
 }
 
 
-void DrawingView::keyReleaseEvent(QKeyEvent * event)
+void DrawingView::keyPressEvent(QKeyEvent * event)
 {
 	if (toolAction)
-	{
-		/*bool needUpdate =*/ toolAction->KeyReleased(event->key());
+		toolAction->KeyDown(event->key());
+}
 
-//		if (needUpdate)
-//			update();
-	}
+
+void DrawingView::keyReleaseEvent(QKeyEvent * event)
+{
+	if (toolAction)
+		toolAction->KeyReleased(event->key());
 }