X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fapplicationwindow.cpp;h=5093fb6c3b5334e475064af01dd8584a1fbbb7d4;hb=86ad64f2288cf50ae9832116ef37c433556355c4;hp=f5013ad8ae940bf714003b4d4e8e1d7f699bde5b;hpb=4bc000ba003a53fb11428a2eb71e3b4471a15c7a;p=architektonas diff --git a/src/applicationwindow.cpp b/src/applicationwindow.cpp index f5013ad..5093fb6 100644 --- a/src/applicationwindow.cpp +++ b/src/applicationwindow.cpp @@ -8,7 +8,7 @@ // JLH = James Hammons // // Who When What -// --- ---------- ------------------------------------------------------------- +// --- ---------- ------------------------------------------------------------ // JLH 03/22/2011 Created this file // JLH 09/29/2011 Added simple zoom in/out functionality // JLH 10/03/2011 Fixed zoom tool to zoom in/out from center of screen @@ -30,26 +30,16 @@ #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 "drawsplineaction.h" #include "fileio.h" #include "generaltab.h" -//#include "geometry.h" #include "global.h" #include "layerwidget.h" -//#include "line.h" -//#include "mirroraction.h" +#include "objectwidget.h" #include "painter.h" -//#include "rotateaction.h" #include "settingsdialog.h" #include "structs.h" -//#include "triangulateaction.h" -//#include "trimaction.h" +#include "utils.h" // Class variables @@ -86,11 +76,16 @@ ApplicationWindow::ApplicationWindow(): BlockWidget * bw = new BlockWidget; dock2->setWidget(bw); addDockWidget(Qt::RightDockWidgetArea, dock2); + QDockWidget * dock3 = new QDockWidget(tr("Object"), this); + ObjectWidget * ow = new ObjectWidget; + dock3->setWidget(ow); + addDockWidget(Qt::RightDockWidgetArea, dock3); // Needed for saveState() dock1->setObjectName("Layers"); dock2->setObjectName("Blocks"); + dock3->setObjectName("Object"); - // Create status bar + // Create status bar zoomIndicator = new QLabel("Grid: 12.0\" BU: Inch"); statusBar()->addPermanentWidget(zoomIndicator); statusBar()->showMessage(tr("Ready")); @@ -99,7 +94,11 @@ ApplicationWindow::ApplicationWindow(): setUnifiedTitleAndToolBarOnMac(true); Global::font = new QFont("Verdana", 15, QFont::Bold); - connect(lw, SIGNAL(LayerSelected(int)), drawing, SLOT(SetCurrentLayer(int))); + connect(lw, SIGNAL(LayerDeleted(int)), drawing, SLOT(DeleteCurrentLayer(int))); + connect(lw, SIGNAL(LayerToggled()), drawing, SLOT(HandleLayerToggle())); + connect(lw, SIGNAL(LayersSwapped(int, int)), drawing, SLOT(HandleLayerSwap(int, int))); + + connect(drawing, SIGNAL(ObjectHovered(Object *)), ow, SLOT(ShowInfo(Object *))); } @@ -113,8 +112,9 @@ void ApplicationWindow::closeEvent(QCloseEvent * event) void ApplicationWindow::FileNew(void) { - // Should warn the user if drawing hasn't been saved... - drawing->document.objects.empty(); + // Should warn the user if drawing hasn't been saved... !!! FIX !!! + DeleteContents(drawing->document.objects); + drawing->document.objects.clear(); drawing->update(); documentName.clear(); setWindowTitle("Architektonas - Untitled"); @@ -142,7 +142,7 @@ void ApplicationWindow::FileOpen(void) return; } - Container container;//(Vector(0, 0)); + Container container(true); // Make sure it's a top level container... bool successful = FileIO::LoadAtnsFile(file, &container); fclose(file); @@ -152,10 +152,16 @@ void ApplicationWindow::FileOpen(void) msg.setText(QString(tr("Could not load file \"%1\"!")).arg(filename)); msg.setIcon(QMessageBox::Critical); msg.exec(); + // Make sure to delete any hanging objects in the container... + DeleteContents(container.objects); return; } -printf("FileOpen: container size = %li\n", container.objects.size()); +//printf("FileOpen: container size = %li\n", container.objects.size()); + // Keep memory leaks from happening by getting rid of the old document + DeleteContents(drawing->document.objects); + // We can do this because the vector is just a bunch of pointers to our + // Objects, and the Containers (non-empty) can be moved way with no problem. drawing->document = container; drawing->update(); documentName = filename; @@ -190,7 +196,8 @@ void ApplicationWindow::FileSave(void) msg.setText(QString(tr("Could not save file \"%1\"!")).arg(documentName)); msg.setIcon(QMessageBox::Critical); msg.exec(); - // In this case, we should unlink the created file, since it's not right... + // In this case, we should unlink the created file, since it's not + // right... // unlink(documentName.toUtf8().data()); QFile::remove(documentName); return; @@ -236,9 +243,10 @@ 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->numSelected > 0) +// if (drawing->numSelected > 0) + if (drawing->select.size() > 0) { - drawing->DeleteSelectedItems(); + DeleteSelectedObjects(drawing->document.objects); drawing->update(); deleteAct->setChecked(false); return; @@ -260,6 +268,11 @@ void ApplicationWindow::DimensionTool(void) void ApplicationWindow::RotateTool(void) { ClearUIToolStatesExcept(rotateAct); + + // Do tear-down if Rotate tool has been turned off + if (!rotateAct->isChecked()) + drawing->RotateHandler(ToolCleanup, Point(0, 0)); + SetInternalToolStates(); } @@ -267,6 +280,11 @@ void ApplicationWindow::RotateTool(void) void ApplicationWindow::MirrorTool(void) { ClearUIToolStatesExcept(mirrorAct); + + // Do tear-down if Rotate tool has been turned off + if (!mirrorAct->isChecked()) + drawing->MirrorHandler(ToolCleanup, Point(0, 0)); + SetInternalToolStates(); } @@ -414,33 +432,11 @@ void ApplicationWindow::ClearUIToolStatesExcept(QAction * exception) void ApplicationWindow::SetInternalToolStates(void) { -// 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; - } + Global::toolState = TSNone; - 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; -#else if (addLineAct->isChecked()) Global::tool = TTLine; else if (addCircleAct->isChecked()) @@ -465,7 +461,6 @@ void ApplicationWindow::SetInternalToolStates(void) Global::tool = TTTriangulate; else Global::tool = TTNone; -#endif drawing->update(); } @@ -528,8 +523,9 @@ else // Need the parent of the group, we're assuming here that the parent is // the drawing's document. Does it matter? Maybe... - // Could just stipulate that grouping like this only takes place where the - // parent of the group is the drawing's document. Makes life much simpler. + // Could just stipulate that grouping like this only takes place where + // the parent of the group is the drawing's document. Makes life much + // simpler. ((Container *)object)->SelectAll(); ((Container *)object)->MoveContentsTo(&(drawing->document)); drawing->document.Delete(object); @@ -547,6 +543,70 @@ else statusBar()->showMessage(QString(tr("Grouped %1 objects.")).arg(itemsSelected)); } #else + int numSelected = drawing->select.size(); + + // If nothing selected, do nothing + if (numSelected == 0) + { + statusBar()->showMessage(tr("No objects selected to make a group from.")); + return; + } + + // If it's a group that's selected, ungroup it and leave the objects in a + // selected state + if (numSelected == 1) + { + Object * obj = (Object *)drawing->select[0]; + + if (obj->type != OTContainer) + { + statusBar()->showMessage(tr("A group requires two or more selected objects.")); + return; + } + + // Need the parent of the group, we're assuming here that the parent is + // the drawing's document. Does it matter? Maybe... + // Could just stipulate that grouping like this only takes place where + // the parent of the group is the drawing's document. Makes life much + // simpler. +// ((Container *)object)->SelectAll(); +// ((Container *)object)->MoveContentsTo(&(drawing->document)); +// drawing->document.Delete(object); + Container * c = (Container *)obj; +//printf("Ungroup: container size = %li\n", c->objects.size()); + SelectAll(c->objects); +//printf("Ungroup: document size = %li (pre-AddObjectsTo)\n", drawing->document.objects.size()); + RemoveSelectedObjects(drawing->document.objects); + AddObjectsTo(drawing->document.objects, c->objects); + drawing->select.clear(); + AddObjectsTo(drawing->select, c->objects); + delete c; + statusBar()->showMessage(tr("Objects ungrouped.")); +//printf("Ungroup: document size = %li\n", drawing->document.objects.size()); + } + // Otherwise, if it's a group of 2 or more objects (which can be groups too) + // group them and select the group + else if (numSelected > 1) + { +// Container * container = new Container(Vector(), &(drawing->document)); +// drawing->document.MoveSelectedContentsTo(container); +// drawing->document.Add(container); +// container->DeselectAll(); +// container->state = OSSelected; + + Container * c = new Container(); +// AddObjectsTo(c->objects, drawing->select); +// RemoveSelectedObjects(drawing->document.objects); + MoveSelectedObjectsTo(c->objects, drawing->document.objects); + drawing->document.objects.push_back(c); + ClearSelected(c->objects); + c->selected = true; + c->layer = Global::currentLayer; + drawing->select.clear(); + drawing->select.push_back(c); + statusBar()->showMessage(QString(tr("Grouped %1 objects.")).arg(numSelected)); +//printf("Group: document size = %li\n", drawing->document.objects.size()); + } #endif drawing->update();