From d896d00d48827fbdafadd8a7b3a79b6a161a01fc Mon Sep 17 00:00:00 2001 From: Paddle Date: Fri, 24 Mar 2023 14:42:16 +0100 Subject: [PATCH] PartDesign: Fillet Draft Chamfer Thickness : Add warning message on empty feature creation --- src/Mod/PartDesign/Gui/TaskChamferParameters.cpp | 4 ++++ src/Mod/PartDesign/Gui/TaskDraftParameters.cpp | 10 ++++++++++ src/Mod/PartDesign/Gui/TaskDraftParameters.h | 2 ++ src/Mod/PartDesign/Gui/TaskFilletParameters.cpp | 4 ++++ src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp | 8 ++++++++ src/Mod/PartDesign/Gui/TaskThicknessParameters.h | 2 ++ 6 files changed, 30 insertions(+) diff --git a/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp b/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp index ed085a6c72..22bd9a7d2e 100644 --- a/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp @@ -318,6 +318,10 @@ void TaskChamferParameters::apply() ui->chamferAngle->apply(); break; } + + //Alert user if he created an empty feature + if (ui->listWidgetReferences->count() == 0) + Base::Console().Warning(tr("Empty chamfer created !\n").toStdString().c_str()); } //************************************************************************** diff --git a/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp b/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp index 0dde2ca0fb..457c8ecbc2 100644 --- a/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp @@ -275,6 +275,14 @@ void TaskDraftParameters::changeEvent(QEvent *e) } } +void TaskDraftParameters::apply() +{ + //Alert user if he created an empty feature + if (ui->listWidgetReferences->count() == 0) + Base::Console().Warning(tr("Empty draft created !\n").toStdString().c_str()); + + TaskDressUpParameters::apply(); +} //************************************************************************** //************************************************************************** @@ -312,6 +320,8 @@ bool TaskDlgDraftParameters::accept() if (!tobj->isError()) parameter->showObject(); + parameter->apply(); + std::vector strings; App::DocumentObject* obj; TaskDraftParameters* draftparameter = static_cast(parameter); diff --git a/src/Mod/PartDesign/Gui/TaskDraftParameters.h b/src/Mod/PartDesign/Gui/TaskDraftParameters.h index cdd9270a86..bb170a1b79 100644 --- a/src/Mod/PartDesign/Gui/TaskDraftParameters.h +++ b/src/Mod/PartDesign/Gui/TaskDraftParameters.h @@ -40,6 +40,8 @@ public: explicit TaskDraftParameters(ViewProviderDressUp *DressUpView, QWidget *parent=nullptr); ~TaskDraftParameters() override; + void apply() override; + double getAngle() const; bool getReversed() const; const std::vector getFaces() const; diff --git a/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp b/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp index 6130a0619b..58160e4910 100644 --- a/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp @@ -188,6 +188,10 @@ void TaskFilletParameters::apply() //Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Fillet changed")); ui->filletRadius->apply(); + + //Alert user if he created an empty feature + if(ui->listWidgetReferences->count() == 0) + Base::Console().Warning(tr("Empty fillet created !\n").toStdString().c_str()); } //************************************************************************** diff --git a/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp b/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp index 6ec5e319fd..b08b6b8e9e 100644 --- a/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp @@ -241,6 +241,12 @@ void TaskThicknessParameters::changeEvent(QEvent *e) } } +void TaskThicknessParameters::apply() +{ + //Alert user if he created an empty feature + if (ui->listWidgetReferences->count() == 0) + Base::Console().Warning(tr("Empty thickness created !\n").toStdString().c_str()); +} //************************************************************************** //************************************************************************** @@ -283,6 +289,8 @@ bool TaskDlgThicknessParameters::accept() if (!obj->isError()) parameter->showObject(); + parameter->apply(); + TaskThicknessParameters* draftparameter = static_cast(parameter); FCMD_OBJ_CMD(obj,"Value = " << draftparameter->getValue()); diff --git a/src/Mod/PartDesign/Gui/TaskThicknessParameters.h b/src/Mod/PartDesign/Gui/TaskThicknessParameters.h index 00eb26e072..a94a09bcf5 100644 --- a/src/Mod/PartDesign/Gui/TaskThicknessParameters.h +++ b/src/Mod/PartDesign/Gui/TaskThicknessParameters.h @@ -39,6 +39,8 @@ public: explicit TaskThicknessParameters(ViewProviderDressUp *DressUpView, QWidget *parent=nullptr); ~TaskThicknessParameters() override; + void apply() override; + double getValue(void) const; bool getReversed(void) const; bool getIntersection(void) const;