diff --git a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp index a35b5ff75d..44bde1e15c 100644 --- a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp @@ -421,7 +421,7 @@ TaskLinearPatternParameters::~TaskLinearPatternParameters() } } -void TaskLinearPatternParameters::doApply() +void TaskLinearPatternParameters::apply() { std::vector directions; App::DocumentObject* obj; diff --git a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h index 3a2645dc13..1d87527f2a 100644 --- a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h +++ b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h @@ -57,6 +57,8 @@ public: TaskLinearPatternParameters(TaskMultiTransformParameters* parentTask, QWidget* parameterWidget); ~TaskLinearPatternParameters() override; + void apply() override; + protected: void onSelectionChanged(const Gui::SelectionChanges& msg) override; @@ -73,7 +75,6 @@ private Q_SLOTS: private: void setupParameterUI(QWidget* widget) override; void retranslateParameterUI(QWidget* widget) override; - void doApply() override; void connectSignals(); void updateUI(); diff --git a/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp b/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp index 6cbd6eba04..fc8e397383 100644 --- a/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp @@ -209,7 +209,7 @@ void TaskMirroredParameters::getMirrorPlane(App::DocumentObject*& obj, sub = lnk.getSubValues(); } -void TaskMirroredParameters::doApply() +void TaskMirroredParameters::apply() { std::vector mirrorPlanes; App::DocumentObject* obj; diff --git a/src/Mod/PartDesign/Gui/TaskMirroredParameters.h b/src/Mod/PartDesign/Gui/TaskMirroredParameters.h index 9da2d05671..fd8025f272 100644 --- a/src/Mod/PartDesign/Gui/TaskMirroredParameters.h +++ b/src/Mod/PartDesign/Gui/TaskMirroredParameters.h @@ -57,6 +57,8 @@ public: ~TaskMirroredParameters() override; + void apply() override; + protected: void onSelectionChanged(const Gui::SelectionChanges& msg) override; @@ -67,7 +69,6 @@ private Q_SLOTS: private: void setupParameterUI(QWidget* widget) override; void retranslateParameterUI(QWidget* widget) override; - void doApply() override; void updateUI(); void getMirrorPlane(App::DocumentObject*& obj, std::vector& sub) const; diff --git a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp index 1380e498d3..c22f524a85 100644 --- a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp @@ -530,7 +530,7 @@ void TaskMultiTransformParameters::onUpdateView(bool on) } } -void TaskMultiTransformParameters::doApply() +void TaskMultiTransformParameters::apply() { PartDesign::MultiTransform* pcMultiTransform = static_cast(getObject()); diff --git a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h index 30a84f4bea..1f68dc1b04 100644 --- a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h +++ b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h @@ -58,6 +58,8 @@ public: QWidget* parent = nullptr); ~TaskMultiTransformParameters() override; + void apply() override; + /// Return the currently active subFeature PartDesign::Transformed* getSubFeature() { @@ -83,7 +85,6 @@ private Q_SLOTS: private: void setupParameterUI(QWidget* widget) override; void retranslateParameterUI(QWidget* widget) override; - void doApply() override; /** Notifies when the object is about to be removed. */ void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj) override; diff --git a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp index 0afe933dd9..a8d8d59d0b 100644 --- a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp @@ -404,7 +404,7 @@ TaskPolarPatternParameters::~TaskPolarPatternParameters() } } -void TaskPolarPatternParameters::doApply() +void TaskPolarPatternParameters::apply() { std::vector axes; App::DocumentObject* obj; diff --git a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h index c33cc7b0fc..6bf8a836af 100644 --- a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h +++ b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h @@ -57,6 +57,8 @@ public: TaskPolarPatternParameters(TaskMultiTransformParameters* parentTask, QWidget* parameterWidget); ~TaskPolarPatternParameters() override; + void apply() override; + protected: void onSelectionChanged(const Gui::SelectionChanges& msg) override; @@ -73,7 +75,6 @@ private Q_SLOTS: private: void setupParameterUI(QWidget* widget) override; void retranslateParameterUI(QWidget* widget) override; - void doApply() override; void connectSignals(); void updateUI(); diff --git a/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp b/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp index 54873b3e4d..4d7bc7ef6b 100644 --- a/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp @@ -152,7 +152,7 @@ unsigned TaskScaledParameters::getOccurrences() const return ui->spinOccurrences->value(); } -void TaskScaledParameters::doApply() +void TaskScaledParameters::apply() { FCMD_OBJ_CMD(getObject(), "Factor = " << getFactor()); ui->spinOccurrences->apply(); diff --git a/src/Mod/PartDesign/Gui/TaskScaledParameters.h b/src/Mod/PartDesign/Gui/TaskScaledParameters.h index 60a1a6d829..a60ca00d19 100644 --- a/src/Mod/PartDesign/Gui/TaskScaledParameters.h +++ b/src/Mod/PartDesign/Gui/TaskScaledParameters.h @@ -55,6 +55,8 @@ public: /// Constructor for task with parent task (MultiTransform mode) TaskScaledParameters(TaskMultiTransformParameters* parentTask, QWidget* parameterWidget); + void apply() override; + private Q_SLOTS: void onFactor(const double f); void onOccurrences(const uint n); @@ -63,7 +65,6 @@ private Q_SLOTS: private: void setupParameterUI(QWidget* widget) override; void retranslateParameterUI(QWidget* widget) override; - void doApply() override; void updateUI(); double getFactor() const; diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.h b/src/Mod/PartDesign/Gui/TaskTransformedParameters.h index ddb58779f9..f2df569e52 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedParameters.h +++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.h @@ -150,10 +150,7 @@ public: ~TaskTransformedParameters() override; /// Apply changes for python console - void apply() - { - doApply(); - } + virtual void apply() = 0; /*! * \brief setEnabledTransaction @@ -235,9 +232,6 @@ private: /// Change translation of the parameter UI virtual void retranslateParameterUI(QWidget* widget) = 0; - /// Implementation for apply() - virtual void doApply() = 0; - void addObject(App::DocumentObject*); void removeObject(App::DocumentObject*); void clearButtons();