Added preliminary (i.e., non-functional) trim tool. Also:

[architektonas] / src / applicationwindow.cpp

diff --git a/src/applicationwindow.cpp b/src/applicationwindow.cpp
index 23629bca9976e3ef78a5780e5b45d4da6169bada..4f1be35d14a453acfdf3d6b082cf6b0360873d65 100644 (file)
--- 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"
@@ -39,10 +40,12 @@
 #include "generaltab.h"
 #include "geometry.h"
 #include "layerwidget.h"
+#include "line.h"
 #include "mirroraction.h"
 #include "painter.h"
 #include "rotateaction.h"
 #include "settingsdialog.h"
+#include "trimaction.h"
 
 
 // Class variables
@@ -84,7 +87,7 @@ 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"));
 
@@ -119,6 +122,11 @@ void ApplicationWindow::FileOpen(void)
 {
        QString filename = QFileDialog::getOpenFileName(this, tr("Open Drawing"),
                "", tr("Architektonas files (*.drawing)"));
+
+       // User cancelled open
+       if (filename.isEmpty())
+               return;
+
        FILE * file = fopen(filename.toAscii().data(), "r");
 
        if (file == 0)
@@ -260,6 +268,13 @@ void ApplicationWindow::MirrorTool(void)
 }
 
 
+void ApplicationWindow::TrimTool(void)
+{
+       ClearUIToolStatesExcept(trimAct);
+       SetInternalToolStates();
+}
+
+
 void ApplicationWindow::AddLineTool(void)
 {
        ClearUIToolStatesExcept(addLineAct);
@@ -390,6 +405,9 @@ void ApplicationWindow::ClearUIToolStatesExcept(QAction * exception)
 
        if (exception != mirrorAct)
                mirrorAct->setChecked(false);
+
+       if (exception != trimAct)
+               trimAct->setChecked(false);
 }
 
 
@@ -414,6 +432,7 @@ void ApplicationWindow::SetInternalToolStates(void)
        drawing->SetToolActive(addDimensionAct->isChecked() ? new DrawDimensionAction() : NULL);
        drawing->SetToolActive(mirrorAct->isChecked() ? new MirrorAction() : NULL);
        drawing->SetToolActive(rotateAct->isChecked() ? new RotateAction() : NULL);
+       drawing->SetToolActive(trimAct->isChecked() ? new TrimAction() : NULL);
 
        if (drawing->toolAction)
                Object::ignoreClicks = true;
@@ -529,20 +548,39 @@ void ApplicationWindow::HandleConnection(void)
                for(int j=i+1; j<itemsSelected; j++)
                {
                        Object * obj2 = drawing->document.SelectedItem(j);
-                       double t, u;
+                       double t, u, v, w;
 
-                       if ((obj1->type != OTLine) || (obj2->type != OTLine))
-                               continue;
+//                     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);
+                               int intersects = Geometry::Intersects((Line *)obj1, (Line *)obj2, &t, &u);
 //printf("  (%s) --> t=%lf, u=%lf\n", (intersects ? "true" : "FALSE"), t, u);
 
-                       if (intersects)
+                               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("Connecting objects (%X, %X)...\n", obj1, obj2);
-                               obj1->Connect(obj2, u);
-                               obj2->Connect(obj1, t);
+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);
+                               }
                        }
                }
        }
@@ -674,6 +712,9 @@ void ApplicationWindow::CreateActions(void)
        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()));
+
 
 //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.
@@ -744,6 +785,7 @@ void ApplicationWindow::CreateMenus(void)
        menu->addAction(fixLengthAct);
        menu->addAction(rotateAct);
        menu->addAction(mirrorAct);
+       menu->addAction(trimAct);
        menu->addAction(connectAct);
        menu->addAction(disconnectAct);
        menu->addSeparator();
@@ -792,6 +834,7 @@ void ApplicationWindow::CreateToolbars(void)
        toolbar->addAction(fixLengthAct);
        toolbar->addAction(rotateAct);
        toolbar->addAction(mirrorAct);
+       toolbar->addAction(trimAct);
        toolbar->addAction(deleteAct);
        toolbar->addAction(connectAct);
        toolbar->addAction(disconnectAct);