diff --git a/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp b/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp index 520f97ed33..ecfef5eccc 100644 --- a/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp @@ -34,9 +34,10 @@ #include "ui_TaskPadPocketParameters.h" #include "TaskExtrudeParameters.h" #include +#include +#include #include #include "ReferenceSelection.h" -#include using namespace PartDesignGui; using namespace Gui; @@ -728,6 +729,24 @@ void TaskExtrudeParameters::saveHistory(void) ui->offsetEdit->pushToHistory(); } +void TaskExtrudeParameters::applyParameters(QString facename) +{ + auto obj = vp->getObject(); + + ui->lengthEdit->apply(); + ui->lengthEdit2->apply(); + FCMD_OBJ_CMD(obj, "UseCustomVector = " << (getCustom() ? 1 : 0)); + FCMD_OBJ_CMD(obj, "Direction = (" + << getXDirection() << ", " << getYDirection() << ", " << getZDirection() << ")"); + FCMD_OBJ_CMD(obj, "ReferenceAxis = " << getReferenceAxis()); + FCMD_OBJ_CMD(obj, "AlongSketchNormal = " << (getAlongSketchNormal() ? 1 : 0)); + FCMD_OBJ_CMD(obj, "Type = " << getMode()); + FCMD_OBJ_CMD(obj, "UpToFace = " << facename.toLatin1().data()); + FCMD_OBJ_CMD(obj, "Reversed = " << (getReversed() ? 1 : 0)); + FCMD_OBJ_CMD(obj, "Midplane = " << (getMidplane() ? 1 : 0)); + FCMD_OBJ_CMD(obj, "Offset = " << getOffset()); +} + void TaskExtrudeParameters::onModeChanged(int) { // implement in sub-class diff --git a/src/Mod/PartDesign/Gui/TaskExtrudeParameters.h b/src/Mod/PartDesign/Gui/TaskExtrudeParameters.h index 5c9a40de98..b53d1fd4bd 100644 --- a/src/Mod/PartDesign/Gui/TaskExtrudeParameters.h +++ b/src/Mod/PartDesign/Gui/TaskExtrudeParameters.h @@ -65,6 +65,7 @@ public: void fillDirectionCombo(); void addAxisToCombo(App::DocumentObject* linkObj, std::string linkSubname, QString itemText, bool hasSketch = true); + void applyParameters(QString facename); protected Q_SLOTS: void onLengthChanged(double); diff --git a/src/Mod/PartDesign/Gui/TaskPadParameters.cpp b/src/Mod/PartDesign/Gui/TaskPadParameters.cpp index 52f6309f87..94282a21cf 100644 --- a/src/Mod/PartDesign/Gui/TaskPadParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPadParameters.cpp @@ -177,24 +177,11 @@ void TaskPadParameters::onModeChanged(int index) void TaskPadParameters::apply() { - auto obj = vp->getObject(); - - ui->lengthEdit->apply(); - ui->lengthEdit2->apply(); - FCMD_OBJ_CMD(obj, "UseCustomVector = " << (getCustom() ? 1 : 0)); - FCMD_OBJ_CMD(obj, "Direction = (" - << getXDirection() << ", " << getYDirection() << ", " << getZDirection() << ")"); - FCMD_OBJ_CMD(obj, "ReferenceAxis = " << getReferenceAxis()); - FCMD_OBJ_CMD(obj, "AlongSketchNormal = " << (getAlongSketchNormal() ? 1 : 0)); - FCMD_OBJ_CMD(obj,"Type = " << getMode()); QString facename = QString::fromLatin1("None"); if (static_cast(getMode()) == Modes::ToFace) { facename = getFaceName(); } - FCMD_OBJ_CMD(obj,"UpToFace = " << facename.toLatin1().data()); - FCMD_OBJ_CMD(obj,"Reversed = " << (getReversed()?1:0)); - FCMD_OBJ_CMD(obj,"Midplane = " << (getMidplane()?1:0)); - FCMD_OBJ_CMD(obj,"Offset = " << getOffset()); + applyParameters(facename); } //************************************************************************** diff --git a/src/Mod/PartDesign/Gui/TaskPocketParameters.cpp b/src/Mod/PartDesign/Gui/TaskPocketParameters.cpp index f25cd3cfce..d3bc82b5f2 100644 --- a/src/Mod/PartDesign/Gui/TaskPocketParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPocketParameters.cpp @@ -198,20 +198,11 @@ void TaskPocketParameters::onModeChanged(int index) void TaskPocketParameters::apply() { - auto obj = vp->getObject(); - - ui->lengthEdit->apply(); - ui->lengthEdit2->apply(); - - FCMD_OBJ_CMD(obj,"Type = " << getMode()); QString facename = QString::fromLatin1("None"); if (static_cast(getMode()) == Modes::ToFace) { facename = getFaceName(); } - FCMD_OBJ_CMD(obj,"UpToFace = " << facename.toLatin1().data()); - FCMD_OBJ_CMD(obj,"Reversed = " << (getReversed()?1:0)); - FCMD_OBJ_CMD(obj,"Midplane = " << (getMidplane()?1:0)); - FCMD_OBJ_CMD(obj,"Offset = " << getOffset()); + applyParameters(facename); } //**************************************************************************