kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[PD] sort out more Pad/Pocket code

Browse Source 
as suggested in #5349
This commit is contained in:
Uwe
2022-01-09 14:50:52 +01:00
committed by wwmayer
parent 00695f7378
commit 626425526b
4 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp
View File

@@ -34,9 +34,10 @@
#include "ui_TaskPadPocketParameters.h"
#include "TaskExtrudeParameters.h"
#include <Base/UnitsApi.h>
#include <Gui/Command.h>
#include <Gui/Widgets.h>
#include <Mod/PartDesign/App/FeatureExtrude.h>
#include "ReferenceSelection.h"
#include <Gui/Widgets.h>
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

1
src/Mod/PartDesign/Gui/TaskExtrudeParameters.h
View File

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

15
src/Mod/PartDesign/Gui/TaskPadParameters.cpp
View File

@@ -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<Modes>(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);
}
//**************************************************************************

11
src/Mod/PartDesign/Gui/TaskPocketParameters.cpp
View File

@@ -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<Modes>(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);
}
//**************************************************************************