X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fapplicationwindow.cpp;h=effcc1eb59904eefedb95ec5a66f019ea0e8a9e8;hb=9590e4ed45fd4e05eccc16bd8e9d51596aea5a6d;hp=cb4f020f5e9ab531217feeef9f62bdd7d076d453;hpb=c58b8a9f8b1ae5494857fc423ed8e33b2bbcf329;p=architektonas

diff --git a/src/applicationwindow.cpp b/src/applicationwindow.cpp
index cb4f020..effcc1e 100644
--- a/src/applicationwindow.cpp
+++ b/src/applicationwindow.cpp
@@ -30,6 +30,7 @@
 
 #include "about.h"
 #include "blockwidget.h"
+#include "dimension.h"
 #include "drawingview.h"
 #include "drawarcaction.h"
 #include "drawcircleaction.h"
@@ -37,7 +38,9 @@
 #include "drawlineaction.h"
 #include "fileio.h"
 #include "generaltab.h"
+#include "geometry.h"
 #include "layerwidget.h"
+#include "line.h"
 #include "mirroraction.h"
 #include "painter.h"
 #include "rotateaction.h"
@@ -500,6 +503,78 @@ else
 }
 
 
+void ApplicationWindow::HandleConnection(void)
+{
+//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);
+				}
+			}
+		}
+	}
+}
+
+
+void ApplicationWindow::HandleDisconnection(void)
+{
+}
+
+
 void ApplicationWindow::HandleGridSizeInPixels(int size)
 {
 	drawing->SetGridSize(size);
@@ -612,8 +687,10 @@ 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()));