X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fapplicationwindow.cpp;h=03f8cb5b167ef94c60c0c18d0b786032beb3e898;hb=2af76acd67a2703859c11446be3be4d3ff8ff4b4;hp=efd661c82d2f066a00d9ff12b1561a9d93b02e42;hpb=8ab4e08bd78cb5b07f069e3e6c5bf76944cb14fa;p=architektonas

diff --git a/src/applicationwindow.cpp b/src/applicationwindow.cpp
index efd661c..03f8cb5 100644
--- a/src/applicationwindow.cpp
+++ b/src/applicationwindow.cpp
@@ -290,9 +290,11 @@ when zooming in, new origin will be (xCenter - origin.x) / 2, (yCenter - origin.
 
 //printf("Zoom in... level going from %02f to ", Painter::zoom);
 	// 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 = 12.0 / Painter::zoom;
-	zoomIndicator->setText(QString("Grid: %2\" Zoom: %1%").arg(Painter::zoom * 100.0 * SCREEN_ZOOM).arg(drawing->gridSpacing));
+//	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));
 	drawing->UpdateGridBackground();
 	drawing->update();
 }
@@ -328,7 +330,8 @@ x 2 = (-426, -301)
 	// This just zooms leaving origin intact... should zoom out at the current center! [DONE]
 	Painter::zoom /= zoomFactor;
 	drawing->gridSpacing = 12.0 / Painter::zoom;
-	zoomIndicator->setText(QString("Grid: %2\" Zoom: %1%").arg(Painter::zoom * 100.0 * SCREEN_ZOOM).arg(drawing->gridSpacing));
+//	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));
 	drawing->UpdateGridBackground();
 	drawing->update();
 }
@@ -459,6 +462,13 @@ else
 }
 
 
+void ApplicationWindow::HandleGridSizeInPixels(int size)
+{
+	drawing->SetGridSize(size);
+	drawing->update();
+}
+
+
 void ApplicationWindow::CreateActions(void)
 {
 	exitAct = CreateAction(tr("&Quit"), tr("Quit"), tr("Exits the application."),
@@ -620,6 +630,8 @@ void ApplicationWindow::CreateToolbars(void)
 	toolbar->setObjectName("View");
 	toolbar->addAction(zoomInAct);
 	toolbar->addAction(zoomOutAct);
+	QSpinBox * spinbox = new QSpinBox;
+	toolbar->addWidget(spinbox);
 
 	toolbar = addToolBar(tr("Edit"));
 	toolbar->setObjectName("Edit");
@@ -635,6 +647,10 @@ void ApplicationWindow::CreateToolbars(void)
 	toolbar->addAction(addArcAct);
 	toolbar->addAction(addPolygonAct);
 	toolbar->addAction(addDimensionAct);
+
+	spinbox->setRange(4, 256);
+	spinbox->setValue(12);
+	connect(spinbox, SIGNAL(valueChanged(int)), this, SLOT(HandleGridSizeInPixels(int)));
 }
 
 
@@ -647,10 +663,6 @@ void ApplicationWindow::ReadSettings(void)
 	resize(size);
 	move(pos);
 	restoreState(settings.value("windowState").toByteArray());
-//	pos = settings.value("charWndPos", QPoint(0, 0)).toPoint();
-//	size = settings.value("charWndSize", QSize(200, 200)).toSize();
-//	((TTEdit *)qApp)->charWnd->resize(size);
-//	((TTEdit *)qApp)->charWnd->move(pos);
 }
 
 
@@ -661,7 +673,5 @@ void ApplicationWindow::WriteSettings(void)
 	settings.setValue("windowState", saveState());
 	settings.setValue("useAntialiasing", drawing->useAntialiasing);
 	settings.setValue("snapToGrid", snapToGridAct->isChecked());
-//	settings.setValue("charWndPos", ((TTEdit *)qApp)->charWnd->pos());
-//	settings.setValue("charWndSize", ((TTEdit *)qApp)->charWnd->size());
 }