Refactor the apply function to be virtual public

This commit is contained in:
André Althaus
2024-02-21 15:04:38 +01:00
parent a89d450a93
commit 0c70b0bd1e
11 changed files with 16 additions and 17 deletions

View File

@@ -421,7 +421,7 @@ TaskLinearPatternParameters::~TaskLinearPatternParameters()
}
}
void TaskLinearPatternParameters::doApply()
void TaskLinearPatternParameters::apply()
{
std::vector<std::string> directions;
App::DocumentObject* obj;

View File

@@ -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();

View File

@@ -209,7 +209,7 @@ void TaskMirroredParameters::getMirrorPlane(App::DocumentObject*& obj,
sub = lnk.getSubValues();
}
void TaskMirroredParameters::doApply()
void TaskMirroredParameters::apply()
{
std::vector<std::string> mirrorPlanes;
App::DocumentObject* obj;

View File

@@ -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<std::string>& sub) const;

View File

@@ -530,7 +530,7 @@ void TaskMultiTransformParameters::onUpdateView(bool on)
}
}
void TaskMultiTransformParameters::doApply()
void TaskMultiTransformParameters::apply()
{
PartDesign::MultiTransform* pcMultiTransform =
static_cast<PartDesign::MultiTransform*>(getObject());

View File

@@ -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;

View File

@@ -404,7 +404,7 @@ TaskPolarPatternParameters::~TaskPolarPatternParameters()
}
}
void TaskPolarPatternParameters::doApply()
void TaskPolarPatternParameters::apply()
{
std::vector<std::string> axes;
App::DocumentObject* obj;

View File

@@ -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();

View File

@@ -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();

View File

@@ -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;

View File

@@ -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();