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

[PD] fix dressup feature display when broken

Browse Source 
As discussed in https://forum.freecadweb.org/viewtopic.php?p=479647#p479377
the user can end up without either seeing nothing or an inexisting dressup feature.

This PR fixes this.
This commit is contained in:
donovaly
2021-02-19 05:02:18 +01:00
committed by wmayer
parent 1b07835aa5
commit 3fdce54be7
7 changed files with 70 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp
View File

@@ -118,6 +118,9 @@ TaskThicknessParameters::TaskThicknessParameters(ViewProviderDressUp *DressUpVie
int join = pcThickness->Join.getValue();
ui->joinComboBox->setCurrentIndex(join);
// the dialog can be called on a broken thickness, then hide the thickness
hideOnError();
}
void TaskThicknessParameters::onSelectionChanged(const Gui::SelectionChanges& msg)
@@ -208,6 +211,8 @@ void TaskThicknessParameters::onRefDeleted(void)
pcThickness->Base.setValue(base, refs);
// recompute the feature
pcThickness->recomputeFeature();
// hide the thickness if there was a computation error
hideOnError();
// if there is only one item left, it cannot be deleted
if (ui->listWidgetReferences->count() == 1) {
@@ -225,6 +230,8 @@ void TaskThicknessParameters::onValueChanged(double angle)
setupTransaction();
pcThickness->Value.setValue(angle);
pcThickness->getDocument()->recomputeFeature(pcThickness);
// hide the thickness if there was a computation error
hideOnError();
}
void TaskThicknessParameters::onJoinTypeChanged(int join) {
@@ -234,6 +241,8 @@ void TaskThicknessParameters::onJoinTypeChanged(int join) {
setupTransaction();
pcThickness->Join.setValue(join);
pcThickness->getDocument()->recomputeFeature(pcThickness);
// hide the thickness if there was a computation error
hideOnError();
}
void TaskThicknessParameters::onModeChanged(int mode) {
@@ -243,6 +252,8 @@ void TaskThicknessParameters::onModeChanged(int mode) {
setupTransaction();
pcThickness->Mode.setValue(mode);
pcThickness->getDocument()->recomputeFeature(pcThickness);
// hide the thickness if there was a computation error
hideOnError();
}
double TaskThicknessParameters::getValue(void) const
@@ -256,6 +267,8 @@ void TaskThicknessParameters::onReversedChanged(const bool on) {
setupTransaction();
pcThickness->Reversed.setValue(on);
pcThickness->getDocument()->recomputeFeature(pcThickness);
// hide the thickness if there was a computation error
hideOnError();
}
bool TaskThicknessParameters::getReversed(void) const
@@ -268,6 +281,8 @@ void TaskThicknessParameters::onIntersectionChanged(const bool on) {
PartDesign::Thickness* pcThickness = static_cast<PartDesign::Thickness*>(DressUpView->getObject());
pcThickness->Intersection.setValue(on);
pcThickness->getDocument()->recomputeFeature(pcThickness);
// hide the thickness if there was a computation error
hideOnError();
}
bool TaskThicknessParameters::getIntersection(void) const
@@ -285,7 +300,6 @@ int TaskThicknessParameters::getMode(void) const {
return ui->modeComboBox->currentIndex();
}
TaskThicknessParameters::~TaskThicknessParameters()
{
try {
@@ -349,8 +363,6 @@ TaskDlgThicknessParameters::~TaskDlgThicknessParameters()
bool TaskDlgThicknessParameters::accept()
{
parameter->showObject();
TaskThicknessParameters* draftparameter = static_cast<TaskThicknessParameters*>(parameter);
auto obj = vp->getObject();