Added mouse wheel zoom.

[architektonas] / src / applicationwindow.cpp

diff --git a/src/applicationwindow.cpp b/src/applicationwindow.cpp
index bf9baf45781fb076e8c9f9c733969f3f5784ba53..cb4f020f5e9ab531217feeef9f62bdd7d076d453 100644 (file)
--- a/src/applicationwindow.cpp
+++ b/src/applicationwindow.cpp
@@ -40,9 +40,14 @@
 #include "layerwidget.h"
 #include "mirroraction.h"
 #include "painter.h"
+#include "rotateaction.h"
 #include "settingsdialog.h"
 
 
+// Class variables
+DrawingView * ApplicationWindow::drawing;
+
+
 ApplicationWindow::ApplicationWindow():
        baseUnitInput(new QLineEdit),
        dimensionSizeInput(new QLineEdit),
@@ -173,7 +178,8 @@ void ApplicationWindow::FileSave(void)
                msg.setIcon(QMessageBox::Critical);
                msg.exec();
                // In this case, we should unlink the created file, since it's not right...
-               unlink(documentName.toAscii().data());
+//             unlink(documentName.toAscii().data());
+               QFile::remove(documentName);
                return;
        }
 
@@ -307,18 +313,14 @@ when zooming in, new origin will be (xCenter - origin.x) / 2, (yCenter - origin.
        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! [DONE]
-       // This should actually be calculated by drawing->gridPixels / grid size.
+       // This just zooms leaving origin intact... should zoom in at the current
+       // center! [DONE]
        Painter::zoom *= zoomFactor;
-//     drawing->gridSpacing = drawing->gridPixels / Painter::zoom;
        Object::gridSpacing = drawing->gridPixels / Painter::zoom;
-//     zoomIndicator->setText(QString("Grid: %2\" Zoom: %1%").arg(Painter::zoom * 100.0 * SCREEN_ZOOM).arg(drawing->gridSpacing));
-//     zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(drawing->gridSpacing));
-       zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(Object::gridSpacing));
        drawing->UpdateGridBackground();
        drawing->update();
 
-//     baseUnitInput->setText(QString("%1").arg(drawing->gridSpacing));
+       zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(Object::gridSpacing));
        baseUnitInput->setText(QString("%1").arg(Object::gridSpacing));
 }
 
@@ -350,17 +352,14 @@ x 2 = (-426, -301)
 //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! [DONE]
+       // This just zooms leaving origin intact... should zoom out at the current
+       // center! [DONE]
        Painter::zoom /= zoomFactor;
-//     drawing->gridSpacing = drawing->gridPixels / Painter::zoom;
        Object::gridSpacing = drawing->gridPixels / Painter::zoom;
-//     zoomIndicator->setText(QString("Grid: %2\" Zoom: %1%").arg(Painter::zoom * 100.0 * SCREEN_ZOOM).arg(drawing->gridSpacing));
-//     zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(drawing->gridSpacing));
-       zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(Object::gridSpacing));
        drawing->UpdateGridBackground();
        drawing->update();
 
-//     baseUnitInput->setText(QString("%1").arg(drawing->gridSpacing));
+       zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(Object::gridSpacing));
        baseUnitInput->setText(QString("%1").arg(Object::gridSpacing));
 }
 
@@ -397,7 +396,6 @@ void ApplicationWindow::SetInternalToolStates(void)
 {
        Object::SetDeleteActive(deleteAct->isChecked());
        Object::SetDimensionActive(addDimensionAct->isChecked());
-       drawing->SetRotateToolActive(rotateAct->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
@@ -406,22 +404,20 @@ void ApplicationWindow::SetInternalToolStates(void)
        {
                delete drawing->toolAction;
                drawing->toolAction = NULL;
+               Object::ignoreClicks = false;
        }
 
-#if 0
-       drawing->SetAddLineToolActive(addLineAct->isChecked());
-       drawing->SetAddCircleToolActive(addCircleAct->isChecked());
-       drawing->SetAddArcToolActive(addArcAct->isChecked());
-       drawing->SetAddDimensionToolActive(addDimensionAct->isChecked());
-#else
        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(mirrorAct->isChecked() ? new MirrorAction() : NULL);
-#endif
+       drawing->SetToolActive(rotateAct->isChecked() ? new RotateAction() : NULL);
 
-       update();
+       if (drawing->toolAction)
+               Object::ignoreClicks = true;
+
+       drawing->update();
 }