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

PD: fix bug in TaskExtrudeParameters

Browse Source 
When switching from Custom direction to Select reference mode do not jump back to Custom direction mode after selecting an edge
This commit is contained in:
wmayer
2021-11-27 02:22:37 +01:00
parent c20cfd5db6
commit dd92764eb5
2 changed files with 47 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -404,50 +404,26 @@ void TaskExtrudeParameters::onDirectionCBChanged(int num)
this->blockConnection(false);
// to distinguish that this is the direction selection
selectionFace = false;
setDirectionMode(num);
TaskSketchBasedParameters::onSelectReference(true, true, false, true, true);
return;
}
else if (lnk.getValue()) {
if (!extrude->getDocument()->isIn(lnk.getValue())) {
Base::Console().Error("Object was deleted\n");
return;
else {
if (lnk.getValue()) {
if (!extrude->getDocument()->isIn(lnk.getValue())) {
Base::Console().Error("Object was deleted\n");
return;
}
propReferenceAxis->Paste(lnk);
}
propReferenceAxis->Paste(lnk);
}
// in case the user is in selection mode, but changed his mind before selecting anything
exitSelectionMode();
// in case the user is in selection mode, but changed his mind before selecting anything
exitSelectionMode();
// disable AlongSketchNormal when the direction is already normal
if (num == DirectionModes::Normal)
ui->checkBoxAlongDirection->setEnabled(false);
else
ui->checkBoxAlongDirection->setEnabled(true);
// if custom direction is used, show it
if (num == DirectionModes::Custom) {
ui->checkBoxDirection->setChecked(true);
extrude->UseCustomVector.setValue(true);
setDirectionMode(num);
extrude->ReferenceAxis.setValue(lnk.getValue(), lnk.getSubValues());
tryRecomputeFeature();
updateDirectionEdits();
}
else {
extrude->UseCustomVector.setValue(false);
}
// if we dont use custom direction, only allow to show its direction
if (num != DirectionModes::Custom) {
ui->XDirectionEdit->setEnabled(false);
ui->YDirectionEdit->setEnabled(false);
ui->ZDirectionEdit->setEnabled(false);
}
else {
ui->XDirectionEdit->setEnabled(true);
ui->YDirectionEdit->setEnabled(true);
ui->ZDirectionEdit->setEnabled(true);
}
extrude->ReferenceAxis.setValue(lnk.getValue(), lnk.getSubValues());
tryRecomputeFeature();
updateDirectionEdits();
}
void TaskExtrudeParameters::onAlongSketchNormalChanged(bool on)
@@ -504,6 +480,38 @@ void TaskExtrudeParameters::updateDirectionEdits()
ui->ZDirectionEdit->setValue(extrude->Direction.getValue().z);
}
void TaskExtrudeParameters::setDirectionMode(int index)
{
PartDesign::FeatureExtrude* extrude = static_cast<PartDesign::FeatureExtrude*>(vp->getObject());
// disable AlongSketchNormal when the direction is already normal
if (index == DirectionModes::Normal)
ui->checkBoxAlongDirection->setEnabled(false);
else
ui->checkBoxAlongDirection->setEnabled(true);
// if custom direction is used, show it
if (index == DirectionModes::Custom) {
ui->checkBoxDirection->setChecked(true);
extrude->UseCustomVector.setValue(true);
}
else {
extrude->UseCustomVector.setValue(false);
}
// if we dont use custom direction, only allow to show its direction
if (index != DirectionModes::Custom) {
ui->XDirectionEdit->setEnabled(false);
ui->YDirectionEdit->setEnabled(false);
ui->ZDirectionEdit->setEnabled(false);
}
else {
ui->XDirectionEdit->setEnabled(true);
ui->YDirectionEdit->setEnabled(true);
ui->ZDirectionEdit->setEnabled(true);
}
}
void TaskExtrudeParameters::onMidplaneChanged(bool on)
{
PartDesign::FeatureExtrude* extrude = static_cast<PartDesign::FeatureExtrude*>(vp->getObject());

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

@@ -106,6 +106,7 @@ protected:
virtual void translateModeList(int index);
virtual void updateUI(int index);
void updateDirectionEdits(void);
void setDirectionMode(int index);
private:
void tryRecomputeFeature();