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

Fem: Clean up constraint view providers

Browse Source
This commit is contained in:
marioalexis
2024-06-19 14:04:14 -03:00
committed by Chris Hennes
parent 1ba5f02129
commit 464a50d60e
20 changed files with 57 additions and 761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/Mod/Fem/Gui/TaskFemConstraint.cpp
View File

@@ -65,45 +65,10 @@ TaskFemConstraint::TaskFemConstraint(ViewProviderFemConstraint* ConstraintView,
, cancelButton(nullptr)
{
selectionMode = selref;
// Setup the dialog inside the Shaft Wizard dialog
if ((ConstraintView->wizardWidget) && (ConstraintView->wizardSubLayout)) {
// Hide the shaft wizard table widget to make more space
ConstraintView->wizardSubLayout->itemAt(0)->widget()->hide();
QGridLayout* buttons = ConstraintView->wizardSubLayout->findChild<QGridLayout*>();
for (int b = 0; b < buttons->count(); b++) {
buttons->itemAt(b)->widget()->hide();
}
// Show this dialog for the FEM constraint
ConstraintView->wizardWidget->addWidget(this);
// Add buttons to finish editing the constraint without closing the shaft wizard dialog
okButton = new QPushButton(QObject::tr("Ok"));
cancelButton = new QPushButton(QObject::tr("Cancel"));
buttonBox = new QDialogButtonBox();
buttonBox->addButton(okButton, QDialogButtonBox::AcceptRole);
buttonBox->addButton(cancelButton, QDialogButtonBox::RejectRole);
QObject::connect(okButton, &QPushButton::clicked, this, &TaskFemConstraint::onButtonWizOk);
QObject::connect(cancelButton,
&QPushButton::clicked,
this,
&TaskFemConstraint::onButtonWizCancel);
ConstraintView->wizardWidget->addWidget(buttonBox);
}
}
void TaskFemConstraint::keyPressEvent(QKeyEvent* ke)
{
if ((ConstraintView->wizardWidget) && (ConstraintView->wizardSubLayout)) {
// Prevent <Enter> from closing this dialog AND the shaft wizard dialog
// TODO: This should trigger an update in the shaft wizard but its difficult to access a
// python dialog from here...
if (ke->key() == Qt::Key_Return) {
return;
}
}
TaskBox::keyPressEvent(ke);
}
@@ -172,37 +137,6 @@ void TaskFemConstraint::onButtonReference(const bool pressed)
Gui::Selection().clearSelection();
}
void TaskFemConstraint::onButtonWizOk()
{
// Remove dialog elements
buttonBox->removeButton(okButton);
delete okButton;
buttonBox->removeButton(cancelButton);
delete cancelButton;
ConstraintView->wizardWidget->removeWidget(buttonBox);
delete buttonBox;
ConstraintView->wizardWidget->removeWidget(this);
// Show the wizard shaft dialog again
ConstraintView->wizardSubLayout->itemAt(0)->widget()->show();
QGridLayout* buttons = ConstraintView->wizardSubLayout->findChild<QGridLayout*>();
for (int b = 0; b < buttons->count(); b++) {
buttons->itemAt(b)->widget()->show();
}
Gui::Application::Instance->activeDocument()
->resetEdit(); // Reaches ViewProviderFemConstraint::unsetEdit() eventually
}
void TaskFemConstraint::onButtonWizCancel()
{
Fem::Constraint* pcConstraint = static_cast<Fem::Constraint*>(ConstraintView->getObject());
if (pcConstraint) {
pcConstraint->getDocument()->removeObject(pcConstraint->getNameInDocument());
}
onButtonWizOk();
}
const QString TaskFemConstraint::makeRefText(const std::string& objName,
const std::string& subName) const
{