mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2024-12-30 19:30:35 +05:00
Porting to dev version of OCCT
This commit is contained in:
parent
08b70d2054
commit
44d181bc0e
@ -26,8 +26,11 @@
|
|||||||
// Created : Fri Oct 20 11:37:07 2006
|
// Created : Fri Oct 20 11:37:07 2006
|
||||||
// Author : Edward AGAPOV (eap)
|
// Author : Edward AGAPOV (eap)
|
||||||
//
|
//
|
||||||
|
|
||||||
#include "StdMeshers_RadialPrism_3D.hxx"
|
#include "StdMeshers_RadialPrism_3D.hxx"
|
||||||
|
|
||||||
|
#include <Basics_OCCTVersion.hxx>
|
||||||
|
|
||||||
#include "StdMeshers_ProjectionUtils.hxx"
|
#include "StdMeshers_ProjectionUtils.hxx"
|
||||||
#include "StdMeshers_NumberOfLayers.hxx"
|
#include "StdMeshers_NumberOfLayers.hxx"
|
||||||
#include "StdMeshers_LayerDistribution.hxx"
|
#include "StdMeshers_LayerDistribution.hxx"
|
||||||
@ -45,7 +48,11 @@
|
|||||||
|
|
||||||
#include <BRepAdaptor_Curve.hxx>
|
#include <BRepAdaptor_Curve.hxx>
|
||||||
#include <BRepBuilderAPI_MakeEdge.hxx>
|
#include <BRepBuilderAPI_MakeEdge.hxx>
|
||||||
|
#if OCC_VERSION_LARGE > 0x06050400
|
||||||
|
#include <BRepClass3d.hxx>
|
||||||
|
#else
|
||||||
#include <BRepTools.hxx>
|
#include <BRepTools.hxx>
|
||||||
|
#endif
|
||||||
#include <BRep_Tool.hxx>
|
#include <BRep_Tool.hxx>
|
||||||
#include <TopExp_Explorer.hxx>
|
#include <TopExp_Explorer.hxx>
|
||||||
#include <TopoDS.hxx>
|
#include <TopoDS.hxx>
|
||||||
@ -55,7 +62,6 @@
|
|||||||
#include <gp.hxx>
|
#include <gp.hxx>
|
||||||
#include <gp_Pnt.hxx>
|
#include <gp_Pnt.hxx>
|
||||||
|
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
#define RETURN_BAD_RESULT(msg) { MESSAGE(")-: Error: " << msg); return false; }
|
#define RETURN_BAD_RESULT(msg) { MESSAGE(")-: Error: " << msg); return false; }
|
||||||
@ -162,7 +168,11 @@ bool StdMeshers_RadialPrism_3D::Compute(SMESH_Mesh& aMesh, const TopoDS_Shape& a
|
|||||||
|
|
||||||
// get 2 shells
|
// get 2 shells
|
||||||
TopoDS_Solid solid = TopoDS::Solid( aShape );
|
TopoDS_Solid solid = TopoDS::Solid( aShape );
|
||||||
|
#if OCC_VERSION_LARGE > 0x06050400
|
||||||
|
TopoDS_Shell outerShell = BRepClass3d::OuterShell( solid );
|
||||||
|
#else
|
||||||
TopoDS_Shell outerShell = BRepTools::OuterShell( solid );
|
TopoDS_Shell outerShell = BRepTools::OuterShell( solid );
|
||||||
|
#endif
|
||||||
TopoDS_Shape innerShell;
|
TopoDS_Shape innerShell;
|
||||||
int nbShells = 0;
|
int nbShells = 0;
|
||||||
for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells )
|
for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells )
|
||||||
@ -402,7 +412,11 @@ bool StdMeshers_RadialPrism_3D::Evaluate(SMESH_Mesh& aMesh,
|
|||||||
{
|
{
|
||||||
// get 2 shells
|
// get 2 shells
|
||||||
TopoDS_Solid solid = TopoDS::Solid( aShape );
|
TopoDS_Solid solid = TopoDS::Solid( aShape );
|
||||||
|
#if OCC_VERSION_LARGE > 0x06050400
|
||||||
|
TopoDS_Shell outerShell = BRepClass3d::OuterShell( solid );
|
||||||
|
#else
|
||||||
TopoDS_Shell outerShell = BRepTools::OuterShell( solid );
|
TopoDS_Shell outerShell = BRepTools::OuterShell( solid );
|
||||||
|
#endif
|
||||||
TopoDS_Shape innerShell;
|
TopoDS_Shape innerShell;
|
||||||
int nbShells = 0;
|
int nbShells = 0;
|
||||||
for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells )
|
for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells )
|
||||||
|
Loading…
Reference in New Issue
Block a user