From f60ca91e83b76acd539618305716271b00f6c62e Mon Sep 17 00:00:00 2001 From: donovaly Date: Fri, 21 Feb 2020 03:03:15 +0100 Subject: [PATCH] [FEM] fix special Dlg issue with deletion - if an existing constraint has only one item, the item could under some circumstances not be deleted by pressing Del --- src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp | 2 ++ src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp | 2 ++ src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp | 4 ++-- src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp | 2 ++ src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp | 2 ++ src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp | 5 ++--- src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp | 2 ++ 7 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp b/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp index f8f41daeba..9bfbac6908 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp @@ -73,6 +73,8 @@ TaskFemConstraintDisplacement::TaskFemConstraintDisplacement(ViewProviderFemCons connect(ui->lw_references, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), this, SLOT(setSelection(QListWidgetItem*))); + connect(ui->lw_references, SIGNAL(itemClicked(QListWidgetItem*)), + this, SLOT(setSelection(QListWidgetItem*))); this->groupLayout()->addWidget(proxy); diff --git a/src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp b/src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp index 1cf997236f..3953f5c7ff 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp @@ -71,6 +71,8 @@ TaskFemConstraintFixed::TaskFemConstraintFixed(ViewProviderFemConstraintFixed *C connect(ui->lw_references, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), this, SLOT(setSelection(QListWidgetItem*))); + connect(ui->lw_references, SIGNAL(itemClicked(QListWidgetItem*)), + this, SLOT(setSelection(QListWidgetItem*))); this->groupLayout()->addWidget(proxy); diff --git a/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp b/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp index cf30e2b5d8..5ba853e8c8 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp @@ -79,6 +79,8 @@ TaskFemConstraintHeatflux::TaskFemConstraintHeatflux(ViewProviderFemConstraintHe // this, SLOT(onFaceTempChanged(double))); connect(ui->if_filmcoef, SIGNAL(valueChanged(double)), this, SLOT(onFilmCoefChanged(double))); + connect(ui->lw_references, SIGNAL(itemClicked(QListWidgetItem*)), + this, SLOT(setSelection(QListWidgetItem*))); this->groupLayout()->addWidget(proxy); @@ -136,8 +138,6 @@ TaskFemConstraintHeatflux::TaskFemConstraintHeatflux(ViewProviderFemConstraintHe ui->btnAdd->blockSignals(false); ui->btnRemove->blockSignals(false); - - updateUI(); } diff --git a/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp b/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp index aab8837566..0dd5eb8a1b 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp @@ -83,6 +83,8 @@ TaskFemConstraintPlaneRotation::TaskFemConstraintPlaneRotation(ViewProviderFemCo connect(ui->lw_references, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), this, SLOT(setSelection(QListWidgetItem*))); + connect(ui->lw_references, SIGNAL(itemClicked(QListWidgetItem*)), + this, SLOT(setSelection(QListWidgetItem*))); this->groupLayout()->addWidget(proxy); diff --git a/src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp b/src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp index 49e98ab26f..9232d47bef 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp @@ -73,6 +73,8 @@ TaskFemConstraintPressure::TaskFemConstraintPressure(ViewProviderFemConstraintPr connect(ui->lw_references, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), this, SLOT(setSelection(QListWidgetItem*))); + connect(ui->lw_references, SIGNAL(itemClicked(QListWidgetItem*)), + this, SLOT(setSelection(QListWidgetItem*))); connect(ui->checkBoxReverse, SIGNAL(toggled(bool)), this, SLOT(onCheckReverse(bool))); diff --git a/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp b/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp index 838411b639..03bd21cbad 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp @@ -49,9 +49,6 @@ #include "ui_TaskFemConstraintTemperature.h" #include #include - - - #include #include @@ -75,6 +72,8 @@ TaskFemConstraintTemperature::TaskFemConstraintTemperature(ViewProviderFemConstr connect(ui->lw_references, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), this, SLOT(setSelection(QListWidgetItem*))); + connect(ui->lw_references, SIGNAL(itemClicked(QListWidgetItem*)), + this, SLOT(setSelection(QListWidgetItem*))); connect(ui->rb_temperature, SIGNAL(clicked(bool)), this, SLOT(Temp())); connect(ui->rb_cflux, SIGNAL(clicked(bool)), this, SLOT(Flux())); diff --git a/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp b/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp index e3d2da22ba..ad25e0ba83 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp @@ -79,6 +79,8 @@ TaskFemConstraintTransform::TaskFemConstraintTransform(ViewProviderFemConstraint connect(ui->lw_Rect, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), this, SLOT(setSelection(QListWidgetItem*))); + connect(ui->lw_Rect, SIGNAL(itemClicked(QListWidgetItem*)), + this, SLOT(setSelection(QListWidgetItem*))); this->groupLayout()->addWidget(proxy);