X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fapplicationwindow.cpp;h=f5013ad8ae940bf714003b4d4e8e1d7f699bde5b;hb=4bc000ba003a53fb11428a2eb71e3b4471a15c7a;hp=f2dc923b5c2313b852ee56109efe0cc9434d8e33;hpb=6c1279871f6bb86bc59e2561b6a7f74ab081f71e;p=architektonas

diff --git a/src/applicationwindow.cpp b/src/applicationwindow.cpp
index f2dc923..f5013ad 100644
--- a/src/applicationwindow.cpp
+++ b/src/applicationwindow.cpp
@@ -30,24 +30,26 @@
 
 #include "about.h"
 #include "blockwidget.h"
-#include "dimension.h"
+//#include "dimension.h"
 #include "drawingview.h"
-#include "drawarcaction.h"
-#include "drawcircleaction.h"
-#include "drawdimensionaction.h"
-#include "drawlineaction.h"
-#include "drawsplineaction.h"
+//#include "drawarcaction.h"
+//#include "drawcircleaction.h"
+//#include "drawdimensionaction.h"
+//#include "drawlineaction.h"
+//#include "drawsplineaction.h"
 #include "fileio.h"
 #include "generaltab.h"
-#include "geometry.h"
+//#include "geometry.h"
+#include "global.h"
 #include "layerwidget.h"
-#include "line.h"
-#include "mirroraction.h"
+//#include "line.h"
+//#include "mirroraction.h"
 #include "painter.h"
-#include "rotateaction.h"
+//#include "rotateaction.h"
 #include "settingsdialog.h"
-#include "triangulateaction.h"
-#include "trimaction.h"
+#include "structs.h"
+//#include "triangulateaction.h"
+//#include "trimaction.h"
 
 
 // Class variables
@@ -95,7 +97,7 @@ ApplicationWindow::ApplicationWindow():
 
 	ReadSettings();
 	setUnifiedTitleAndToolBarOnMac(true);
-	Object::SetFont(new QFont("Verdana", 15, QFont::Bold));
+	Global::font =  new QFont("Verdana", 15, QFont::Bold);
 
 	connect(lw, SIGNAL(LayerSelected(int)), drawing, SLOT(SetCurrentLayer(int)));
 }
@@ -104,7 +106,7 @@ ApplicationWindow::ApplicationWindow():
 void ApplicationWindow::closeEvent(QCloseEvent * event)
 {
 	WriteSettings();
-	event->accept();							// Use ignore() if can't close for some reason
+	event->accept();		// Use ignore() if can't close for some reason
 	//Do we have a memory leak here if we don't delete the font in the Object???
 }
 
@@ -112,7 +114,7 @@ void ApplicationWindow::closeEvent(QCloseEvent * event)
 void ApplicationWindow::FileNew(void)
 {
 	// Should warn the user if drawing hasn't been saved...
-	drawing->document.Clear();
+	drawing->document.objects.empty();
 	drawing->update();
 	documentName.clear();
 	setWindowTitle("Architektonas - Untitled");
@@ -140,7 +142,7 @@ void ApplicationWindow::FileOpen(void)
 		return;
 	}
 
-	Container container(Vector(0, 0));
+	Container container;//(Vector(0, 0));
 	bool successful = FileIO::LoadAtnsFile(file, &container);
 	fclose(file);
 
@@ -214,30 +216,29 @@ void ApplicationWindow::FileSaveAs(void)
 
 void ApplicationWindow::SnapToGridTool(void)
 {
-	Object::SetSnapMode(snapToGridAct->isChecked());
+	Global::snapToGrid = snapToGridAct->isChecked();
 }
 
 
 void ApplicationWindow::FixAngle(void)
 {
-	Object::SetFixedAngle(fixAngleAct->isChecked());
+	Global::fixedAngle = fixAngleAct->isChecked();
 }
 
 
 void ApplicationWindow::FixLength(void)
 {
-	Object::SetFixedLength(fixLengthAct->isChecked());
+	Global::fixedLength = fixLengthAct->isChecked();
 }
 
 
-// We want certain tools to be exclusive, and this approach isn't working correctly...
 void ApplicationWindow::DeleteTool(void)
 {
 	// For this tool, we check first to see if anything is selected. If so, we
 	// delete those and *don't* select the delete tool.
-	if (drawing->document.ItemsSelected() > 0)
+	if (drawing->numSelected > 0)
 	{
-		drawing->document.DeleteSelectedItems();
+		drawing->DeleteSelectedItems();
 		drawing->update();
 		deleteAct->setChecked(false);
 		return;
@@ -340,20 +341,20 @@ 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;
-	Object::gridSpacing = drawing->gridPixels / Painter::zoom;
+	Global::zoom *= zoomFactor;
+	Global::gridSpacing = drawing->gridPixels / Global::zoom;
 	drawing->UpdateGridBackground();
 	drawing->update();
 
-	zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(Object::gridSpacing));
-	baseUnitInput->setText(QString("%1").arg(Object::gridSpacing));
+	zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(Global::gridSpacing));
+	baseUnitInput->setText(QString("%1").arg(Global::gridSpacing));
 }
 
 
@@ -380,72 +381,51 @@ 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;
-	Object::gridSpacing = drawing->gridPixels / Painter::zoom;
+	Global::zoom /= zoomFactor;
+	Global::gridSpacing = drawing->gridPixels / Global::zoom;
 	drawing->UpdateGridBackground();
 	drawing->update();
 
-	zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(Object::gridSpacing));
-	baseUnitInput->setText(QString("%1").arg(Object::gridSpacing));
+	zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(Global::gridSpacing));
+	baseUnitInput->setText(QString("%1").arg(Global::gridSpacing));
 }
 
 
 void ApplicationWindow::ClearUIToolStatesExcept(QAction * exception)
 {
-	if (exception != addArcAct)
-		addArcAct->setChecked(false);
+	QAction * actionList[] = {
+		addArcAct, addLineAct, addCircleAct, addDimensionAct, addPolygonAct,
+		addSplineAct, deleteAct, rotateAct, mirrorAct, trimAct, triangulateAct, 0
+	};
 
-	if (exception != addCircleAct)
-		addCircleAct->setChecked(false);
-
-	if (exception != addDimensionAct)
-		addDimensionAct->setChecked(false);
-
-	if (exception != addLineAct)
-		addLineAct->setChecked(false);
-
-	if (exception != addPolygonAct)
-		addPolygonAct->setChecked(false);
-
-	if (exception != addSplineAct)
-		addSplineAct->setChecked(false);
-
-	if (exception != deleteAct)
-		deleteAct->setChecked(false);
-
-	if (exception != rotateAct)
-		rotateAct->setChecked(false);
-
-	if (exception != mirrorAct)
-		mirrorAct->setChecked(false);
-
-	if (exception != trimAct)
-		trimAct->setChecked(false);
-
-	if (exception != triangulateAct)
-		triangulateAct->setChecked(false);
+	for(int i=0; actionList[i]!=0; i++)
+	{
+		if (actionList[i] != exception)
+			actionList[i]->setChecked(false);
+	}
 }
 
 
 void ApplicationWindow::SetInternalToolStates(void)
 {
-	Object::SetDeleteActive(deleteAct->isChecked());
-	Object::SetDimensionActive(addDimensionAct->isChecked());
+//	Global::deleteActive = deleteAct->isChecked();
+//	Global::dimensionActive = addDimensionAct->isChecked();
 
 	// We can be sure that if we've come here, then either an active tool is
 	// being deactivated, or a new tool is being created. In either case, the
 	// old tool needs to be deleted.
+#if 0
 	if (drawing->toolAction)
 	{
 		delete drawing->toolAction;
 		drawing->toolAction = NULL;
-		Object::ignoreClicks = false;
+		Global::ignoreClicks = false;
 	}
 
 	drawing->SetToolActive(addLineAct->isChecked() ? new DrawLineAction() : NULL);
@@ -459,7 +439,33 @@ void ApplicationWindow::SetInternalToolStates(void)
 	drawing->SetToolActive(triangulateAct->isChecked() ? new TriangulateAction() : NULL);
 
 	if (drawing->toolAction)
-		Object::ignoreClicks = true;
+		Global::ignoreClicks = true;
+#else
+	if (addLineAct->isChecked())
+		Global::tool = TTLine;
+	else if (addCircleAct->isChecked())
+		Global::tool = TTCircle;
+	else if (addArcAct->isChecked())
+		Global::tool = TTArc;
+	else if (addDimensionAct->isChecked())
+		Global::tool = TTDimension;
+	else if (addSplineAct->isChecked())
+		Global::tool = TTSpline;
+	else if (addPolygonAct->isChecked())
+		Global::tool = TTPolygon;
+	else if (deleteAct->isChecked())
+		Global::tool = TTDelete;
+	else if (mirrorAct->isChecked())
+		Global::tool = TTMirror;
+	else if (rotateAct->isChecked())
+		Global::tool = TTRotate;
+	else if (trimAct->isChecked())
+		Global::tool = TTTrim;
+	else if (triangulateAct->isChecked())
+		Global::tool = TTTriangulate;
+	else
+		Global::tool = TTNone;
+#endif
 
 	drawing->update();
 }
@@ -491,6 +497,7 @@ void ApplicationWindow::Settings(void)
 //
 void ApplicationWindow::HandleGrouping(void)
 {
+#if 0
 	int itemsSelected = drawing->document.ItemsSelected();
 
 	// If nothing selected, do nothing
@@ -539,6 +546,8 @@ else
 		container->state = OSSelected;
 		statusBar()->showMessage(QString(tr("Grouped %1 objects.")).arg(itemsSelected));
 	}
+#else
+#endif
 
 	drawing->update();
 }
@@ -546,6 +555,7 @@ else
 
 void ApplicationWindow::HandleConnection(void)
 {
+#if 0
 //double tt = Geometry::ParameterOfLineAndPoint(Vector(0, 0), Vector(10, 0), Vector(8, 2));
 //printf("Parameter of point @ (8,2) of line (0,0), (10,0): %lf\n", tt);
 	int itemsSelected = drawing->document.ItemsSelected();
@@ -608,6 +618,8 @@ printf("   -> intersects = %i, t=%lf, u=%lf\n", intersects, t, u);
 			}
 		}
 	}
+#else
+#endif
 }
 
 
@@ -635,8 +647,8 @@ void ApplicationWindow::HandleGridSizeInBaseUnits(QString text)
 
 //	drawing->gridSpacing = value;
 //	Painter::zoom = drawing->gridPixels / drawing->gridSpacing;
-	Object::gridSpacing = value;
-	Painter::zoom = drawing->gridPixels / Object::gridSpacing;
+	Global::gridSpacing = value;
+	Global::zoom = drawing->gridPixels / Global::gridSpacing;
 	drawing->UpdateGridBackground();
 	drawing->update();
 }
@@ -652,10 +664,7 @@ void ApplicationWindow::HandleDimensionSize(QString text)
 	if (!ok || value == 0)
 		return;
 
-	drawing->document.ResizeAllDimensions(value);
-//	drawing->gridSpacing = value;
-//	Painter::zoom = drawing->gridPixels / drawing->gridSpacing;
-//	drawing->UpdateGridBackground();
+//	drawing->document.ResizeAllDimensions(value);
 	drawing->update();
 }