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

diff --git a/src/applicationwindow.cpp b/src/applicationwindow.cpp
index bf181a8..f9362ca 100644
--- a/src/applicationwindow.cpp
+++ b/src/applicationwindow.cpp
@@ -31,6 +31,10 @@
 #include "about.h"
 #include "blockwidget.h"
 #include "drawingview.h"
+#include "drawarcaction.h"
+#include "drawcircleaction.h"
+#include "drawdimensionaction.h"
+#include "drawlineaction.h"
 #include "fileio.h"
 #include "generaltab.h"
 #include "layerwidget.h"
@@ -295,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));
 }
 
 
@@ -334,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));
 }
 
 
@@ -384,9 +394,19 @@ void ApplicationWindow::SetInternalToolStates(void)
 		drawing->toolAction = NULL;
 	}
 
+#if 0
 	drawing->SetAddLineToolActive(addLineAct->isChecked());
 	drawing->SetAddCircleToolActive(addCircleAct->isChecked());
+	drawing->SetAddArcToolActive(addArcAct->isChecked());
 	drawing->SetAddDimensionToolActive(addDimensionAct->isChecked());
+#else
+	drawing->SetToolActive(addLineAct->isChecked() ? new DrawLineAction() : NULL);
+	drawing->SetToolActive(addCircleAct->isChecked() ? new DrawCircleAction() : NULL);
+	drawing->SetToolActive(addArcAct->isChecked() ? new DrawArcAction() : NULL);
+	drawing->SetToolActive(addDimensionAct->isChecked() ? new DrawDimensionAction() : NULL);
+#endif
+
+	update();
 }
 
 
@@ -486,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();
 }
@@ -578,6 +600,10 @@ void ApplicationWindow::CreateActions(void)
 	groupAct = CreateAction(tr("&Group"), tr("Group"), tr("Group/ungroup selected objects."), QIcon(":/res/group-tool.png"), QKeySequence("g"));
 	connect(groupAct, SIGNAL(triggered()), this, SLOT(HandleGrouping()));
 
+	connectAct = CreateAction(tr("&Connect"), tr("Connect"), tr("Connect objects at point."), QIcon(":/res/connect-tool.png"), QKeySequence("c,c"));
+
+	disconnectAct = CreateAction(tr("&Disconnect"), tr("Disconnect"), tr("Disconnect objects joined at point."), QIcon(":/res/disconnect-tool.png"), QKeySequence("d,d"));
+
 //Hm. I think we'll have to have separate logic to do the "Radio Group Toolbar" thing...
 // Yup, in order to turn them off, we'd have to have an "OFF" toolbar button. Ick.
 /*	QActionGroup * group = new QActionGroup(this);
@@ -646,6 +672,8 @@ void ApplicationWindow::CreateMenus(void)
 	menu->addAction(fixAngleAct);
 	menu->addAction(fixLengthAct);
 	menu->addAction(rotateAct);
+	menu->addAction(connectAct);
+	menu->addAction(disconnectAct);
 	menu->addSeparator();
 	menu->addAction(deleteAct);
 	menu->addSeparator();
@@ -687,6 +715,8 @@ void ApplicationWindow::CreateToolbars(void)
 	toolbar->addAction(fixLengthAct);
 	toolbar->addAction(rotateAct);
 	toolbar->addAction(deleteAct);
+	toolbar->addAction(connectAct);
+	toolbar->addAction(disconnectAct);
 	toolbar->addSeparator();
 	toolbar->addAction(addLineAct);
 	toolbar->addAction(addCircleAct);