X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fapplicationwindow.cpp;h=f9362ca5967071d34a0202608d9759249c32b759;hb=e8987f4028a1f9c0eeb33a45bd11b2e409b9c2c5;hp=c51000044ba82085b214772d0c2740d521b5349d;hpb=eb711912d64f17cf9c18c74c4d78d9867bd066ad;p=architektonas

diff --git a/src/applicationwindow.cpp b/src/applicationwindow.cpp
index c510000..f9362ca 100644
--- a/src/applicationwindow.cpp
+++ b/src/applicationwindow.cpp
@@ -299,13 +299,16 @@ when zooming in, new origin will be (xCenter - origin.x) / 2, (yCenter - origin.
 	// This just zooms leaving origin intact... should zoom in at the current center! [DONE]
 	// This should actually be calculated by drawing->gridPixels / grid size.
 	Painter::zoom *= zoomFactor;
-	drawing->gridSpacing = drawing->gridPixels / Painter::zoom;
+//	drawing->gridSpacing = drawing->gridPixels / Painter::zoom;
+	Object::gridSpacing = drawing->gridPixels / Painter::zoom;
 //	zoomIndicator->setText(QString("Grid: %2\" Zoom: %1%").arg(Painter::zoom * 100.0 * SCREEN_ZOOM).arg(drawing->gridSpacing));
-	zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(drawing->gridSpacing));
+//	zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(drawing->gridSpacing));
+	zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(Object::gridSpacing));
 	drawing->UpdateGridBackground();
 	drawing->update();
 
-	baseUnitInput->setText(QString("%1").arg(drawing->gridSpacing));
+//	baseUnitInput->setText(QString("%1").arg(drawing->gridSpacing));
+	baseUnitInput->setText(QString("%1").arg(Object::gridSpacing));
 }
 
 
@@ -338,13 +341,16 @@ x 2 = (-426, -301)
 //printf("Zoom out...\n");
 	// This just zooms leaving origin intact... should zoom out at the current center! [DONE]
 	Painter::zoom /= zoomFactor;
-	drawing->gridSpacing = drawing->gridPixels / Painter::zoom;
+//	drawing->gridSpacing = drawing->gridPixels / Painter::zoom;
+	Object::gridSpacing = drawing->gridPixels / Painter::zoom;
 //	zoomIndicator->setText(QString("Grid: %2\" Zoom: %1%").arg(Painter::zoom * 100.0 * SCREEN_ZOOM).arg(drawing->gridSpacing));
-	zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(drawing->gridSpacing));
+//	zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(drawing->gridSpacing));
+	zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(Object::gridSpacing));
 	drawing->UpdateGridBackground();
 	drawing->update();
 
-	baseUnitInput->setText(QString("%1").arg(drawing->gridSpacing));
+//	baseUnitInput->setText(QString("%1").arg(drawing->gridSpacing));
+	baseUnitInput->setText(QString("%1").arg(Object::gridSpacing));
 }
 
 
@@ -500,8 +506,10 @@ void ApplicationWindow::HandleGridSizeInBaseUnits(QString text)
 	if (!ok || value == 0)
 		return;
 
-	drawing->gridSpacing = value;
-	Painter::zoom = drawing->gridPixels / drawing->gridSpacing;
+//	drawing->gridSpacing = value;
+//	Painter::zoom = drawing->gridPixels / drawing->gridSpacing;
+	Object::gridSpacing = value;
+	Painter::zoom = drawing->gridPixels / Object::gridSpacing;
 	drawing->UpdateGridBackground();
 	drawing->update();
 }