kindred/create
1
1
Fork 0
Code Issues 51 Pull Requests 1 Actions 4 Packages Projects 9 Releases 2 Wiki Activity

[FEM] FemResult* to end: remove unused includes

Browse Source 
- also sort includes
This commit is contained in:
Uwe
2022-10-03 03:42:22 +02:00
parent 4fd3612c1c
commit ae14c761e6
12 changed files with 67 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/Mod/Fem/App/AppFem.cpp
View File

@@ -22,25 +22,13 @@
#include "PreCompiled.h"
#include <SMESH_Version.h>
#include <Base/Console.h>
#include <Base/Interpreter.h>
#include <CXX/Extensions.hxx>
#include <SMESH_Version.h>
#include "FemMeshPy.h"
#include "FemMesh.h"
#include "FemMeshProperty.h"
#include "FemAnalysis.h"
#include "FemMeshObject.h"
#include "FemMeshShapeObject.h"
#include "FemMeshShapeNetgenObject.h"
#include "FemSetElementsObject.h"
#include "FemSetFacesObject.h"
#include "FemSetGeometryObject.h"
#include "FemSetNodesObject.h"
#include "HypothesisPy.h"
#include "FemConstraintBearing.h"
#include "FemConstraintFixed.h"
#include "FemConstraintForce.h"
@@ -56,17 +44,28 @@
#include "FemConstraintFluidBoundary.h"
#include "FemConstraintTransform.h"
#include "FemConstraintSpring.h"
#include "FemMesh.h"
#include "FemMeshObject.h"
#include "FemMeshProperty.h"
#include "FemMeshPy.h"
#include "FemMeshShapeObject.h"
#include "FemMeshShapeNetgenObject.h"
#include "FemResultObject.h"
#include "FemSetElementsObject.h"
#include "FemSetFacesObject.h"
#include "FemSetGeometryObject.h"
#include "FemSetNodesObject.h"
#include "FemSolverObject.h"
#include "HypothesisPy.h"
#ifdef FC_USE_VTK
#include "FemPostPipeline.h"
#include "FemPostFilter.h"
#include "FemPostFunction.h"
#include "PropertyPostDataObject.h"
# include "FemPostFilter.h"
# include "FemPostFunction.h"
# include "FemPostPipeline.h"
# include "PropertyPostDataObject.h"
#endif
namespace Fem {
extern PyObject* initModule();
}

2
src/Mod/Fem/App/FemResultObject.cpp
View File

@@ -22,8 +22,8 @@
#include "PreCompiled.h"
#include <App/FeaturePythonPyImp.h>
#include <App/DocumentObjectPy.h>
#include <App/FeaturePythonPyImp.h>
#include "FemResultObject.h"

1
src/Mod/Fem/App/FemResultObject.h
View File

@@ -24,7 +24,6 @@
#define Fem_FemResultObject_H
#include <App/DocumentObject.h>
#include <App/PropertyStandard.h>
#include <App/FeaturePython.h>
#include <Mod/Fem/FemGlobal.h>

6
src/Mod/Fem/App/FemSetElementsObject.cpp
View File

@@ -20,14 +20,12 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
#endif
#include <App/DocumentObjectPy.h>
#include "FemSetElementsObject.h"
#include <App/DocumentObjectPy.h>
using namespace Fem;
using namespace App;

7
src/Mod/Fem/App/FemSetFacesObject.cpp
View File

@@ -20,15 +20,12 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
#endif
#include <App/DocumentObjectPy.h>
#include "FemSetFacesObject.h"
#include <App/DocumentObjectPy.h>
#include <Base/Placement.h>
using namespace Fem;
using namespace App;

8
src/Mod/Fem/App/FemSetGeometryObject.cpp
View File

@@ -20,15 +20,11 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
#endif
#include "FemSetGeometryObject.h"
#include <App/DocumentObjectPy.h>
#include <Base/Placement.h>
#include "FemSetGeometryObject.h"
using namespace Fem;
using namespace App;

7
src/Mod/Fem/App/FemSetNodesObject.cpp
View File

@@ -20,15 +20,12 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
#endif
#include <App/DocumentObjectPy.h>
#include "FemSetNodesObject.h"
#include <App/DocumentObjectPy.h>
#include <Base/Placement.h>
using namespace Fem;
using namespace App;

8
src/Mod/Fem/App/FemSetObject.cpp
View File

@@ -20,15 +20,11 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
#endif
#include "FemSetObject.h"
#include <App/DocumentObjectPy.h>
#include <Base/Placement.h>
#include "FemSetObject.h"
using namespace Fem;
using namespace App;

7
src/Mod/Fem/App/FemSolverObject.cpp
View File

@@ -21,15 +21,12 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
#endif
#include <App/DocumentObjectPy.h>
#include <App/FeaturePythonPyImp.h>
#include "FemSolverObject.h"
#include <App/FeaturePythonPyImp.h>
#include <App/DocumentObjectPy.h>
using namespace Fem;

12
src/Mod/Fem/App/FemTools.cpp
View File

@@ -21,19 +21,18 @@
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <BRepAdaptor_Curve.hxx>
# include <BRepAdaptor_Surface.hxx>
# include <gp_Dir.hxx>
# include <gp_Lin.hxx>
# include <gp_Pln.hxx>
# include <gp_Vec.hxx>
# include <ElCLib.hxx>
# include <ElSLib.hxx>
# include <Geom_BezierCurve.hxx>
# include <Geom_BezierSurface.hxx>
# include <Geom_BSplineCurve.hxx>
# include <Geom_BSplineSurface.hxx>
# include <gp_Dir.hxx>
# include <gp_Lin.hxx>
# include <gp_Pln.hxx>
# include <gp_Vec.hxx>
# include <Precision.hxx>
# include <TColgp_Array2OfPnt.hxx>
# include <TopoDS.hxx>
@@ -44,6 +43,7 @@
#include "FemTools.h"
Base::Vector3d Fem::Tools::getDirectionFromShape(const TopoDS_Shape& shape)
{
gp_XYZ dir(0, 0, 0);

59
src/Mod/Fem/App/FemVTKTools.cpp
View File

@@ -24,73 +24,52 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <Python.h>
# include <cstdlib>
# include <memory>
# include <cmath>
# include <cstdlib>
# include <map>
# include <memory>
# include <Bnd_Box.hxx>
# include <BRep_Tool.hxx>
# include <BRepBndLib.hxx>
# include <BRepExtrema_DistShapeShape.hxx>
# include <TopoDS_Vertex.hxx>
# include <BRepBuilderAPI_MakeVertex.hxx>
# include <gp_Pnt.hxx>
# include <TopoDS_Face.hxx>
# include <TopoDS_Solid.hxx>
# include <TopoDS_Shape.hxx>
# include <SMESH_Gen.hxx>
# include <SMESH_Mesh.hxx>
# include <SMDS_VolumeTool.hxx>
# include <SMESHDS_Mesh.hxx>
# include <vtkDataSetReader.h>
# include <vtkDataSetWriter.h>
# include <vtkStructuredGrid.h>
# include <vtkImageData.h>
# include <vtkRectilinearGrid.h>
# include <vtkUnstructuredGrid.h>
# include <vtkXMLUnstructuredGridReader.h>
# include <vtkXMLPUnstructuredGridReader.h>
# include <vtkXMLUnstructuredGridWriter.h>
# include <vtkPointData.h>
# include <vtkCellData.h>
# include <vtkCellArray.h>
# include <vtkDataArray.h>
# include <vtkDataSetReader.h>
# include <vtkDataSetWriter.h>
# include <vtkDoubleArray.h>
# include <vtkHexahedron.h>
# include <vtkIdList.h>
# include <vtkCellTypes.h>
# include <vtkTriangle.h>
# include <vtkPointData.h>
# include <vtkPyramid.h>
# include <vtkQuad.h>
# include <vtkQuadraticTriangle.h>
# include <vtkQuadraticQuad.h>
# include <vtkTetra.h>
# include <vtkPyramid.h>
# include <vtkWedge.h>
# include <vtkHexahedron.h>
# include <vtkQuadraticTetra.h>
# include <vtkQuadraticPyramid.h>
# include <vtkQuadraticWedge.h>
# include <vtkQuadraticHexahedron.h>
# include <vtkTetra.h>
# include <vtkTriangle.h>
# include <vtkUnstructuredGrid.h>
# include <vtkWedge.h>
# include <vtkXMLPUnstructuredGridReader.h>
# include <vtkXMLUnstructuredGridReader.h>
# include <vtkXMLUnstructuredGridWriter.h>
#endif
#include <Base/FileInfo.h>
#include <Base/TimeInfo.h>
#include <Base/Console.h>
#include <Base/Type.h>
#include <Base/Parameter.h>
#include <App/Application.h>
#include <App/Document.h>
#include <App/DocumentObject.h>
#include <Base/Console.h>
#include <Base/FileInfo.h>
#include <Base/TimeInfo.h>
#include <Base/Type.h>
#include "FemVTKTools.h"
#include "FemMeshProperty.h"
#include "FemAnalysis.h"
#include "FemResultObject.h"
namespace Fem
{

23
src/Mod/Fem/App/HypothesisPy.cpp
View File

@@ -21,56 +21,55 @@
***************************************************************************/
#include "PreCompiled.h"
#include "HypothesisPy.h"
#ifndef _PreComp_
# include <sstream>
# include <StdMeshers_Arithmetic1D.hxx>
# include <StdMeshers_AutomaticLength.hxx>
# include <StdMeshers_MaxLength.hxx>
# include <StdMeshers_LocalLength.hxx>
# include <StdMeshers_MaxElementArea.hxx>
# include <StdMeshers_NotConformAllowed.hxx>
# include <StdMeshers_QuadranglePreference.hxx>
# include <StdMeshers_Quadrangle_2D.hxx>
# include <StdMeshers_Regular_1D.hxx>
# include <StdMeshers_UseExisting_1D2D.hxx>
# include <StdMeshers_CompositeSegment_1D.hxx>
# include <StdMeshers_Deflection1D.hxx>
# include <StdMeshers_Hexa_3D.hxx>
# include <StdMeshers_LayerDistribution.hxx>
# include <StdMeshers_LengthFromEdges.hxx>
# include <StdMeshers_LocalLength.hxx>
# include <StdMeshers_MaxElementArea.hxx>
# include <StdMeshers_MaxElementVolume.hxx>
# include <StdMeshers_MaxLength.hxx>
# include <StdMeshers_MEFISTO_2D.hxx>
# include <StdMeshers_NotConformAllowed.hxx>
# include <StdMeshers_NumberOfLayers.hxx>
# include <StdMeshers_NumberOfSegments.hxx>
# include <StdMeshers_Prism_3D.hxx>
# include <StdMeshers_Projection_1D.hxx>
# include <StdMeshers_Projection_2D.hxx>
# include <StdMeshers_Projection_3D.hxx>
# include <StdMeshers_Quadrangle_2D.hxx>
# include <StdMeshers_QuadraticMesh.hxx>
# include <StdMeshers_QuadranglePreference.hxx>
# include <StdMeshers_RadialPrism_3D.hxx>
# include <StdMeshers_Regular_1D.hxx>
# include <StdMeshers_SegmentAroundVertex_0D.hxx>
# include <StdMeshers_ProjectionSource1D.hxx>
# include <StdMeshers_ProjectionSource2D.hxx>
# include <StdMeshers_ProjectionSource3D.hxx>
# include <StdMeshers_SegmentLengthAroundVertex.hxx>
# include <StdMeshers_StartEndLength.hxx>
# include <StdMeshers_CompositeHexa_3D.hxx>
# include <StdMeshers_UseExisting_1D2D.hxx>
# if SMESH_VERSION_MAJOR < 7
# include <StdMeshers_TrianglePreference.hxx>
# endif
#endif
#include "FemMeshPy.h"
#include <Base/Interpreter.h>
#include <Mod/Part/App/TopoShapePy.h>
#include "HypothesisPy.h"
#include "FemMeshPy.h"
using namespace Fem;
HypothesisPy::HypothesisPy(std::shared_ptr<SMESH_Hypothesis> h)
: hyp(h)
{