diff -r b179ab2f2c4e -r d68d1ce89d05 src/toolsets/movetoolset.cpp --- a/src/toolsets/movetoolset.cpp Sat Mar 24 12:58:01 2018 +0200 +++ b/src/toolsets/movetoolset.cpp Sat Mar 24 13:03:02 2018 +0200 @@ -17,12 +17,12 @@ */ #include "../lddocument.h" -#include "../mathfunctions.h" #include "../mainwindow.h" #include "movetoolset.h" #include "ui_rotationpointdialog.h" #include "../grid.h" #include "../canvas.h" +#include "../algorithms/geometry.h" MoveToolset::MoveToolset (MainWindow* parent) : Toolset (parent) {} @@ -121,32 +121,32 @@ void MoveToolset::rotateXPos() { - math()->rotateObjects (1, 0, 0, getRotateActionAngle(), selectedObjects().toList().toVector()); + rotateObjects(1, 0, 0, getRotateActionAngle(), selectedObjects().toList().toVector()); } void MoveToolset::rotateYPos() { - math()->rotateObjects (0, 1, 0, getRotateActionAngle(), selectedObjects().toList().toVector()); + rotateObjects(0, 1, 0, getRotateActionAngle(), selectedObjects().toList().toVector()); } void MoveToolset::rotateZPos() { - math()->rotateObjects (0, 0, 1, getRotateActionAngle(), selectedObjects().toList().toVector()); + rotateObjects(0, 0, 1, getRotateActionAngle(), selectedObjects().toList().toVector()); } void MoveToolset::rotateXNeg() { - math()->rotateObjects (-1, 0, 0, getRotateActionAngle(), selectedObjects().toList().toVector()); + rotateObjects(-1, 0, 0, getRotateActionAngle(), selectedObjects().toList().toVector()); } void MoveToolset::rotateYNeg() { - math()->rotateObjects (0, -1, 0, getRotateActionAngle(), selectedObjects().toList().toVector()); + rotateObjects(0, -1, 0, getRotateActionAngle(), selectedObjects().toList().toVector()); } void MoveToolset::rotateZNeg() { - math()->rotateObjects (0, 0, -1, getRotateActionAngle(), selectedObjects().toList().toVector()); + rotateObjects(0, 0, -1, getRotateActionAngle(), selectedObjects().toList().toVector()); } void MoveToolset::configureRotationPoint() @@ -155,7 +155,7 @@ Ui_RotPointUI ui; ui.setupUi(dialog); - switch (RotationPoint(config::rotationPointType())) + switch (static_cast(config::rotationPointType())) { case ObjectOrigin: ui.objectPoint->setChecked (true);