X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fapplicationwindow.cpp;h=2049a097ca354b54e69297fcbc48d91753b7d528;hb=84afe881653a02a16b19d4da37435b8701b1a826;hp=445e546d01e36775abbcecb0c3170f0f988ce42b;hpb=a42277d4d950d32459b16b3ec8ee8287c9c0afab;p=architektonas

diff --git a/src/applicationwindow.cpp b/src/applicationwindow.cpp
index 445e546..2049a09 100644
--- a/src/applicationwindow.cpp
+++ b/src/applicationwindow.cpp
@@ -30,17 +30,25 @@
 
 #include "about.h"
 #include "blockwidget.h"
+//#include "dimension.h"
 #include "drawingview.h"
-#include "drawarcaction.h"
-#include "drawcircleaction.h"
-#include "drawdimensionaction.h"
-#include "drawlineaction.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 "global.h"
 #include "layerwidget.h"
-#include "mirroraction.h"
+//#include "line.h"
+//#include "mirroraction.h"
 #include "painter.h"
+//#include "rotateaction.h"
 #include "settingsdialog.h"
+//#include "triangulateaction.h"
+//#include "trimaction.h"
 
 
 // Class variables
@@ -82,13 +90,13 @@ ApplicationWindow::ApplicationWindow():
 	dock2->setObjectName("Blocks");
 
 	//	Create status bar
-	zoomIndicator = new QLabel("Grid: 12.0\" Zoom: 12.5%");
+	zoomIndicator = new QLabel("Grid: 12.0\" BU: Inch");
 	statusBar()->addPermanentWidget(zoomIndicator);
 	statusBar()->showMessage(tr("Ready"));
 
 	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)));
 }
@@ -105,7 +113,8 @@ void ApplicationWindow::closeEvent(QCloseEvent * event)
 void ApplicationWindow::FileNew(void)
 {
 	// Should warn the user if drawing hasn't been saved...
-	drawing->document.Clear();
+//	drawing->document.Clear();
+	drawing->document.objects.empty();
 	drawing->update();
 	documentName.clear();
 	setWindowTitle("Architektonas - Untitled");
@@ -117,7 +126,12 @@ void ApplicationWindow::FileOpen(void)
 {
 	QString filename = QFileDialog::getOpenFileName(this, tr("Open Drawing"),
 		"", tr("Architektonas files (*.drawing)"));
-	FILE * file = fopen(filename.toAscii().data(), "r");
+
+	// User cancelled open
+	if (filename.isEmpty())
+		return;
+
+	FILE * file = fopen(filename.toUtf8().data(), "r");
 
 	if (file == 0)
 	{
@@ -128,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);
 
@@ -156,7 +170,7 @@ void ApplicationWindow::FileSave(void)
 		documentName = QFileDialog::getSaveFileName(this, tr("Save Drawing"),
 			"", tr("Architektonas drawings (*.drawing)"));
 
-	FILE * file = fopen(documentName.toAscii().data(), "w");
+	FILE * file = fopen(documentName.toUtf8().data(), "w");
 
 	if (file == 0)
 	{
@@ -177,7 +191,8 @@ void ApplicationWindow::FileSave(void)
 		msg.setIcon(QMessageBox::Critical);
 		msg.exec();
 		// In this case, we should unlink the created file, since it's not right...
-		unlink(documentName.toAscii().data());
+//		unlink(documentName.toUtf8().data());
+		QFile::remove(documentName);
 		return;
 	}
 
@@ -201,19 +216,19 @@ 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();
 }
 
 
@@ -222,6 +237,7 @@ 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 0
 	if (drawing->document.ItemsSelected() > 0)
 	{
 		drawing->document.DeleteSelectedItems();
@@ -229,6 +245,7 @@ void ApplicationWindow::DeleteTool(void)
 		deleteAct->setChecked(false);
 		return;
 	}
+#endif
 
 	// Otherwise, toggle the state of the tool
 	ClearUIToolStatesExcept(deleteAct);
@@ -257,6 +274,20 @@ void ApplicationWindow::MirrorTool(void)
 }
 
 
+void ApplicationWindow::TrimTool(void)
+{
+	ClearUIToolStatesExcept(trimAct);
+	SetInternalToolStates();
+}
+
+
+void ApplicationWindow::TriangulateTool(void)
+{
+	ClearUIToolStatesExcept(triangulateAct);
+	SetInternalToolStates();
+}
+
+
 void ApplicationWindow::AddLineTool(void)
 {
 	ClearUIToolStatesExcept(addLineAct);
@@ -285,6 +316,13 @@ void ApplicationWindow::AddPolygonTool(void)
 }
 
 
+void ApplicationWindow::AddSplineTool(void)
+{
+	ClearUIToolStatesExcept(addSplineAct);
+	SetInternalToolStates();
+}
+
+
 void ApplicationWindow::ZoomInTool(void)
 {
 	double zoomFactor = 2.0;
@@ -306,24 +344,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]
-	// This should actually be calculated by drawing->gridPixels / grid size.
-	Painter::zoom *= zoomFactor;
-//	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(Object::gridSpacing));
+	// This just zooms leaving origin intact... should zoom in at the current
+	// center! [DONE]
+	Global::zoom *= zoomFactor;
+	Global::gridSpacing = drawing->gridPixels / Global::zoom;
 	drawing->UpdateGridBackground();
 	drawing->update();
 
-//	baseUnitInput->setText(QString("%1").arg(drawing->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));
 }
 
 
@@ -350,22 +384,19 @@ 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;
-//	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(Object::gridSpacing));
+	// This just zooms leaving origin intact... should zoom out at the current
+	// center! [DONE]
+	Global::zoom /= zoomFactor;
+	Global::gridSpacing = drawing->gridPixels / Global::zoom;
 	drawing->UpdateGridBackground();
 	drawing->update();
 
-//	baseUnitInput->setText(QString("%1").arg(drawing->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));
 }
 
 
@@ -386,6 +417,9 @@ void ApplicationWindow::ClearUIToolStatesExcept(QAction * exception)
 	if (exception != addPolygonAct)
 		addPolygonAct->setChecked(false);
 
+	if (exception != addSplineAct)
+		addSplineAct->setChecked(false);
+
 	if (exception != deleteAct)
 		deleteAct->setChecked(false);
 
@@ -394,38 +428,46 @@ void ApplicationWindow::ClearUIToolStatesExcept(QAction * exception)
 
 	if (exception != mirrorAct)
 		mirrorAct->setChecked(false);
+
+	if (exception != trimAct)
+		trimAct->setChecked(false);
+
+	if (exception != triangulateAct)
+		triangulateAct->setChecked(false);
 }
 
 
 void ApplicationWindow::SetInternalToolStates(void)
 {
-	Object::SetDeleteActive(deleteAct->isChecked());
-	Object::SetDimensionActive(addDimensionAct->isChecked());
-	drawing->SetRotateToolActive(rotateAct->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;
+		Global::ignoreClicks = false;
 	}
 
-#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);
+	drawing->SetToolActive(addSplineAct->isChecked() ? new DrawSplineAction() : NULL);
 	drawing->SetToolActive(mirrorAct->isChecked() ? new MirrorAction() : NULL);
+	drawing->SetToolActive(rotateAct->isChecked() ? new RotateAction() : NULL);
+	drawing->SetToolActive(trimAct->isChecked() ? new TrimAction() : NULL);
+	drawing->SetToolActive(triangulateAct->isChecked() ? new TriangulateAction() : NULL);
+
+	if (drawing->toolAction)
+		Global::ignoreClicks = true;
 #endif
 
-	update();
+	drawing->update();
 }
 
 
@@ -455,6 +497,7 @@ void ApplicationWindow::Settings(void)
 //
 void ApplicationWindow::HandleGrouping(void)
 {
+#if 0
 	int itemsSelected = drawing->document.ItemsSelected();
 
 	// If nothing selected, do nothing
@@ -503,11 +546,86 @@ else
 		container->state = OSSelected;
 		statusBar()->showMessage(QString(tr("Grouped %1 objects.")).arg(itemsSelected));
 	}
+#endif
 
 	drawing->update();
 }
 
 
+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();
+
+	// If nothing selected, do nothing
+	if (itemsSelected == 0)
+	{
+		statusBar()->showMessage(tr("No objects selected to connect."));
+		return;
+	}
+
+	// If one thing selected, do nothing
+	if (itemsSelected == 1)
+	{
+		statusBar()->showMessage(tr("Nothing to connect object to."));
+		return;
+	}
+
+	// This is O(n^2 / 2) :-P
+	for(int i=0; i<itemsSelected; i++)
+	{
+		Object * obj1 = drawing->document.SelectedItem(i);
+
+		for(int j=i+1; j<itemsSelected; j++)
+		{
+			Object * obj2 = drawing->document.SelectedItem(j);
+			double t, u, v, w;
+
+//			if ((obj1->type != OTLine) || (obj2->type != OTLine))
+//				continue;
+
+			if ((obj1->type == OTLine) && (obj2->type == OTLine))
+			{
+//printf("Testing objects for intersection (%X, %X)...\n", obj1, obj2);
+				int intersects = Geometry::Intersects((Line *)obj1, (Line *)obj2, &t, &u);
+//printf("  (%s) --> t=%lf, u=%lf\n", (intersects ? "true" : "FALSE"), t, u);
+
+				if (intersects)
+				{
+	//printf("Connecting objects (%X, %X)...\n", obj1, obj2);
+					obj1->Connect(obj2, u);
+					obj2->Connect(obj1, t);
+				}
+			}
+			else if (((obj1->type == OTLine) && (obj2->type == OTDimension))
+				|| ((obj2->type == OTLine) && (obj1->type == OTDimension)))
+			{
+printf("Testing Line<->Dimension intersection...\n");
+				Line * line = (Line *)(obj1->type == OTLine ? obj1 : obj2);
+				Dimension * dim = (Dimension *)(obj1->type == OTDimension ? obj1 : obj2);
+
+				int intersects = Geometry::Intersects(line, dim, &t, &u);
+printf("   -> intersects = %i, t=%lf, u=%lf\n", intersects, t, u);
+
+				if (intersects)
+				{
+					obj1->Connect(obj2, u);
+					obj2->Connect(obj1, t);
+				}
+			}
+		}
+	}
+#endif
+}
+
+
+void ApplicationWindow::HandleDisconnection(void)
+{
+}
+
+
 void ApplicationWindow::HandleGridSizeInPixels(int size)
 {
 	drawing->SetGridSize(size);
@@ -527,8 +645,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();
 }
@@ -544,10 +662,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();
 }
 
@@ -587,6 +702,9 @@ void ApplicationWindow::CreateActions(void)
 	addPolygonAct = CreateAction(tr("Add &Polygon"), tr("Add Polygon"), tr("Add polygons to the drawing."), QIcon(":/res/add-polygon-tool.png"), QKeySequence("A,P"), true);
 	connect(addPolygonAct, SIGNAL(triggered()), this, SLOT(AddPolygonTool()));
 
+	addSplineAct = CreateAction(tr("Add &Spline"), tr("Add Spline"), tr("Add a NURB spline to the drawing."), QIcon(":/res/add-spline-tool.png"), QKeySequence("A,S"), true);
+	connect(addSplineAct, SIGNAL(triggered()), this, SLOT(AddSplineTool()));
+
 	aboutAct = CreateAction(tr("About &Architektonas"), tr("About Architektonas"), tr("Gives information about this program."), QIcon(":/res/generic-tool.png"), QKeySequence());
 	connect(aboutAct, SIGNAL(triggered()), this, SLOT(HelpAbout()));
 
@@ -620,12 +738,20 @@ void ApplicationWindow::CreateActions(void)
 	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"));
+	connect(connectAct, SIGNAL(triggered()), this, SLOT(HandleConnection()));
 
 	disconnectAct = CreateAction(tr("&Disconnect"), tr("Disconnect"), tr("Disconnect objects joined at point."), QIcon(":/res/disconnect-tool.png"), QKeySequence("d,d"));
+	connect(disconnectAct, SIGNAL(triggered()), this, SLOT(HandleDisconnection()));
 
 	mirrorAct = CreateAction(tr("&Mirror"), tr("Mirror"), tr("Mirror selected objects around a line."), QIcon(":/res/mirror-tool.png"), QKeySequence("m,i"), true);
 	connect(mirrorAct, SIGNAL(triggered()), this, SLOT(MirrorTool()));
 
+	trimAct = CreateAction(tr("&Trim"), tr("Trim"), tr("Trim extraneous lines from selected objects."), QIcon(":/res/trim-tool.png"), QKeySequence("t,r"), true);
+	connect(trimAct, SIGNAL(triggered()), this, SLOT(TrimTool()));
+
+	triangulateAct = CreateAction(tr("&Triangulate"), tr("Triangulate"), tr("Make triangles from selected lines, preserving their lengths."), QIcon(":/res/triangulate-tool.png"), QKeySequence("t,g"), true);
+	connect(triangulateAct, SIGNAL(triggered()), this, SLOT(TriangulateTool()));
+
 
 //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.
@@ -696,6 +822,8 @@ void ApplicationWindow::CreateMenus(void)
 	menu->addAction(fixLengthAct);
 	menu->addAction(rotateAct);
 	menu->addAction(mirrorAct);
+	menu->addAction(trimAct);
+	menu->addAction(triangulateAct);
 	menu->addAction(connectAct);
 	menu->addAction(disconnectAct);
 	menu->addSeparator();
@@ -705,6 +833,7 @@ void ApplicationWindow::CreateMenus(void)
 	menu->addAction(addCircleAct);
 	menu->addAction(addArcAct);
 	menu->addAction(addPolygonAct);
+	menu->addAction(addSplineAct);
 	menu->addAction(addDimensionAct);
 	menu->addSeparator();
 	menu->addAction(settingsAct);
@@ -744,6 +873,8 @@ void ApplicationWindow::CreateToolbars(void)
 	toolbar->addAction(fixLengthAct);
 	toolbar->addAction(rotateAct);
 	toolbar->addAction(mirrorAct);
+	toolbar->addAction(trimAct);
+	toolbar->addAction(triangulateAct);
 	toolbar->addAction(deleteAct);
 	toolbar->addAction(connectAct);
 	toolbar->addAction(disconnectAct);
@@ -752,6 +883,7 @@ void ApplicationWindow::CreateToolbars(void)
 	toolbar->addAction(addCircleAct);
 	toolbar->addAction(addArcAct);
 	toolbar->addAction(addPolygonAct);
+	toolbar->addAction(addSplineAct);
 	toolbar->addAction(addDimensionAct);
 
 	spinbox->setRange(4, 256);