X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fapplicationwindow.cpp;h=c580cde948ab4b37535ec2b5f395600fe83cbb0d;hb=6441dd1283d8a16b9a3a02df407f20434fa9dfa1;hp=f658a9b1d69aaa5da0c30faf0a25027b41dcce6a;hpb=f19a3a172c425b7fcc5a648a94870f0247c6be89;p=architektonas diff --git a/src/applicationwindow.cpp b/src/applicationwindow.cpp index f658a9b..c580cde 100644 --- a/src/applicationwindow.cpp +++ b/src/applicationwindow.cpp @@ -5,11 +5,13 @@ // (C) 2011 Underground Software // See the README and GPLv3 files for licensing and warranty information // -// JLH = James L. Hammons +// 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 // // FIXED: @@ -101,21 +103,84 @@ void ApplicationWindow::RotateTool(void) drawing->SetRotateToolActive(rotateAct->isChecked()); } +void ApplicationWindow::AddLineTool(void) +{ + addCircleAct->setChecked(false); + addArcAct->setChecked(false); + rotateAct->setChecked(false); + RotateTool(); + drawing->SetAddLineToolActive(addLineAct->isChecked()); +} + +void ApplicationWindow::AddCircleTool(void) +{ + addLineAct->setChecked(false); + addArcAct->setChecked(false); + rotateAct->setChecked(false); + RotateTool(); + drawing->SetAddCircleToolActive(addCircleAct->isChecked()); +} + 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...) +*/ + 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 - Painter::origin) / zoomFactor); +//printf("newOrigin=%.2f,%.2f;\n", newOrigin.x, newOrigin.y); + Painter::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! -// drawing->ZoomIn(); - Painter::zoom *= 2.0; + // This just zooms leaving origin intact... should zoom in at the current center! [DONE] + Painter::zoom *= zoomFactor; drawing->update(); } 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; + 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 + ((Painter::origin - center) * zoomFactor); +//printf("newOrigin=%.2f,%.2f;\n", newOrigin.x, newOrigin.y); + Painter::origin = newOrigin; //printf("Zoom out...\n"); - // This just zooms leaving origin intact... should zoom out at the current center! -// drawing->ZoomOut(); - Painter::zoom /= 2.0; + // This just zooms leaving origin intact... should zoom out at the current center! [DONE] + Painter::zoom /= zoomFactor; drawing->update(); } @@ -151,28 +216,32 @@ void ApplicationWindow::CreateActions(void) QIcon(":/res/fix-length.png"), QKeySequence(tr("F,L")), true); connect(fixLengthAct, SIGNAL(triggered()), this, SLOT(FixLength())); - deleteAct = CreateAction(tr("&Delete"), tr("Delete Object"), tr("Deletes selected objects."), QIcon(":/res/generic-tool.png"), QKeySequence(), true); + deleteAct = CreateAction(tr("&Delete"), tr("Delete Object"), tr("Deletes selected objects."), QIcon(":/res/delete-tool.png"), QKeySequence(), true); connect(deleteAct, SIGNAL(triggered()), this, SLOT(DeleteTool())); addDimensionAct = CreateAction(tr("Add &Dimension"), tr("Add Dimension"), tr("Adds a dimension to the drawing."), QIcon(":/res/dimension-tool.png"), QKeySequence("D,I"), true); connect(addDimensionAct, SIGNAL(triggered()), this, SLOT(DimensionTool())); - addLineAct = CreateAction(tr("Add &Line"), tr("Add Line"), tr("Adds a line to the drawing."), QIcon(":/res/generic-tool.png"), QKeySequence(), true); + addLineAct = CreateAction(tr("Add &Line"), tr("Add Line"), tr("Adds lines to the drawing."), QIcon(":/res/add-line-tool.png"), QKeySequence("A,L"), true); + connect(addLineAct, SIGNAL(triggered()), this, SLOT(AddLineTool())); + + addCircleAct = CreateAction(tr("Add &Circle"), tr("Add Circle"), tr("Adds circles to the drawing."), QIcon(":/res/add-circle-tool.png"), QKeySequence("A,C"), true); + connect(addCircleAct, SIGNAL(triggered()), this, SLOT(AddCircleTool())); - addCircleAct = CreateAction(tr("Add &Circle"), tr("Add Circle"), tr("Adds a circle to the drawing."), QIcon(":/res/generic-tool.png"), QKeySequence(), true); + addArcAct = CreateAction(tr("Add &Arc"), tr("Add Arc"), tr("Adds arcs to the drawing."), QIcon(":/res/add-arc-tool.png"), QKeySequence("A,A"), true); - addArcAct = CreateAction(tr("Add &Arc"), tr("Add Arc"), tr("Adds an arc to the drawing."), QIcon(":/res/generic-tool.png"), QKeySequence(), true); + addPolygonAct = CreateAction(tr("Add &Polygon"), tr("Add Polygon"), tr("Add polygons to the drawing."), QIcon(":/res/add-polygon-tool.png"), QKeySequence("A,P"), true); 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())); - rotateAct = CreateAction(tr("&Rotate Objects"), tr("Rotate"), tr("Rotate object(s) around an arbitrary center."), QIcon(":/res/generic-tool.png"), QKeySequence(tr("R,O")), true); + rotateAct = CreateAction(tr("&Rotate Objects"), tr("Rotate"), tr("Rotate object(s) around an arbitrary center."), QIcon(":/res/rotate-tool.png"), QKeySequence(tr("R,O")), true); connect(rotateAct, SIGNAL(triggered()), this, SLOT(RotateTool())); - zoomInAct = CreateAction(tr("Zoom &In"), tr("Zoom In"), tr("Zoom in on the document."), QIcon(":/res/generic-tool.png"), QKeySequence(tr("="))); + zoomInAct = CreateAction(tr("Zoom &In"), tr("Zoom In"), tr("Zoom in on the document."), QIcon(":/res/zoom-in.png"), QKeySequence(tr("+")), QKeySequence(tr("="))); connect(zoomInAct, SIGNAL(triggered()), this, SLOT(ZoomInTool())); - zoomOutAct = CreateAction(tr("Zoom &Out"), tr("Zoom Out"), tr("Zoom out of the document."), QIcon(":/res/generic-tool.png"), QKeySequence(tr("-"))); + zoomOutAct = CreateAction(tr("Zoom &Out"), tr("Zoom Out"), tr("Zoom out of the document."), QIcon(":/res/zoom-out.png"), QKeySequence(tr("-"))); connect(zoomOutAct, SIGNAL(triggered()), this, SLOT(ZoomOutTool())); fileNewAct = CreateAction(tr("&New Drawing"), tr("New Drawing"), tr("Creates a new drawing."), QIcon(":/res/generic-tool.png"), QKeySequence(tr("Ctrl+n"))); @@ -216,7 +285,7 @@ QAction * ApplicationWindow::CreateAction(QString name, QString tooltip, QString // This is essentially the same as the previous function, but this allows more // than one key sequence to be added as key shortcuts. // -QAction * ApplicationWindow::CreateAction2(QString name, QString tooltip, QString statustip, +QAction * ApplicationWindow::CreateAction(QString name, QString tooltip, QString statustip, QIcon icon, QKeySequence key1, QKeySequence key2, bool checkable/*= false*/) { QAction * action = new QAction(icon, name, this); @@ -256,20 +325,13 @@ void ApplicationWindow::CreateMenus(void) menu->addAction(addLineAct); menu->addAction(addCircleAct); menu->addAction(addArcAct); + menu->addAction(addPolygonAct); menu->addAction(addDimensionAct); menu->addSeparator(); menu->addAction(settingsAct); -// editMenu = menuBar()->addMenu(tr("&Edit")); -// editMenu->addAction(cutAct); -// editMenu->addAction(copyAct); -// editMenu->addAction(pasteAct); - -// menuBar()->addSeparator(); - menu = menuBar()->addMenu(tr("&Help")); menu->addAction(aboutAct); -// helpMenu->addAction(aboutQtAct); } void ApplicationWindow::CreateToolbars(void)