From 91d7e0b8960bca0d7d13694b93cdac7c1c1c5ff6 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Sun, 10 Jul 2022 17:14:45 +0200
Subject: [PATCH] [FEM] fix CCX multi-threading bug

- in the preferences one could specify more CPU cores than available

- also correct a label sine the number of cores are since FC 0.20 used for all CCX solver runs

- also remove unnecessary (doubled) slots from the UI file
---
 src/Mod/Fem/Gui/DlgSettingsFemCcx.ui     | 71 ++----------------------
 src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp |  8 +++
 2 files changed, 13 insertions(+), 66 deletions(-)

diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
index b469faff1d..5c746a293f 100644
--- a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
+++ b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>425</width>
-    <height>640</height>
+    <height>642</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -291,7 +291,7 @@
         <item row="0" column="0">
          <widget class="QLabel" name="l_ccx_numcpu">
           <property name="text">
-           <string>Number of CPU's to use (Spooles only)</string>
+           <string>Number of CPU's to use</string>
           </property>
          </widget>
         </item>
@@ -434,6 +434,9 @@
         </item>
         <item row="5" column="2">
          <widget class="Gui::PrefDoubleSpinBox" name="dsb_ccx_initial_time_step">
+          <property name="contextMenuPolicy">
+           <enum>Qt::DefaultContextMenu</enum>
+          </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
@@ -786,38 +789,6 @@
   <include location="Resources/Fem.qrc"/>
  </resources>
  <connections>
-  <connection>
-   <sender>cb_int_editor</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>l_ext_editor</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>406</x>
-     <y>65</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>148</x>
-     <y>88</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>cb_int_editor</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>fc_ext_editor</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>406</x>
-     <y>65</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>406</x>
-     <y>88</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>cb_int_editor</sender>
    <signal>toggled(bool)</signal>
@@ -850,38 +821,6 @@
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>cb_ccx_binary_std</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>l_ccx_binary_path</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>406</x>
-     <y>45</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>148</x>
-     <y>68</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>cb_ccx_binary_std</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>fc_ccx_binary_path</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>406</x>
-     <y>45</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>406</x>
-     <y>68</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>cb_ccx_binary_std</sender>
    <signal>toggled(bool)</signal>
diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp b/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp
index defb261e8a..f3f5b5ff30 100644
--- a/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp
+++ b/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp
@@ -24,6 +24,9 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
+#ifndef _PreComp_
+# include <thread>
+#endif
 
 #include <Gui/Application.h>
 
@@ -41,6 +44,11 @@ DlgSettingsFemCcxImp::DlgSettingsFemCcxImp(QWidget* parent)
     // set ranges
     ui->dsb_ccx_analysis_time->setMaximum(FLOAT_MAX);
     ui->dsb_ccx_initial_time_step->setMaximum(FLOAT_MAX);
+    // determine number of CPU cores
+    auto processor_count = std::thread::hardware_concurrency();
+    // hardware check might fail and then returns 0
+    if (processor_count > 0)
+        ui->sb_ccx_numcpu->setMaximum(processor_count);
 }
 
 DlgSettingsFemCcxImp::~DlgSettingsFemCcxImp()