X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fapplicationwindow.cpp;h=4c765cbc4e4e507b2248124b4be7ecf456e52ac4;hb=eb39f1bb5e6518c5dc4f4dbd3c88912a97192e95;hp=7dd57aca22824c70f77ff62cb782808e47814569;hpb=790c1a6d97f73f7457c7fad7e82fa29e5b6accd5;p=architektonas diff --git a/src/applicationwindow.cpp b/src/applicationwindow.cpp index 7dd57ac..4c765cb 100644 --- a/src/applicationwindow.cpp +++ b/src/applicationwindow.cpp @@ -28,6 +28,7 @@ #include "applicationwindow.h" +#include #include "about.h" #include "blockwidget.h" #include "drawingview.h" @@ -42,11 +43,9 @@ #include "structs.h" #include "utils.h" - // Class variables DrawingView * ApplicationWindow::drawing; - ApplicationWindow::ApplicationWindow(): baseUnitInput(new QLineEdit), dimensionSizeInput(new QLineEdit), @@ -87,7 +86,7 @@ ApplicationWindow::ApplicationWindow(): dock3->setObjectName("Object"); // Create status bar - zoomIndicator = new QLabel("Grid: 12.0\" BU: Inch"); + zoomIndicator = new QLabel("Zoom: 100% Grid: 12.0\" BU: Inch"); statusBar()->addPermanentWidget(zoomIndicator); statusBar()->showMessage(tr("Ready")); @@ -101,9 +100,9 @@ ApplicationWindow::ApplicationWindow(): connect(this, SIGNAL(ReloadLayers()), lw, SLOT(Reload())); connect(drawing, SIGNAL(ObjectHovered(Object *)), ow, SLOT(ShowInfo(Object *))); + connect(drawing, SIGNAL(NeedZoomUpdate()), this, SLOT(UpdateZoom())); } - void ApplicationWindow::closeEvent(QCloseEvent * event) { WriteSettings(); @@ -111,7 +110,6 @@ void ApplicationWindow::closeEvent(QCloseEvent * event) //Do we have a memory leak here if we don't delete the font in the Object??? } - void ApplicationWindow::FileNew(void) { // Warn the user if drawing has changed and hasn't been saved... @@ -152,7 +150,6 @@ void ApplicationWindow::FileNew(void) statusBar()->showMessage(tr("New drawing is ready.")); } - void ApplicationWindow::FileOpen(void) { QString filename = QFileDialog::getOpenFileName(this, tr("Open Drawing"), @@ -203,7 +200,6 @@ void ApplicationWindow::FileOpen(void) statusBar()->showMessage(tr("Drawing loaded.")); } - void ApplicationWindow::FileSave(void) { if (documentName.isEmpty()) @@ -242,7 +238,6 @@ void ApplicationWindow::FileSave(void) statusBar()->showMessage(tr("Drawing saved.")); } - void ApplicationWindow::FileSaveAs(void) { QString filename = QFileDialog::getSaveFileName(this, tr("Save Drawing As"), @@ -255,6 +250,27 @@ void ApplicationWindow::FileSaveAs(void) } } +void ApplicationWindow::PrintPreview(void) +{ + QPrintPreviewDialog * dlg = new QPrintPreviewDialog(this); + + connect(dlg, SIGNAL(paintRequested(QPrinter *)), this, SLOT(HandlePrintRequest(QPrinter *))); + + dlg->exec(); +} + +void ApplicationWindow::HandlePrintRequest(QPrinter * printer) +{ + QPainter qtPainter(printer); + Painter painter(&qtPainter); + + // Do object rendering... + for(int i=0; iRenderObjects(&painter, drawing->document.objects, i); + } +} void ApplicationWindow::contextMenuEvent(QContextMenuEvent * event) { @@ -265,25 +281,21 @@ void ApplicationWindow::contextMenuEvent(QContextMenuEvent * event) menu.exec(event->globalPos()); } - void ApplicationWindow::SnapToGridTool(void) { Global::snapToGrid = snapToGridAct->isChecked(); } - void ApplicationWindow::FixAngle(void) { Global::fixedAngle = fixAngleAct->isChecked(); } - void ApplicationWindow::FixLength(void) { Global::fixedLength = fixLengthAct->isChecked(); } - void ApplicationWindow::DeleteTool(void) { // For this tool, we check first to see if anything is selected. If so, we @@ -302,14 +314,12 @@ void ApplicationWindow::DeleteTool(void) SetInternalToolStates(); } - void ApplicationWindow::DimensionTool(void) { ClearUIToolStatesExcept(addDimensionAct); SetInternalToolStates(); } - void ApplicationWindow::RotateTool(void) { ClearUIToolStatesExcept(rotateAct); @@ -321,7 +331,6 @@ void ApplicationWindow::RotateTool(void) SetInternalToolStates(); } - void ApplicationWindow::MirrorTool(void) { ClearUIToolStatesExcept(mirrorAct); @@ -333,138 +342,118 @@ void ApplicationWindow::MirrorTool(void) SetInternalToolStates(); } - void ApplicationWindow::TrimTool(void) { ClearUIToolStatesExcept(trimAct); SetInternalToolStates(); } - void ApplicationWindow::TriangulateTool(void) { ClearUIToolStatesExcept(triangulateAct); SetInternalToolStates(); } - void ApplicationWindow::AddLineTool(void) { ClearUIToolStatesExcept(addLineAct); SetInternalToolStates(); } - void ApplicationWindow::AddCircleTool(void) { ClearUIToolStatesExcept(addCircleAct); SetInternalToolStates(); } - void ApplicationWindow::AddArcTool(void) { ClearUIToolStatesExcept(addArcAct); SetInternalToolStates(); } - void ApplicationWindow::AddPolygonTool(void) { ClearUIToolStatesExcept(addPolygonAct); SetInternalToolStates(); } - void ApplicationWindow::AddSplineTool(void) { ClearUIToolStatesExcept(addSplineAct); SetInternalToolStates(); } - void ApplicationWindow::ZoomInTool(void) { - double zoomFactor = 2.0; -/* -We need to find the center of the screen, then figure out where the new corner -will be in the zoomed in window. - -So we know in Qt coords, the center is found via: -size.width() / 2 --> xCenter -size.height() / 2 --> yCenter - -transform x/yCenter to Cartesian coordinates. So far, so good. - -when zooming in, new origin will be (xCenter - origin.x) / 2, (yCenter - origin.y) / 2 -(after subtracting from center, that is...) -*/ + double zoomFactor = 1.20; QSize size = drawing->size(); - Vector center(size.width() / 2.0, size.height() / 2.0); -//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 - Global::origin) / zoomFactor); -//printf("newOrigin=%.2f,%.2f;\n", newOrigin.x, newOrigin.y); - 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] + Vector center = Painter::QtToCartesianCoords(Vector(size.width() / 2.0, size.height() / 2.0)); + + Global::origin = center - ((center - Global::origin) / zoomFactor); Global::zoom *= zoomFactor; - Global::gridSpacing = drawing->gridPixels / Global::zoom; - drawing->UpdateGridBackground(); - drawing->update(); - zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(Global::gridSpacing)); - baseUnitInput->setText(QString("%1").arg(Global::gridSpacing)); + UpdateZoom(); } - void ApplicationWindow::ZoomOutTool(void) { -/* -Ok, real example. -center = (436, 311) -origin = (223, 160.5) -newOrigin should be (-10, -10) -Why isn't it? - -center - origin = (213, 150.5) -origin - center = (-213, -150.5) -x 2 = (-426, -301) -+ center = (-10, -10) - -*/ - double zoomFactor = 2.0; + double zoomFactor = 1.20; QSize size = drawing->size(); - Vector center(size.width() / 2.0, size.height() / 2.0); -//printf("Zoom out... 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 - Painter::origin) * zoomFactor; -// Vector newOrigin = center - (Painter::origin * zoomFactor); - Vector newOrigin = center + ((Global::origin - center) * zoomFactor); -//printf("newOrigin=%.2f,%.2f;\n", newOrigin.x, newOrigin.y); - Global::origin = newOrigin; -//printf("Zoom out...\n"); - // This just zooms leaving origin intact... should zoom out at the current - // center! [DONE] + Vector center = Painter::QtToCartesianCoords(Vector(size.width() / 2.0, size.height() / 2.0)); + + Global::origin = center + ((Global::origin - center) * zoomFactor); Global::zoom /= zoomFactor; - Global::gridSpacing = drawing->gridPixels / Global::zoom; - drawing->UpdateGridBackground(); + + UpdateZoom(); +} + +void ApplicationWindow::UpdateZoom(void) +{ + // And now, a bunch of heuristics to select the right grid size--autogrid! + // :-P + if (Global::zoom < 0.25) + Global::gridSpacing = 48.0; + else if (Global::zoom >= 0.25 && Global::zoom < 0.50) + Global::gridSpacing = 36.0; + else if (Global::zoom >= 0.50 && Global::zoom < 1.00) + Global::gridSpacing = 24.0; + else if (Global::zoom >= 1.00 && Global::zoom < 2.00) + Global::gridSpacing = 12.0; + else if (Global::zoom >= 2.00 && Global::zoom < 4.00) + Global::gridSpacing = 6.0; + else if (Global::zoom >= 4.00 && Global::zoom < 8.00) + Global::gridSpacing = 3.0; + else if (Global::zoom >= 8.00 && Global::zoom < 16.00) + Global::gridSpacing = 1.0; + else if (Global::zoom >= 16.00 && Global::zoom < 32.00) + Global::gridSpacing = 0.5; + else if (Global::zoom >= 32.00 && Global::zoom < 64.00) + Global::gridSpacing = 0.25; + else if (Global::zoom >= 64.00 && Global::zoom < 128.00) + Global::gridSpacing = 0.125; + else if (Global::zoom >= 128.00 && Global::zoom < 256.00) + Global::gridSpacing = 0.0625; + else if (Global::zoom >= 256.00 && Global::zoom < 512.00) + Global::gridSpacing = 0.03125; + else + Global::gridSpacing = 0.015625; + +// drawing->SetGridSize((double)(Global::gridSpacing * Global::zoom)); drawing->update(); - zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(Global::gridSpacing)); - baseUnitInput->setText(QString("%1").arg(Global::gridSpacing)); -} + zoomIndicator->setText(QString("Zoom: %1% Grid: %2\" BU: Inch").arg(Global::zoom * 100.0).arg(Global::gridSpacing)); + // This is the problem... Changing this causes the state to update itself again, screwing up the origin... !!! FIX !!! (commented out for now) +// baseUnitInput->setText(QString("%1").arg(Global::gridSpacing)); +} void ApplicationWindow::ClearUIToolStatesExcept(QAction * exception) { QAction * actionList[] = { addArcAct, addLineAct, addCircleAct, addDimensionAct, addPolygonAct, - addSplineAct, deleteAct, rotateAct, mirrorAct, trimAct, triangulateAct, 0 + addSplineAct, deleteAct, rotateAct, mirrorAct, trimAct, + triangulateAct, 0 }; for(int i=0; actionList[i]!=0; i++) @@ -474,7 +463,6 @@ void ApplicationWindow::ClearUIToolStatesExcept(QAction * exception) } } - void ApplicationWindow::SetInternalToolStates(void) { // We can be sure that if we've come here, then either an active tool is @@ -510,13 +498,11 @@ void ApplicationWindow::SetInternalToolStates(void) drawing->update(); } - void ApplicationWindow::HelpAbout(void) { aboutWin->show(); } - void ApplicationWindow::Settings(void) { SettingsDialog dlg(this); @@ -530,64 +516,12 @@ void ApplicationWindow::Settings(void) WriteSettings(); } - // // Group a bunch of selected objects (which can include other groups) together // or ungroup a selected group. // void ApplicationWindow::HandleGrouping(void) { -#if 0 - int itemsSelected = drawing->document.ItemsSelected(); - - // If nothing selected, do nothing - if (itemsSelected == 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 (itemsSelected == 1) - { - Object * object = drawing->document.SelectedItem(0); - -#if 0 -if (object == NULL) - printf("SelectedItem = NULL!\n"); -else - printf("SelectedItem = %08X, type = %i\n", object, object->type); -#endif - - if (object == NULL || object->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); - statusBar()->showMessage(tr("Objects ungrouped.")); - } - // Otherwise, if it's a group of 2 or more objects (which can be groups too) - // group them and select the group - else if (itemsSelected > 1) - { - Container * container = new Container(Vector(), &(drawing->document)); - drawing->document.MoveSelectedContentsTo(container); - drawing->document.Add(container); - container->DeselectAll(); - container->state = OSSelected; - statusBar()->showMessage(QString(tr("Grouped %1 objects.")).arg(itemsSelected)); - } -#else int numSelected = drawing->select.size(); // If nothing selected, do nothing @@ -614,13 +548,8 @@ else // 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(); @@ -633,20 +562,12 @@ else // 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; + c->layer = Global::activeLayer; Rect r = drawing->GetObjectExtents((Object *)c); c->p[0] = r.TopLeft(); @@ -657,12 +578,10 @@ else statusBar()->showMessage(QString(tr("Grouped %1 objects.")).arg(numSelected)); //printf("Group: document size = %li\n", drawing->document.objects.size()); } -#endif drawing->update(); } - void ApplicationWindow::HandleConnection(void) { #if 0 @@ -732,19 +651,16 @@ printf(" -> intersects = %i, t=%lf, u=%lf\n", intersects, t, u); #endif } - void ApplicationWindow::HandleDisconnection(void) { } - -void ApplicationWindow::HandleGridSizeInPixels(int size) +void ApplicationWindow::HandleGridSizeInPixels(int /*size*/) { - drawing->SetGridSize(size); +// drawing->SetGridSize((uint32_t)size); drawing->update(); } - void ApplicationWindow::HandleGridSizeInBaseUnits(QString text) { // Parse the text... @@ -759,15 +675,14 @@ void ApplicationWindow::HandleGridSizeInBaseUnits(QString text) // Painter::zoom = drawing->gridPixels / drawing->gridSpacing; Global::gridSpacing = value; Global::zoom = drawing->gridPixels / Global::gridSpacing; - drawing->UpdateGridBackground(); +// drawing->UpdateGridBackground(); drawing->update(); } - void ApplicationWindow::HandleDimensionSize(QString text) { /* -This is the third input on the view toolbar; not sure what it was supposed to do... +This is the third input on the view toolbar; not sure what it was supposed to do... (resize all dimensions in the drawing?) */ // Parse the text... bool ok; @@ -786,34 +701,42 @@ void ApplicationWindow::EditCopy(void) if (drawing->select.size() > 0) { DeleteContents(clipboard); - CopySelectedObjectsTo(clipboard, drawing->document.objects); + clipboard = CopySelectedObjects(drawing->document.objects); } } - void ApplicationWindow::EditCut(void) { if (drawing->select.size() > 0) { DeleteContents(clipboard); - MoveSelectedObjectsTo(clipboard, drawing->document.objects); + clipboard = MoveSelectedObjectsFrom(drawing->document.objects); drawing->update(); } } - void ApplicationWindow::EditPaste(void) { if (clipboard.size() > 0) { // We want to maybe make it so that the pasted objects are being moved in a "mouse drag" state... - // This only moves the cut/copied from the clipboard to the drawing. -// AddObjectsTo(drawing->document.objects, clipboard); - CopyObjects(clipboard, drawing->document.objects); + ClearSelected(drawing->document.objects); + SelectAll(clipboard); + drawing->document.Add(CopyObjects(clipboard)); drawing->update(); } } +// +// Select all *visible* objects. If an object is on a layer that is not +// visible, skip it. +// +void ApplicationWindow::SelectAllObjects(void) +{ + // Set object's state & update the drawing + SelectAll(drawing->document.objects); + drawing->update(); +} void ApplicationWindow::CreateActions(void) { @@ -909,6 +832,12 @@ void ApplicationWindow::CreateActions(void) editPasteAct = CreateAction(tr("&Paste Objects"), tr("Paste Objects"), tr("Paste objects from the clipboard to the drawing."), QIcon(":/res/editpaste2.png"), QKeySequence(tr("Ctrl+v"))); connect(editPasteAct, SIGNAL(triggered()), this, SLOT(EditPaste())); + selectAllAct = CreateAction(tr("Select &All"), tr("Select All Objects"), tr("Select all objects in the drawing."), QIcon(), QKeySequence(tr("Ctrl+a"))); + connect(selectAllAct, SIGNAL(triggered()), this, SLOT(SelectAllObjects())); + + printPreviewAct = CreateAction(tr("&Print Preview"), tr("Print Preview"), tr("Shows preview of printing operation."), QIcon(":/res/print-preview.png"), QKeySequence(tr("Ctrl+p"))); + connect(printPreviewAct, SIGNAL(triggered()), this, SLOT(PrintPreview())); + //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. /* QActionGroup * group = new QActionGroup(this); @@ -919,7 +848,6 @@ void ApplicationWindow::CreateActions(void) group->addAction(addArcAct);//*/ } - // // Consolidates action creation from a multi-step process to a single-step one. // @@ -935,7 +863,6 @@ QAction * ApplicationWindow::CreateAction(QString name, QString tooltip, return action; } - // // This is essentially the same as the previous function, but this allows more // than one key sequence to be added as key shortcuts. @@ -956,7 +883,6 @@ QAction * ApplicationWindow::CreateAction(QString name, QString tooltip, return action; } - void ApplicationWindow::CreateMenus(void) { QMenu * menu = menuBar()->addMenu(tr("&File")); @@ -966,6 +892,8 @@ void ApplicationWindow::CreateMenus(void) menu->addAction(fileSaveAsAct); menu->addAction(fileCloseAct); menu->addSeparator(); + menu->addAction(printPreviewAct); + menu->addSeparator(); menu->addAction(exitAct); menu = menuBar()->addMenu(tr("&View")); @@ -984,6 +912,7 @@ void ApplicationWindow::CreateMenus(void) menu->addAction(connectAct); menu->addAction(disconnectAct); menu->addSeparator(); + menu->addAction(selectAllAct); menu->addAction(editCutAct); menu->addAction(editCopyAct); menu->addAction(editPasteAct); @@ -1002,7 +931,6 @@ void ApplicationWindow::CreateMenus(void) menu->addAction(aboutAct); } - void ApplicationWindow::CreateToolbars(void) { QToolBar * toolbar = addToolBar(tr("File")); @@ -1064,9 +992,11 @@ void ApplicationWindow::CreateToolbars(void) connect(pw, SIGNAL(WidthSelected(float)), drawing, SLOT(HandlePenWidth(float))); connect(pw, SIGNAL(StyleSelected(int)), drawing, SLOT(HandlePenStyle(int))); connect(pw, SIGNAL(ColorSelected(uint32_t)), drawing, SLOT(HandlePenColor(uint32_t))); +// connect(pw, SIGNAL(StampSelected(void)), drawing, SLOT(HandlePenStamp(QAction *))); + connect(pw->tbStamp, SIGNAL(triggered(QAction *)), drawing, SLOT(HandlePenStamp(QAction *))); + connect(pw->tbDropper, SIGNAL(triggered(QAction *)), drawing, SLOT(HandlePenDropper(QAction *))); } - void ApplicationWindow::ReadSettings(void) { QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint(); @@ -1078,7 +1008,6 @@ void ApplicationWindow::ReadSettings(void) restoreState(settings.value("windowState").toByteArray()); } - void ApplicationWindow::WriteSettings(void) { settings.setValue("pos", pos()); @@ -1087,4 +1016,3 @@ void ApplicationWindow::WriteSettings(void) settings.setValue("useAntialiasing", drawing->useAntialiasing); settings.setValue("snapToGrid", snapToGridAct->isChecked()); } -