X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fapplicationwindow.cpp;h=773146fa63348865180b5159d56e0e785231313f;hb=9bf789d643e1885fee526a1d4d1e2648f02bbd86;hp=9064595a5f5feba189e0139ba5e8c18026b9a92e;hpb=e34f829de8f46c03e74f75e46438433153f6b96d;p=architektonas

diff --git a/src/applicationwindow.cpp b/src/applicationwindow.cpp
index 9064595..773146f 100644
--- a/src/applicationwindow.cpp
+++ b/src/applicationwindow.cpp
@@ -87,7 +87,7 @@ ApplicationWindow::ApplicationWindow():
 	dock3->setObjectName("Object");
 
 	// Create status bar
-	zoomIndicator = new QLabel("Grid: 12.0\" BU: Inch");
+	zoomIndicator = new QLabel("Zoom: 100% Grid: 12.0\" BU: Inch");
 	statusBar()->addPermanentWidget(zoomIndicator);
 	statusBar()->showMessage(tr("Ready"));
 
@@ -101,6 +101,7 @@ ApplicationWindow::ApplicationWindow():
 	connect(this, SIGNAL(ReloadLayers()), lw, SLOT(Reload()));
 
 	connect(drawing, SIGNAL(ObjectHovered(Object *)), ow, SLOT(ShowInfo(Object *)));
+	connect(drawing, SIGNAL(NeedZoomUpdate()), this, SLOT(UpdateZoom()));
 }
 
 
@@ -385,78 +386,68 @@ void ApplicationWindow::AddSplineTool(void)
 
 void ApplicationWindow::ZoomInTool(void)
 {
-	double zoomFactor = 2.0;
-/*
-We need to find the center of the screen, then figure out where the new corner
-will be in the zoomed in window.
-
-So we know in Qt coords, the center is found via:
-size.width()  / 2 --> xCenter
-size.height() / 2 --> yCenter
-
-transform x/yCenter to Cartesian coordinates. So far, so good.
-
-when zooming in, new origin will be (xCenter - origin.x) / 2, (yCenter - origin.y) / 2
-(after subtracting from center, that is...)
-*/
+	double zoomFactor = 1.20;
 	QSize size = drawing->size();
-	Vector center(size.width() / 2.0, size.height() / 2.0);
-//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 - Global::origin) / zoomFactor);
-//printf("newOrigin=%.2f,%.2f;\n", newOrigin.x, newOrigin.y);
-	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]
+	Vector center = Painter::QtToCartesianCoords(Vector(size.width() / 2.0, size.height() / 2.0));
+
+	Global::origin = center - ((center - Global::origin) / zoomFactor);
 	Global::zoom *= zoomFactor;
-	Global::gridSpacing = drawing->gridPixels / Global::zoom;
-	drawing->UpdateGridBackground();
-	drawing->update();
 
-	zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(Global::gridSpacing));
-	baseUnitInput->setText(QString("%1").arg(Global::gridSpacing));
+	UpdateZoom();
 }
 
 
 void ApplicationWindow::ZoomOutTool(void)
 {
-/*
-Ok, real example.
-center = (436, 311)
-origin = (223, 160.5)
-newOrigin should be (-10, -10)
-Why isn't it?
-
-center - origin = (213, 150.5)
-origin - center = (-213, -150.5)
-x 2 = (-426, -301)
-+ center = (-10, -10)
-
-*/
-	double zoomFactor = 2.0;
+	double zoomFactor = 1.20;
 	QSize size = drawing->size();
-	Vector center(size.width() / 2.0, size.height() / 2.0);
-//printf("Zoom out... 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 - Painter::origin) * zoomFactor;
-//	Vector newOrigin = center - (Painter::origin * zoomFactor);
-	Vector newOrigin = center + ((Global::origin - center) * zoomFactor);
-//printf("newOrigin=%.2f,%.2f;\n", newOrigin.x, newOrigin.y);
-	Global::origin = newOrigin;
-//printf("Zoom out...\n");
-	// This just zooms leaving origin intact... should zoom out at the current
-	// center! [DONE]
+	Vector center = Painter::QtToCartesianCoords(Vector(size.width() / 2.0, size.height() / 2.0));
+
+	Global::origin = center + ((Global::origin - center) * zoomFactor);
 	Global::zoom /= zoomFactor;
-	Global::gridSpacing = drawing->gridPixels / Global::zoom;
-	drawing->UpdateGridBackground();
+
+	UpdateZoom();
+}
+
+
+void ApplicationWindow::UpdateZoom(void)
+{
+	// And now, a bunch of heuristics to select the right grid size--autogrid!
+	// :-P
+	if (Global::zoom < 0.25)
+		Global::gridSpacing = 48.0;
+	else if (Global::zoom >= 0.25 && Global::zoom < 0.50)
+		Global::gridSpacing = 36.0;
+	else if (Global::zoom >= 0.50 && Global::zoom < 1.00)
+		Global::gridSpacing = 24.0;
+	else if (Global::zoom >= 1.00 && Global::zoom < 2.00)
+		Global::gridSpacing = 12.0;
+	else if (Global::zoom >= 2.00 && Global::zoom < 4.00)
+		Global::gridSpacing = 6.0;
+	else if (Global::zoom >= 4.00 && Global::zoom < 8.00)
+		Global::gridSpacing = 3.0;
+	else if (Global::zoom >= 8.00 && Global::zoom < 16.00)
+		Global::gridSpacing = 1.0;
+	else if (Global::zoom >= 16.00 && Global::zoom < 32.00)
+		Global::gridSpacing = 0.5;
+	else if (Global::zoom >= 32.00 && Global::zoom < 64.00)
+		Global::gridSpacing = 0.25;
+	else if (Global::zoom >= 64.00 && Global::zoom < 128.00)
+		Global::gridSpacing = 0.125;
+	else if (Global::zoom >= 128.00 && Global::zoom < 256.00)
+		Global::gridSpacing = 0.0625;
+	else if (Global::zoom >= 256.00 && Global::zoom < 512.00)
+		Global::gridSpacing = 0.03125;
+	else
+		Global::gridSpacing = 0.015625;
+
+	drawing->SetGridSize((double)(Global::gridSpacing * Global::zoom));
 	drawing->update();
 
-	zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(Global::gridSpacing));
-	baseUnitInput->setText(QString("%1").arg(Global::gridSpacing));
+	zoomIndicator->setText(QString("Zoom: %1% Grid: %2\" BU: Inch").arg(Global::zoom * 100.0).arg(Global::gridSpacing));
+
+	// This is the problem...  Changing this causes the state to update itself again, screwing up the origin...  !!! FIX !!! (commented out for now)
+//	baseUnitInput->setText(QString("%1").arg(Global::gridSpacing));
 }
 
 
@@ -464,7 +455,8 @@ void ApplicationWindow::ClearUIToolStatesExcept(QAction * exception)
 {
 	QAction * actionList[] = {
 		addArcAct, addLineAct, addCircleAct, addDimensionAct, addPolygonAct,
-		addSplineAct, deleteAct, rotateAct, mirrorAct, trimAct, triangulateAct, 0
+		addSplineAct, deleteAct, rotateAct, mirrorAct, trimAct,
+		triangulateAct, 0
 	};
 
 	for(int i=0; actionList[i]!=0; i++)
@@ -675,7 +667,7 @@ void ApplicationWindow::HandleDisconnection(void)
 
 void ApplicationWindow::HandleGridSizeInPixels(int size)
 {
-	drawing->SetGridSize(size);
+	drawing->SetGridSize((uint32_t)size);
 	drawing->update();
 }