Fix wrong blockSignals() assignment.

Before this fix, some UI children widgets did emit signals, so there was useless signals, and a useless callback by the connected QWidget. Now, all the QWidget's signals are blocked, especially those emited by the QWidget's children. This bugfix should significantly reduce the QEvent's load.

Author: setvisible

src/widgets/appliedloadwidget.cpp

@@ -69,12 +69,17 @@ Tensor AppliedLoadWidget::appliedLoad() const
 
 void AppliedLoadWidget::setAppliedLoad(const Tensor &appliedLoad)
 {
- bool blocked = this->signalsBlocked();
- this->blockSignals(true);
+ bool fx_blocked = ui->fx->blockSignals(true);
+ bool fy_blocked = ui->fy->blockSignals(true);
+ bool tz_blocked = ui->tz->blockSignals(true);
+
  ui->fx->setValue( appliedLoad.force_x.value() );
  ui->fy->setValue( appliedLoad.force_y.value() );
  ui->tz->setValue( appliedLoad.torque_z.value() );
- this->blockSignals(blocked);
+
+ ui->fx->blockSignals(fx_blocked);
+ ui->fy->blockSignals(fy_blocked);
+ ui->tz->blockSignals(tz_blocked);
 
  model()->setAppliedLoad(appliedLoad);
 }

src/widgets/designvariablewidget.cpp

@@ -162,7 +162,10 @@ void DesignVariableWidget::updateSelection()
  Q_ASSERT(!m_tableTimer->isActive());
  m_selectionTimer->stop();
 
- bool blocked = ui->tableWidget->blockSignals(true);
+ bool blocked1 = ui->tableWidget->blockSignals(true);
+ bool blocked2 = m_selectionTimer->blockSignals(true);
+ bool blocked3 = m_tableTimer->blockSignals(true);
+
  QSet<int> set = model()->selectedFastenerIndexes();
  int row = ui->tableWidget->rowCount();
  while (row>0) {
@@ -172,5 +175,8 @@ void DesignVariableWidget::updateSelection()
  ui->tableWidget->item(row, col)->setSelected( selected );
  }
  }
- ui->tableWidget->blockSignals(blocked);
+
+ ui->tableWidget->blockSignals(blocked1);
+ m_selectionTimer->blockSignals(blocked2);
+ m_tableTimer->blockSignals(blocked3);
 }

src/widgets/fastenertablewidget.cpp

@@ -174,7 +174,10 @@ void FastenerTableWidget::updateSelection()
  Q_ASSERT(!m_tableTimer->isActive());
  m_selectionTimer->stop();
 
- bool blocked = ui->tableWidget->blockSignals(true);
+ bool blocked1 = ui->tableWidget->blockSignals(true);
+ bool blocked2 = m_selectionTimer->blockSignals(true);
+ bool blocked3 = m_tableTimer->blockSignals(true);
+
  QSet<int> set = model()->selectedFastenerIndexes();
  int row = ui->tableWidget->rowCount();
  while (row>0) {
@@ -184,5 +187,8 @@ void FastenerTableWidget::updateSelection()
  ui->tableWidget->item(row, col)->setSelected( selected );
  }
  }
- ui->tableWidget->blockSignals(blocked);
+
+ ui->tableWidget->blockSignals(blocked1);
+ m_selectionTimer->blockSignals(blocked2);
+ m_tableTimer->blockSignals(blocked3);
 }

src/widgets/fastenerwidget.cpp

@@ -144,16 +144,29 @@ Fastener FastenerWidget::fastener() const
 
 void FastenerWidget::setFastener(const Fastener &fastener)
 {
- bool blocked = this->signalsBlocked();
- this->blockSignals(true);
+ bool blocked_nameEdit = ui->nameEdit->blockSignals(true);
+ bool blocked_positionX = ui->positionX->blockSignals(true);
+ bool blocked_positionY = ui->positionY->blockSignals(true);
+ bool blocked_thickness = ui->thickness->blockSignals(true);
+ bool blocked_diameter = ui->diameter->blockSignals(true);
+ bool blocked_dof_X = ui->dof_X->blockSignals(true);
+ bool blocked_dof_Y = ui->dof_Y->blockSignals(true);
+
  ui->nameEdit->setText( fastener.name );
  ui->positionX->setValue( fastener.positionX.value() *1000); // mm !
  ui->positionY->setValue( fastener.positionY.value() *1000); // mm !
  ui->thickness->setValue( fastener.thickness.value() *1000); // mm !
  ui->diameter->setValue( fastener.diameter.value() *1000); // mm !
  ui->dof_X->setChecked( Fastener::DOFtoBool( fastener.DoF_X ));
  ui->dof_Y->setChecked( Fastener::DOFtoBool( fastener.DoF_Y ));
- this->blockSignals(blocked);
+
+ ui->nameEdit->blockSignals(blocked_nameEdit);
+ ui->positionX->blockSignals(blocked_positionX);
+ ui->positionY->blockSignals(blocked_positionY);
+ ui->thickness->blockSignals(blocked_thickness);
+ ui->diameter->blockSignals(blocked_diameter);
+ ui->dof_X->blockSignals(blocked_dof_X);
+ ui->dof_Y->blockSignals(blocked_dof_Y);
 
  model()->setFastener(m_currentIndex, fastener);
 }

src/widgets/resultwidget.cpp

@@ -119,7 +119,10 @@ void ResultWidget::updateSelection()
  Q_ASSERT(!m_resultTimer->isActive());
  m_selectionTimer->stop();
 
- bool blocked = ui->tableWidget->blockSignals(true);
+ bool blocked1 = ui->tableWidget->blockSignals(true);
+ bool blocked2 = m_selectionTimer->blockSignals(true);
+ bool blocked3 = m_resultTimer->blockSignals(true);
+
  QSet<int> set = model()->selectedFastenerIndexes();
  int row = ui->tableWidget->rowCount();
  while (row>0) {
@@ -129,7 +132,10 @@ void ResultWidget::updateSelection()
  ui->tableWidget->item(row, col)->setSelected( selected );
  }
  }
- ui->tableWidget->blockSignals(blocked);
+
+ ui->tableWidget->blockSignals(blocked1);
+ m_selectionTimer->blockSignals(blocked2);
+ m_resultTimer->blockSignals(blocked3);
 }