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

FEM: Fix convoluted event handling of constraint task boxes

Browse Source 
and make Delete key working on macOS
This commit is contained in:
wmayer
2024-07-23 08:25:37 +02:00
committed by Chris Hennes
parent 8a1b4b2d05
commit be34f251cd
26 changed files with 23 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,12 +59,32 @@ TaskFemConstraint::TaskFemConstraint(ViewProviderFemConstraint* ConstraintView,
, proxy(nullptr)
, deleteAction(nullptr)
, ConstraintView(ConstraintView)
, selectionMode(selref)
{}
bool TaskFemConstraint::event(QEvent* event)
{
selectionMode = selref;
if (event && event->type() == QEvent::ShortcutOverride) {
auto ke = static_cast<QKeyEvent*>(event); // NOLINT
if (deleteAction) {
if (ke->matches(QKeySequence::Delete) || ke->matches(QKeySequence::Backspace)) {
ke->accept();
}
}
}
return TaskBox::event(event);
}
void TaskFemConstraint::keyPressEvent(QKeyEvent* ke)
{
// if we have a Del key, trigger the deleteAction
if (ke->matches(QKeySequence::Delete) || ke->matches(QKeySequence::Backspace)) {
if (deleteAction && deleteAction->isEnabled()) {
ke->accept();
deleteAction->trigger();
}
}
TaskBox::keyPressEvent(ke);
}
@@ -157,32 +177,6 @@ void TaskFemConstraint::createDeleteAction(QListWidget* parentList)
parentList->setContextMenuPolicy(Qt::ActionsContextMenu);
}
bool TaskFemConstraint::KeyEvent(QEvent* e)
{
// in case another instance takes key events, accept the overridden key even
if (e && e->type() == QEvent::ShortcutOverride) {
QKeyEvent* kevent = static_cast<QKeyEvent*>(e);
if (kevent->modifiers() == Qt::NoModifier) {
if (deleteAction && kevent->key() == Qt::Key_Delete) {
kevent->accept();
return true;
}
}
}
// if we have a Del key, trigger the deleteAction
else if (e && e->type() == QEvent::KeyPress) {
QKeyEvent* kevent = static_cast<QKeyEvent*>(e);
if (kevent->key() == Qt::Key_Delete) {
if (deleteAction && deleteAction->isEnabled()) {
deleteAction->trigger();
}
return true;
}
}
return TaskFemConstraint::event(e);
}
//**************************************************************************
//**************************************************************************
// TaskDialog

3
src/Mod/Fem/Gui/TaskFemConstraint.h
View File

@@ -62,6 +62,8 @@ protected Q_SLOTS:
void onButtonReference(const bool pressed = true);
void setSelection(QListWidgetItem* item);
bool event(QEvent* event) override;
protected:
void changeEvent(QEvent* e) override
{
@@ -71,7 +73,6 @@ protected:
const QString makeRefText(const App::DocumentObject* obj, const std::string& subName) const;
void keyPressEvent(QKeyEvent* ke) override;
void createDeleteAction(QListWidget* parentList);
bool KeyEvent(QEvent* e);
void onSelectionChanged(const Gui::SelectionChanges&) override
{}

5
src/Mod/Fem/Gui/TaskFemConstraintBearing.cpp
View File

@@ -309,11 +309,6 @@ bool TaskFemConstraintBearing::getAxial() const
TaskFemConstraintBearing::~TaskFemConstraintBearing() = default;
bool TaskFemConstraintBearing::event(QEvent* e)
{
return TaskFemConstraint::KeyEvent(e);
}
void TaskFemConstraintBearing::changeEvent(QEvent* e)
{
TaskBox::changeEvent(e);

1
src/Mod/Fem/Gui/TaskFemConstraintBearing.h
View File

@@ -69,7 +69,6 @@ private Q_SLOTS:
void onCheckAxial(bool);
protected:
bool event(QEvent* e) override;
void changeEvent(QEvent* e) override;
void onSelectionChanged(const Gui::SelectionChanges& msg) override;

5
src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp
View File

@@ -477,11 +477,6 @@ bool TaskFemConstraintDisplacement::get_useFlowSurfaceForce() const
return ui->FlowForceCB->isChecked();
}
bool TaskFemConstraintDisplacement::event(QEvent* e)
{
return TaskFemConstraint::KeyEvent(e);
}
void TaskFemConstraintDisplacement::changeEvent(QEvent*)
{
// TaskBox::changeEvent(e);

1
src/Mod/Fem/Gui/TaskFemConstraintDisplacement.h
View File

@@ -85,7 +85,6 @@ private Q_SLOTS:
void removeFromSelection() override;
protected:
bool event(QEvent* e) override;
void changeEvent(QEvent* e) override;
void clearButtons(const SelectionChangeModes notThis) override;

5
src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp
View File

@@ -247,11 +247,6 @@ const std::string TaskFemConstraintFixed::getReferences() const
return TaskFemConstraint::getReferences(items);
}
bool TaskFemConstraintFixed::event(QEvent* e)
{
return TaskFemConstraint::KeyEvent(e);
}
void TaskFemConstraintFixed::changeEvent(QEvent*)
{}

1
src/Mod/Fem/Gui/TaskFemConstraintFixed.h
View File

@@ -51,7 +51,6 @@ private Q_SLOTS:
void removeFromSelection() override;
protected:
bool event(QEvent* e) override;
void changeEvent(QEvent* e) override;
void clearButtons(const SelectionChangeModes notThis) override;

5
src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp
View File

@@ -951,11 +951,6 @@ void TaskFemConstraintFluidBoundary::updateUI()
}
}
bool TaskFemConstraintFluidBoundary::event(QEvent* e)
{
return TaskFemConstraint::KeyEvent(e);
}
void TaskFemConstraintFluidBoundary::changeEvent(QEvent* e)
{
TaskBox::changeEvent(e);

1
src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.h
View File

@@ -91,7 +91,6 @@ private Q_SLOTS:
void removeFromSelection() override;
protected:
bool event(QEvent* e) override;
void changeEvent(QEvent* e) override;
void clearButtons(const SelectionChangeModes notThis) override;

5
src/Mod/Fem/Gui/TaskFemConstraintForce.cpp
View File

@@ -386,11 +386,6 @@ bool TaskFemConstraintForce::getReverse() const
TaskFemConstraintForce::~TaskFemConstraintForce() = default;
bool TaskFemConstraintForce::event(QEvent* e)
{
return TaskFemConstraint::KeyEvent(e);
}
void TaskFemConstraintForce::changeEvent(QEvent* e)
{
TaskBox::changeEvent(e);

1
src/Mod/Fem/Gui/TaskFemConstraintForce.h
View File

@@ -69,7 +69,6 @@ private Q_SLOTS:
void removeFromSelection() override;
protected:
bool event(QEvent* e) override;
void changeEvent(QEvent* e) override;
void clearButtons(const SelectionChangeModes notThis) override;

5
src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp
View File

@@ -458,11 +458,6 @@ std::string TaskFemConstraintHeatflux::get_constraint_type() const
return type;
}
bool TaskFemConstraintHeatflux::event(QEvent* e)
{
return TaskFemConstraint::KeyEvent(e);
}
void TaskFemConstraintHeatflux::changeEvent(QEvent* e)
{
TaskBox::changeEvent(e);

1
src/Mod/Fem/Gui/TaskFemConstraintHeatflux.h
View File

@@ -66,7 +66,6 @@ private Q_SLOTS:
void removeFromSelection() override;
protected:
bool event(QEvent* e) override;
void changeEvent(QEvent* e) override;
void clearButtons(const SelectionChangeModes notThis) override;

5
src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp
View File

@@ -281,11 +281,6 @@ const std::string TaskFemConstraintPlaneRotation::getReferences() const
return TaskFemConstraint::getReferences(items);
}
bool TaskFemConstraintPlaneRotation::event(QEvent* e)
{
return TaskFemConstraint::KeyEvent(e);
}
void TaskFemConstraintPlaneRotation::changeEvent(QEvent*)
{}

1
src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.h
View File

@@ -53,7 +53,6 @@ private Q_SLOTS:
void removeFromSelection();
protected:
bool event(QEvent* e) override;
void changeEvent(QEvent* e) override;
private:

5
src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp
View File

@@ -262,11 +262,6 @@ bool TaskFemConstraintPressure::getReverse() const
return ui->checkBoxReverse->isChecked();
}
bool TaskFemConstraintPressure::event(QEvent* e)
{
return TaskFemConstraint::KeyEvent(e);
}
void TaskFemConstraintPressure::changeEvent(QEvent*)
{}

1
src/Mod/Fem/Gui/TaskFemConstraintPressure.h
View File

@@ -56,7 +56,6 @@ private Q_SLOTS:
void removeFromSelection() override;
protected:
bool event(QEvent* e) override;
void changeEvent(QEvent* e) override;
void clearButtons(const SelectionChangeModes notThis) override;

5
src/Mod/Fem/Gui/TaskFemConstraintRigidBody.cpp
View File

@@ -619,11 +619,6 @@ std::vector<std::string> TaskFemConstraintRigidBody::getRotationalMode() const
return rotModes;
}
bool TaskFemConstraintRigidBody::event(QEvent* e)
{
return TaskFemConstraint::KeyEvent(e);
}
void TaskFemConstraintRigidBody::changeEvent(QEvent*)
{}

1
src/Mod/Fem/Gui/TaskFemConstraintRigidBody.h
View File

@@ -66,7 +66,6 @@ private Q_SLOTS:
void onRefNodeZChanged(double);
protected:
bool event(QEvent* e) override;
void changeEvent(QEvent* e) override;
void clearButtons(const SelectionChangeModes notThis) override;

5
src/Mod/Fem/Gui/TaskFemConstraintSpring.cpp
View File

@@ -270,11 +270,6 @@ std::string TaskFemConstraintSpring::getElmerStiffness() const
return Base::Tools::toStdString(ui->ElmerStiffnessCB->currentText());
}
bool TaskFemConstraintSpring::event(QEvent* e)
{
return TaskFemConstraint::KeyEvent(e);
}
void TaskFemConstraintSpring::changeEvent(QEvent*)
{}

1
src/Mod/Fem/Gui/TaskFemConstraintSpring.h
View File

@@ -54,7 +54,6 @@ private Q_SLOTS:
void removeFromSelection() override;
protected:
bool event(QEvent* e) override;
void changeEvent(QEvent* e) override;
void clearButtons(const SelectionChangeModes notThis) override;

5
src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp
View File

@@ -319,11 +319,6 @@ std::string TaskFemConstraintTemperature::get_constraint_type() const
return ui->cb_constr_type->currentText().toStdString();
}
bool TaskFemConstraintTemperature::event(QEvent* e)
{
return TaskFemConstraint::KeyEvent(e);
}
void TaskFemConstraintTemperature::changeEvent(QEvent*)
{
// TaskBox::changeEvent(e);

1
src/Mod/Fem/Gui/TaskFemConstraintTemperature.h
View File

@@ -62,7 +62,6 @@ private Q_SLOTS:
void removeFromSelection() override;
protected:
bool event(QEvent* e) override;
void changeEvent(QEvent* e) override;
void clearButtons(const SelectionChangeModes notThis) override;

5
src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp
View File

@@ -555,11 +555,6 @@ std::string TaskFemConstraintTransform::get_transform_type() const
return transform;
}
bool TaskFemConstraintTransform::event(QEvent* e)
{
return TaskFemConstraint::KeyEvent(e);
}
void TaskFemConstraintTransform::changeEvent(QEvent*)
{}

1
src/Mod/Fem/Gui/TaskFemConstraintTransform.h
View File

@@ -63,7 +63,6 @@ private Q_SLOTS:
void angleChanged(double a);
protected:
bool event(QEvent* e) override;
void changeEvent(QEvent* e) override;
const QString makeText(const App::DocumentObject* obj) const;