From fd30a501b064129edb503dd0a9315844182b7da8 Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Fri, 24 Feb 2017 05:43:42 +0000 Subject: [PATCH] --- Geo/GModelIO_OCC.cpp | 2 ++ Geo/OCCFace.cpp | 35 +++++++++++++++++++---------------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/Geo/GModelIO_OCC.cpp b/Geo/GModelIO_OCC.cpp index ea042560c3..10e58ba090 100644 --- a/Geo/GModelIO_OCC.cpp +++ b/Geo/GModelIO_OCC.cpp @@ -66,10 +66,12 @@ #include <ShapeFix_Shape.hxx> #include <ShapeFix_Wireframe.hxx> #include <Standard_Version.hxx> +#include <TColgp_Array1OfPnt.hxx> #include <TopExp.hxx> #include <TopExp_Explorer.hxx> #include <TopTools_DataMapIteratorOfDataMapOfIntegerShape.hxx> #include <TopTools_DataMapIteratorOfDataMapOfShapeInteger.hxx> +#include <TopTools_ListIteratorOfListOfShape.hxx> #include <TopoDS.hxx> #include <gce_MakeCirc.hxx> #include <gce_MakeElips.hxx> diff --git a/Geo/OCCFace.cpp b/Geo/OCCFace.cpp index 44b3413454..09221aa666 100644 --- a/Geo/OCCFace.cpp +++ b/Geo/OCCFace.cpp @@ -16,22 +16,28 @@ #if defined(HAVE_OCC) -#include <Standard_Version.hxx> -#include <gp_Pln.hxx> +#include <BRepBndLib.hxx> +#include <BRepLProp_SLProps.hxx> +#include <BRepMesh_FastDiscret.hxx> +#include <BRep_Builder.hxx> #include <Bnd_Box.hxx> -#include <Geom_CylindricalSurface.hxx> -#include <Geom_ConicalSurface.hxx> +#include <GeomAPI_ProjectPointOnSurf.hxx> #include <Geom_BSplineSurface.hxx> -#include <Geom_SphericalSurface.hxx> -#include <Geom_ToroidalSurface.hxx> -#include <Geom_SurfaceOfRevolution.hxx> #include <Geom_BezierSurface.hxx> +#include <Geom_ConicalSurface.hxx> +#include <Geom_CylindricalSurface.hxx> #include <Geom_Plane.hxx> -#include <GeomAPI_ProjectPointOnSurf.hxx> -#include <BRepMesh_FastDiscret.hxx> -#include <BRepBndLib.hxx> -#include <BRepLProp_SLProps.hxx> -#include <BRep_Builder.hxx> +#include <Geom_SphericalSurface.hxx> +#include <Geom_SurfaceOfRevolution.hxx> +#include <Geom_ToroidalSurface.hxx> +#include <Poly_Triangulation.hxx> +#include <Poly_Triangle.hxx> +#include <ShapeAnalysis.hxx> +#include <Standard_Version.hxx> +#include <TopExp_Explorer.hxx> +#include <TopoDS.hxx> +#include <gp_Pln.hxx> + #if ((OCC_VERSION_MAJOR == 6) && (OCC_VERSION_MINOR >= 6)) || (OCC_VERSION_MAJOR >= 7) #if ((OCC_VERSION_MAJOR == 6) && (OCC_VERSION_MINOR < 8)) #include <BOPInt_Context.hxx> @@ -41,13 +47,10 @@ #include <BOPTools_AlgoTools2D.hxx> #include <BOPTools_AlgoTools.hxx> #else -#include <IntTools_Context.hxx> #include <BOPTools_Tools2D.hxx> #include <BOPTools_Tools3D.hxx> +#include <IntTools_Context.hxx> #endif -#include <TopoDS.hxx> -#include <TopExp_Explorer.hxx> -#include <ShapeAnalysis.hxx> OCCFace::OCCFace(GModel *m, TopoDS_Face _s, int num) : GFace(m, num), s(_s) -- GitLab