X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.cpp;h=07d7d9fa0265a67073769ab880e0af5712bd388a;hb=fd5a80446b2abfdfb9d8951fcc03fb1b55ad707c;hp=9341a76279044ef78c64e3d21a39f95d85cda41c;hpb=c58b8a9f8b1ae5494857fc423ed8e33b2bbcf329;p=architektonas diff --git a/src/drawingview.cpp b/src/drawingview.cpp index 9341a76..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; @@ -470,10 +471,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 +489,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)); }