From 1fcbe6095cd6d8bf82ff930157d425d7769b1d23 Mon Sep 17 00:00:00 2001 From: marioalexis Date: Fri, 21 Nov 2025 23:07:40 -0300 Subject: [PATCH 1/3] Fem: Remove unnecessary code from CalculiX preference page --- src/Mod/Fem/Gui/DlgSettingsFemCcx.ui | 6 ++++++ src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp | 24 ++---------------------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui index ac0346f146..b4d856a932 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui +++ b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui @@ -193,6 +193,9 @@ Default type on analysis + + 0 + AnalysisType @@ -352,6 +355,9 @@ false + + 0 + Solver diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp b/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp index 80791db602..687e57c6e9 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp +++ b/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp @@ -57,12 +57,6 @@ DlgSettingsFemCcxImp::~DlgSettingsFemCcxImp() = default; void DlgSettingsFemCcxImp::saveSettings() { - ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath( - "User parameter:BaseApp/Preferences/Mod/Fem/Ccx" - ); - hGrp->SetInt("Solver", ui->cmb_solver->currentIndex()); - hGrp->SetInt("AnalysisType", ui->cb_analysis_type->currentIndex()); - ui->sb_ccx_numcpu->onSave(); // Number of CPUs ui->cmb_solver->onSave(); ui->cb_ccx_non_lin_geom->onSave(); @@ -91,7 +85,6 @@ void DlgSettingsFemCcxImp::saveSettings() void DlgSettingsFemCcxImp::loadSettings() { - ui->sb_ccx_numcpu->onRestore(); // Number of CPUs ui->cmb_solver->onRestore(); ui->cb_ccx_non_lin_geom->onRestore(); ui->cb_use_iterations_param->onRestore(); @@ -116,22 +109,9 @@ void DlgSettingsFemCcxImp::loadSettings() ui->fc_ccx_binary_path->onRestore(); ui->cb_split_inp_writer->onRestore(); - ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath( - "User parameter:BaseApp/Preferences/Mod/Fem/Ccx" - ); - // determine number of CPU threads - int processor_count = hGrp->GetInt("AnalysisNumCPUs", QThread::idealThreadCount()); - ui->sb_ccx_numcpu->setValue(processor_count); - - int index = hGrp->GetInt("Solver", 0); - if (index > -1) { - ui->cmb_solver->setCurrentIndex(index); - } - index = hGrp->GetInt("AnalysisType", 0); - if (index > -1) { - ui->cb_analysis_type->setCurrentIndex(index); - } + ui->sb_ccx_numcpu->setValue(QThread::idealThreadCount()); + ui->sb_ccx_numcpu->onRestore(); // Number of CPUs } /** From ea27d96374c35063b566a9b7f4c940ee5b349a93 Mon Sep 17 00:00:00 2001 From: marioalexis Date: Fri, 21 Nov 2025 23:09:25 -0300 Subject: [PATCH 2/3] Fem: Remove unnecessary code from import/export INP preference page --- src/Mod/Fem/Gui/DlgSettingsFemExportAbaqus.ui | 3 +++ src/Mod/Fem/Gui/DlgSettingsFemExportAbaqusImp.cpp | 13 ------------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/Mod/Fem/Gui/DlgSettingsFemExportAbaqus.ui b/src/Mod/Fem/Gui/DlgSettingsFemExportAbaqus.ui index 2a170144aa..7cc8c0a2ab 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemExportAbaqus.ui +++ b/src/Mod/Fem/Gui/DlgSettingsFemExportAbaqus.ui @@ -45,6 +45,9 @@ not belonging to faces and faces not belonging to volumes. element parameter: All: all elements, Highest: highest elements only, FEM: FEM elements only (only edges not belonging to faces and faces not belonging to volumes) + + 2 + AbaqusElementChoice diff --git a/src/Mod/Fem/Gui/DlgSettingsFemExportAbaqusImp.cpp b/src/Mod/Fem/Gui/DlgSettingsFemExportAbaqusImp.cpp index 62f9fa351a..3f03082e1e 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemExportAbaqusImp.cpp +++ b/src/Mod/Fem/Gui/DlgSettingsFemExportAbaqusImp.cpp @@ -45,11 +45,6 @@ DlgSettingsFemExportAbaqusImp::~DlgSettingsFemExportAbaqusImp() = default; void DlgSettingsFemExportAbaqusImp::saveSettings() { - ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath( - "User parameter:BaseApp/Preferences/Mod/Fem/Abaqus" - ); - hGrp->SetInt("AbaqusElementChoice", ui->comboBoxElemChoiceParam->currentIndex()); - ui->comboBoxElemChoiceParam->onSave(); ui->checkBoxWriteGroups->onSave(); } @@ -58,14 +53,6 @@ void DlgSettingsFemExportAbaqusImp::loadSettings() { ui->comboBoxElemChoiceParam->onRestore(); ui->checkBoxWriteGroups->onRestore(); - - ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath( - "User parameter:BaseApp/Preferences/Mod/Fem/Abaqus" - ); - int index = hGrp->GetInt("AbaqusElementChoice", 2); - if (index > -1) { - ui->comboBoxElemChoiceParam->setCurrentIndex(index); - } } /** From ba174bdad5f1ffc76f4933215b9ba964c0f276b4 Mon Sep 17 00:00:00 2001 From: marioalexis Date: Fri, 21 Nov 2025 23:09:47 -0300 Subject: [PATCH 3/3] Fem: Remove unnecessary code from Z88 preference page --- src/Mod/Fem/Gui/DlgSettingsFemZ88.ui | 3 +++ src/Mod/Fem/Gui/DlgSettingsFemZ88Imp.cpp | 24 +----------------------- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/src/Mod/Fem/Gui/DlgSettingsFemZ88.ui b/src/Mod/Fem/Gui/DlgSettingsFemZ88.ui index 53c18dedbf..37719cdbb8 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemZ88.ui +++ b/src/Mod/Fem/Gui/DlgSettingsFemZ88.ui @@ -139,6 +139,9 @@ false + + 0 + Solver diff --git a/src/Mod/Fem/Gui/DlgSettingsFemZ88Imp.cpp b/src/Mod/Fem/Gui/DlgSettingsFemZ88Imp.cpp index 52d3de2f8b..4ff6c14d6e 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemZ88Imp.cpp +++ b/src/Mod/Fem/Gui/DlgSettingsFemZ88Imp.cpp @@ -52,15 +52,8 @@ DlgSettingsFemZ88Imp::~DlgSettingsFemZ88Imp() = default; void DlgSettingsFemZ88Imp::saveSettings() { ui->fc_z88_binary_path->onSave(); - - ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath( - "User parameter:BaseApp/Preferences/Mod/Fem/Z88" - ); - hGrp->SetInt("Solver", ui->cmb_solver->currentIndex()); ui->cmb_solver->onSave(); - hGrp->SetInt("MaxGS", ui->sb_Z88_MaxGS->value()); ui->sb_Z88_MaxGS->onSave(); - hGrp->SetInt("MaxKOI", ui->sb_Z88_MaxKOI->value()); ui->sb_Z88_MaxKOI->onSave(); } @@ -69,22 +62,7 @@ void DlgSettingsFemZ88Imp::loadSettings() ui->fc_z88_binary_path->onRestore(); ui->cmb_solver->onRestore(); ui->sb_Z88_MaxGS->onRestore(); - - ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath( - "User parameter:BaseApp/Preferences/Mod/Fem/Z88" - ); - int index = hGrp->GetInt("Solver", 0); - if (index > -1) { - ui->cmb_solver->setCurrentIndex(index); - } - int places = hGrp->GetInt("MaxGS", 100000000); - if (places > -1) { - ui->sb_Z88_MaxGS->setValue(places); - } - places = hGrp->GetInt("MaxKOI", 2800000); - if (places > -1) { - ui->sb_Z88_MaxKOI->setValue(places); - } + ui->sb_Z88_MaxKOI->onRestore(); } /**