X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fapplicationwindow.cpp;h=2049a097ca354b54e69297fcbc48d91753b7d528;hb=84afe881653a02a16b19d4da37435b8701b1a826;hp=06ec68ce89a6ad4857843b53f53fc13e53320a8b;hpb=db0a3d91f37031e155cc8eac7cfdec9889f233ee;p=architektonas

diff --git a/src/applicationwindow.cpp b/src/applicationwindow.cpp
index 06ec68c..2049a09 100644
--- a/src/applicationwindow.cpp
+++ b/src/applicationwindow.cpp
@@ -344,15 +344,15 @@ when zooming in, new origin will be (xCenter - origin.x) / 2, (yCenter - origin.
 //printf("Zoom in... Center=%.2f,%.2f; ", center.x, center.y);
 	center = Painter::QtToCartesianCoords(center);
 //printf("(%.2f,%.2f); origin=%.2f,%.2f; ", center.x, center.y, Painter::origin.x, Painter::origin.y);
-	Vector newOrigin = center - ((center - Painter::origin) / zoomFactor);
+	Vector newOrigin = center - ((center - Global::origin) / zoomFactor);
 //printf("newOrigin=%.2f,%.2f;\n", newOrigin.x, newOrigin.y);
-	Painter::origin = newOrigin;
+	Global::origin = newOrigin;
 
 //printf("Zoom in... level going from %02f to ", Painter::zoom);
 	// This just zooms leaving origin intact... should zoom in at the current
 	// center! [DONE]
-	Painter::zoom *= zoomFactor;
-	Global::gridSpacing = drawing->gridPixels / Painter::zoom;
+	Global::zoom *= zoomFactor;
+	Global::gridSpacing = drawing->gridPixels / Global::zoom;
 	drawing->UpdateGridBackground();
 	drawing->update();
 
@@ -384,14 +384,14 @@ x 2 = (-426, -301)
 //printf("(%.2f,%.2f); origin=%.2f,%.2f; ", center.x, center.y, Painter::origin.x, Painter::origin.y);
 //	Vector newOrigin = (center - Painter::origin) * zoomFactor;
 //	Vector newOrigin = center - (Painter::origin * zoomFactor);
-	Vector newOrigin = center + ((Painter::origin - center) * zoomFactor);
+	Vector newOrigin = center + ((Global::origin - center) * zoomFactor);
 //printf("newOrigin=%.2f,%.2f;\n", newOrigin.x, newOrigin.y);
-	Painter::origin = newOrigin;
+	Global::origin = newOrigin;
 //printf("Zoom out...\n");
 	// This just zooms leaving origin intact... should zoom out at the current
 	// center! [DONE]
-	Painter::zoom /= zoomFactor;
-	Global::gridSpacing = drawing->gridPixels / Painter::zoom;
+	Global::zoom /= zoomFactor;
+	Global::gridSpacing = drawing->gridPixels / Global::zoom;
 	drawing->UpdateGridBackground();
 	drawing->update();
 
@@ -646,7 +646,7 @@ void ApplicationWindow::HandleGridSizeInBaseUnits(QString text)
 //	drawing->gridSpacing = value;
 //	Painter::zoom = drawing->gridPixels / drawing->gridSpacing;
 	Global::gridSpacing = value;
-	Painter::zoom = drawing->gridPixels / Global::gridSpacing;
+	Global::zoom = drawing->gridPixels / Global::gridSpacing;
 	drawing->UpdateGridBackground();
 	drawing->update();
 }