From 4ed99e2f999b653aead293230f5c6e0fbbd5ec3c Mon Sep 17 00:00:00 2001 From: Uwe Date: Mon, 3 Oct 2022 04:41:35 +0200 Subject: [PATCH] [FEM] Task*: remove unused includes - also sort includes --- src/Mod/Fem/Gui/TaskAnalysisInfo.cpp | 13 ++------- src/Mod/Fem/Gui/TaskAnalysisInfo.h | 1 - src/Mod/Fem/Gui/TaskCreateNodeSet.cpp | 32 +++++++++------------- src/Mod/Fem/Gui/TaskDlgAnalysis.cpp | 12 ++------ src/Mod/Fem/Gui/TaskDlgCreateNodeSet.cpp | 11 ++------ src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.cpp | 10 ++----- src/Mod/Fem/Gui/TaskDriver.cpp | 19 ++----------- src/Mod/Fem/Gui/TaskObjectName.cpp | 15 +++------- src/Mod/Fem/Gui/TaskObjectName.h | 2 -- src/Mod/Fem/Gui/TaskPostBoxes.cpp | 4 +-- src/Mod/Fem/Gui/TaskPostBoxes.h | 1 - src/Mod/Fem/Gui/TaskTetParameter.cpp | 30 +++++--------------- 12 files changed, 39 insertions(+), 111 deletions(-) diff --git a/src/Mod/Fem/Gui/TaskAnalysisInfo.cpp b/src/Mod/Fem/Gui/TaskAnalysisInfo.cpp index b9c29a973d..a90419d2ae 100644 --- a/src/Mod/Fem/Gui/TaskAnalysisInfo.cpp +++ b/src/Mod/Fem/Gui/TaskAnalysisInfo.cpp @@ -21,19 +21,12 @@ ***************************************************************************/ #include "PreCompiled.h" -#ifndef _PreComp_ -# include -# include -# include -#endif - -#include "ui_TaskAnalysisInfo.h" -#include "TaskAnalysisInfo.h" -#include -#include #include +#include "TaskAnalysisInfo.h" +#include "ui_TaskAnalysisInfo.h" + using namespace FemGui; using namespace Gui; diff --git a/src/Mod/Fem/Gui/TaskAnalysisInfo.h b/src/Mod/Fem/Gui/TaskAnalysisInfo.h index 6d48f3db5a..2f63e814c4 100644 --- a/src/Mod/Fem/Gui/TaskAnalysisInfo.h +++ b/src/Mod/Fem/Gui/TaskAnalysisInfo.h @@ -24,7 +24,6 @@ #define FEMGUI_TaskAnalysisInfo_H #include -#include class Ui_TaskAnalysisInfo; diff --git a/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp b/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp index bc07cd08a1..4f03e68787 100644 --- a/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp +++ b/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp @@ -20,39 +20,33 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ -# include -# include - -# include - -# include -# include # include +# include +# include # include # include -# include +# include #endif -#include "ui_TaskCreateNodeSet.h" -#include "TaskCreateNodeSet.h" -#include -#include -#include -#include -#include #include +#include +#include +#include +#include #include #include -#include - +#include +#include #include #include -#include "ViewProviderFemMesh.h" + +#include "TaskCreateNodeSet.h" +#include "ui_TaskCreateNodeSet.h" #include "FemSelectionGate.h" +#include "ViewProviderFemMesh.h" using namespace FemGui; diff --git a/src/Mod/Fem/Gui/TaskDlgAnalysis.cpp b/src/Mod/Fem/Gui/TaskDlgAnalysis.cpp index cc182acf6a..7787db39c3 100644 --- a/src/Mod/Fem/Gui/TaskDlgAnalysis.cpp +++ b/src/Mod/Fem/Gui/TaskDlgAnalysis.cpp @@ -20,30 +20,22 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -#endif - -#include "TaskDlgAnalysis.h" - #include #include -#include #include -#include #include - +#include #include +#include "TaskDlgAnalysis.h" #include "TaskAnalysisInfo.h" #include "TaskDriver.h" using namespace FemGui; - //************************************************************************** //************************************************************************** // TaskDialog diff --git a/src/Mod/Fem/Gui/TaskDlgCreateNodeSet.cpp b/src/Mod/Fem/Gui/TaskDlgCreateNodeSet.cpp index 52b963ef99..9e32a5dfbd 100644 --- a/src/Mod/Fem/Gui/TaskDlgCreateNodeSet.cpp +++ b/src/Mod/Fem/Gui/TaskDlgCreateNodeSet.cpp @@ -20,20 +20,15 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -#endif - -#include "TaskDlgCreateNodeSet.h" - #include #include -#include #include -#include #include +#include + +#include "TaskDlgCreateNodeSet.h" #include "ViewProviderFemMesh.h" diff --git a/src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.cpp b/src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.cpp index fb09d6949a..50582bc629 100644 --- a/src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.cpp +++ b/src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.cpp @@ -20,32 +20,28 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # include #endif -#include "TaskDlgMeshShapeNetgen.h" - #include #include -#include #include #include #include #include #include +#include +#include "TaskDlgMeshShapeNetgen.h" +#include "TaskTetParameter.h" #include "ViewProviderFemMeshShapeNetgen.h" -#include -#include "TaskTetParameter.h" using namespace FemGui; - //************************************************************************** //************************************************************************** // TaskDialog diff --git a/src/Mod/Fem/Gui/TaskDriver.cpp b/src/Mod/Fem/Gui/TaskDriver.cpp index 37a991eddf..aa02097a3b 100644 --- a/src/Mod/Fem/Gui/TaskDriver.cpp +++ b/src/Mod/Fem/Gui/TaskDriver.cpp @@ -21,24 +21,11 @@ ***************************************************************************/ #include "PreCompiled.h" -#ifndef _PreComp_ -# include -# include -# include -#endif - -#include "ui_TaskDriver.h" -#include "TaskDriver.h" -#include -#include #include -#include -#include -#include -#include -#include -#include + +#include "TaskDriver.h" +#include "ui_TaskDriver.h" using namespace FemGui; diff --git a/src/Mod/Fem/Gui/TaskObjectName.cpp b/src/Mod/Fem/Gui/TaskObjectName.cpp index 4109ebc6c6..f5e6370735 100644 --- a/src/Mod/Fem/Gui/TaskObjectName.cpp +++ b/src/Mod/Fem/Gui/TaskObjectName.cpp @@ -20,25 +20,18 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # include -# include #endif - -#include "ui_TaskObjectName.h" -#include "TaskObjectName.h" -#include -#include #include #include -#include -#include -#include -#include +#include + +#include "TaskObjectName.h" +#include "ui_TaskObjectName.h" using namespace FemGui; diff --git a/src/Mod/Fem/Gui/TaskObjectName.h b/src/Mod/Fem/Gui/TaskObjectName.h index 39c0369eda..181dbdd1c1 100644 --- a/src/Mod/Fem/Gui/TaskObjectName.h +++ b/src/Mod/Fem/Gui/TaskObjectName.h @@ -20,14 +20,12 @@ * * ***************************************************************************/ - #ifndef GUI_TASKVIEW_TaskObjectName_H #define GUI_TASKVIEW_TaskObjectName_H #include - class Ui_TaskObjectName; namespace App { diff --git a/src/Mod/Fem/Gui/TaskPostBoxes.cpp b/src/Mod/Fem/Gui/TaskPostBoxes.cpp index 4790bba647..f74cc9256a 100644 --- a/src/Mod/Fem/Gui/TaskPostBoxes.cpp +++ b/src/Mod/Fem/Gui/TaskPostBoxes.cpp @@ -32,7 +32,6 @@ # include # include -# include # include #endif @@ -58,9 +57,8 @@ #include "ui_TaskPostScalarClip.h" #include "ui_TaskPostWarpVector.h" -#include "FemSettings.h" #include "TaskPostBoxes.h" -#include "ViewProviderFemPostFilter.h" +#include "FemSettings.h" #include "ViewProviderFemPostFunction.h" #include "ViewProviderFemPostObject.h" diff --git a/src/Mod/Fem/Gui/TaskPostBoxes.h b/src/Mod/Fem/Gui/TaskPostBoxes.h index 38ace8c56c..9f10bffadd 100644 --- a/src/Mod/Fem/Gui/TaskPostBoxes.h +++ b/src/Mod/Fem/Gui/TaskPostBoxes.h @@ -23,7 +23,6 @@ #ifndef GUI_TASKVIEW_TaskPostDisplay_H #define GUI_TASKVIEW_TaskPostDisplay_H -#include #include #include #include diff --git a/src/Mod/Fem/Gui/TaskTetParameter.cpp b/src/Mod/Fem/Gui/TaskTetParameter.cpp index 1a50d93f9e..27b7725c0e 100644 --- a/src/Mod/Fem/Gui/TaskTetParameter.cpp +++ b/src/Mod/Fem/Gui/TaskTetParameter.cpp @@ -20,34 +20,22 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # include -# include - -# include #endif -#include "ui_TaskTetParameter.h" -#include "TaskTetParameter.h" -#include -#include #include -#include -#include -#include -#include -#include -#include -#include #include +#include + +#include "TaskTetParameter.h" +#include "ui_TaskTetParameter.h" using namespace FemGui; using namespace Gui; - TaskTetParameter::TaskTetParameter(Fem::FemMeshShapeNetgenObject *pcObject,QWidget *parent) : TaskBox(Gui::BitmapFactory().pixmap("FEM_CreateNodesSet"), tr("Tet Parameter"), @@ -94,11 +82,12 @@ TaskTetParameter::~TaskTetParameter() void TaskTetParameter::SwitchMethod(int Value) { - if(Value == 5){ + if (Value == 5) { ui->doubleSpinBox_GrowthRate->setEnabled(true); ui->spinBox_SegsPerEdge->setEnabled(true); ui->spinBox_SegsPerRadius->setEnabled(true); - }else{ + } + else { ui->doubleSpinBox_GrowthRate->setEnabled(false); ui->spinBox_SegsPerEdge->setEnabled(false); ui->spinBox_SegsPerRadius->setEnabled(false); @@ -151,15 +140,10 @@ void TaskTetParameter::setInfo() { Fem::FemMesh::FemMeshInfo info = pcObject->FemMesh.getValue().getInfo(); //Base::BoundBox3d bndBox = pcObject->FemMesh.getValue().getBoundBox(); - - ui->lineEdit_InfoNodes ->setText(QString::number(info.numNode)); ui->lineEdit_InfoTriangle ->setText(QString::number(info.numFaces)); ui->lineEdit_InfoTet ->setText(QString::number(info.numTetr)); } - - - #include "moc_TaskTetParameter.cpp"