diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 65c9e5186..83f54631d 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -936,7 +936,7 @@ void MainWindow::ToolDetail(bool checked) { ToolSelectAllDrawObjects(); SetToolButton(checked, Tool::Detail, "://cursor/new_detail_cursor.png", - tr("Select points, arcs, curves clockwise."), &MainWindow::ClosedDialogDetail); + tr("Select main path objects clockwise."), &MainWindow::ClosedDialogDetail); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogseamallowance.cpp b/src/libs/vtools/dialogs/tools/dialogseamallowance.cpp index b2c93467c..52f02e3c3 100644 --- a/src/libs/vtools/dialogs/tools/dialogseamallowance.cpp +++ b/src/libs/vtools/dialogs/tools/dialogseamallowance.cpp @@ -29,6 +29,7 @@ #include "dialogseamallowance.h" #include "ui_dialogseamallowance.h" #include "../vpatterndb/vpiecenode.h" +#include "visualization/path/vistoolpiece.h" #include #include @@ -51,6 +52,8 @@ DialogSeamAllowance::DialogSeamAllowance(const VContainer *data, const quint32 & ui->listWidget->setContextMenuPolicy(Qt::CustomContextMenu); connect(ui->listWidget, &QListWidget::customContextMenuRequested, this, &DialogSeamAllowance::ShowContextMenu); + + vis = new VisToolPiece(data); } //--------------------------------------------------------------------------------------------------------------------- @@ -122,7 +125,34 @@ void DialogSeamAllowance::ChosenObject(quint32 id, const SceneObject &type) } ValidObjects(MainPathIsValid()); - show(); + + auto visPath = qobject_cast(vis); + SCASSERT(visPath != nullptr); + const VPiece p = CreatePiece(); + visPath->SetPiece(p); + + if (p.CountNode() == 1) + { + emit ToolTip(tr("Select main path objects clockwise, Shift - reverse direction curve, " + "Enter - finish creation")); + + visPath->VisualMode(NULL_ID); + } + else + { + visPath->RefreshGeometry(); + } +} + +//--------------------------------------------------------------------------------------------------------------------- +void DialogSeamAllowance::ShowDialog(bool click) +{ + if (click == false) + { + emit ToolTip(""); + setModal(true); + show(); + } } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogseamallowance.h b/src/libs/vtools/dialogs/tools/dialogseamallowance.h index beb4c2477..c9134338a 100644 --- a/src/libs/vtools/dialogs/tools/dialogseamallowance.h +++ b/src/libs/vtools/dialogs/tools/dialogseamallowance.h @@ -52,6 +52,7 @@ public: public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void ShowDialog(bool click) Q_DECL_OVERRIDE; protected: /** @brief SaveData Put dialog data in local variables */ diff --git a/src/libs/vtools/visualization/path/vistoolpiece.cpp b/src/libs/vtools/visualization/path/vistoolpiece.cpp index 8507dd41a..98cbea37d 100644 --- a/src/libs/vtools/visualization/path/vistoolpiece.cpp +++ b/src/libs/vtools/visualization/path/vistoolpiece.cpp @@ -53,9 +53,6 @@ void VisToolPiece::RefreshGeometry() QGraphicsEllipseItem *point = GetPoint(static_cast(i), supportColor); DrawPoint(point, nodes.at(i), supportColor); } - - Visualization::toolTip = tr("Select main path objects, Shift - reverse direction curves, " - "Enter - finish creation"); } }