Correct selection and hovering. Line can't be selected.

--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2016-05-18 19:07:43 +03:00
parent ba76ba2746
commit 19df01be2e
2 changed files with 10 additions and 2 deletions

View File

@ -1013,7 +1013,7 @@ void MainWindow::ToolGroup(bool checked)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void MainWindow::ToolRotation(bool checked) void MainWindow::ToolRotation(bool checked)
{ {
ToolSelectGroupObjects(); ToolSelectOperationObjects();
SetToolButtonWithApply<DialogRotation>(checked, Tool::Rotation, SetToolButtonWithApply<DialogRotation>(checked, Tool::Rotation,
":/cursor/rotation_cursor.png", ":/cursor/rotation_cursor.png",
tr("Select one or more objects, <b>Enter</b> - confirm selection"), tr("Select one or more objects, <b>Enter</b> - confirm selection"),

View File

@ -153,7 +153,7 @@ void DialogRotation::ShowDialog(bool click)
stage1 = false; stage1 = false;
auto scene = qApp->getCurrentScene(); VMainGraphicsScene *scene = qobject_cast<VMainGraphicsScene *>(qApp->getCurrentScene());
SCASSERT(scene != nullptr); SCASSERT(scene != nullptr);
scene->clearSelection(); scene->clearSelection();
@ -162,6 +162,14 @@ void DialogRotation::ShowDialog(bool click)
operation->SetObjects(objects.toVector()); operation->SetObjects(objects.toVector());
operation->VisualMode(); operation->VisualMode();
scene->ToggleArcSelection(false);
scene->ToggleSplineSelection(false);
scene->ToggleSplinePathSelection(false);
scene->ToggleArcHover(false);
scene->ToggleSplineHover(false);
scene->ToggleSplinePathHover(false);
emit ToolTip("Select origin point"); emit ToolTip("Select origin point");
} }
else if (not stage1 && prepare && click) else if (not stage1 && prepare && click)