Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[PartDesign] Fix 'Reversed' no more available in Pad 'toFirst/toLast' + Pocket '2dims' #4918

Merged
merged 4 commits into from
Aug 17, 2021
Merged

[PartDesign] Fix 'Reversed' no more available in Pad 'toFirst/toLast' + Pocket '2dims' #4918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
688e661
[PartDesign] Fix 'Reversed' no more available in Pad 'toFirst/toLast'
0penBrain Jul 12, 2021
be07031
[PartDesign] Restore 'Reversed' ability into Pocket/2dims mode
0penBrain Jul 13, 2021
f9eb331
[PartDesign] Add reverse ability for Pad/UpToFace mode as it makes se…
0penBrain Jul 23, 2021
db3f4f1
[PartDesign] Enable reverse ability for Pocket/UpToFace mode as it ma…
0penBrain Aug 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 12 additions & 4 deletions src/Mod/PartDesign/Gui/TaskPadParameters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,8 @@ void TaskPadParameters::updateUI(int index)
bool isLengthEditVisible = false;
bool isLengthEdit2Visible = false;
bool isOffsetEditVisible = false;
bool isMidplateEnabled = false;
bool isMidplaneEnabled = false;
bool isMidplaneVisible = false;
bool isReversedEnabled = false;
bool isReversedVisible = false;
bool isFaceEditEnabled = false;
Expand All @@ -216,14 +217,17 @@ void TaskPadParameters::updateUI(int index)
// Calling setFocus() directly doesn't work because the spin box is not
// yet visible.
QMetaObject::invokeMethod(ui->lengthEdit, "setFocus", Qt::QueuedConnection);
isMidplateEnabled = !ui->checkBoxReversed->isChecked();
isMidplaneEnabled = !ui->checkBoxReversed->isChecked();
isMidplaneVisible = true;
// Reverse only makes sense if Midplane is not true
isReversedEnabled = !ui->checkBoxMidplane->isChecked();
isReversedVisible = true;
}
// up to first/last
else if (index == 1 || index == 2) {
isOffsetEditVisible = true;
isReversedEnabled = true;
isReversedVisible = true;
}
// up to face
else if (index == 3) {
Expand All @@ -233,12 +237,15 @@ void TaskPadParameters::updateUI(int index)
// Go into reference selection mode if no face has been selected yet
if (ui->lineFaceName->property("FeatureName").isNull())
onButtonFace(true);
isReversedEnabled = true;
isReversedVisible = true;
}
// two dimensions
else {
isLengthEditVisible = true;
isLengthEdit2Visible = true;
isMidplateEnabled = !ui->checkBoxReversed->isChecked();
isMidplaneEnabled = !ui->checkBoxReversed->isChecked();
isMidplaneVisible = true;
isReversedEnabled = !ui->checkBoxMidplane->isChecked();
isReversedVisible = true;
}
Expand All @@ -252,7 +259,8 @@ void TaskPadParameters::updateUI(int index)
ui->offsetEdit->setEnabled( isOffsetEditVisible );
ui->labelOffset->setVisible( isOffsetEditVisible );

ui->checkBoxMidplane->setEnabled( isMidplateEnabled );
ui->checkBoxMidplane->setEnabled( isMidplaneEnabled );
ui->checkBoxMidplane->setVisible( isMidplaneVisible );

ui->checkBoxReversed->setEnabled( isReversedEnabled );
ui->checkBoxReversed->setVisible( isReversedVisible );
Expand Down
2 changes: 2 additions & 0 deletions src/Mod/PartDesign/Gui/TaskPocketParameters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ void TaskPocketParameters::updateUI(int index)
// up to face
else if (index == 3) {
isOffsetEditVisable = true;
isReversedEnabled = true;
isFaceEditEnabled = true;
QMetaObject::invokeMethod(ui->lineFaceName, "setFocus", Qt::QueuedConnection);
// Go into reference selection mode if no face has been selected yet
Expand All @@ -215,6 +216,7 @@ void TaskPocketParameters::updateUI(int index)
else {
isLengthEditVisable = true;
isLengthEdit2Visable = true;
isReversedEnabled = true;
}

ui->lengthEdit->setVisible( isLengthEditVisable );
Expand Down