mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2025-01-29 03:20:36 +05:00
Support of CASCADE 5.2.4
This commit is contained in:
parent
6082d01770
commit
70c8974df0
@ -66,6 +66,6 @@ LIB_SERVER_IDL =
|
||||
CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
|
||||
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome
|
||||
|
||||
LDFLAGS += -lDlgRef -lGEOMGUI
|
||||
LDFLAGS += -lDlgRef -lGEOMGUI $(CAS_LDPATH) -lTKPrim
|
||||
|
||||
@CONCLUDE@
|
||||
|
@ -9,7 +9,18 @@ using namespace std;
|
||||
#include <BRep_Tool.hxx>
|
||||
#include <BRep_Builder.hxx>
|
||||
#include <BRepAlgo_FaceRestrictor.hxx>
|
||||
|
||||
#include <Standard_Version.hxx>
|
||||
#ifdef OCC_VERSION_MAINTENANCE
|
||||
#if (OCC_VERSION_MAJOR >= 5 && OCC_VERSION_MINOR >= 2 && OCC_VERSION_MAINTENANCE >= 4)
|
||||
#include <BRepBuilderAPI_Sewing.hxx>
|
||||
#define BRepAlgo_Sewing BRepBuilderAPI_Sewing
|
||||
#else
|
||||
#include <BRepAlgo_Sewing.hxx>
|
||||
#endif
|
||||
#else #include <BRepAlgo_Sewing.hxx>
|
||||
#endif
|
||||
|
||||
#include <BRepBuilderAPI_Copy.hxx>
|
||||
#include <BRepTools_Quilt.hxx>
|
||||
#include <BRepCheck.hxx>
|
||||
|
@ -94,7 +94,12 @@ Standard_Boolean ShHealOper_Sewing::sewing(const TopTools_SequenceOfShape& theSe
|
||||
return myDone;
|
||||
}
|
||||
//sewing shape
|
||||
Handle(BRepAlgo_Sewing) aSewing = new BRepAlgo_Sewing;
|
||||
#ifdef __OCC_5_2_4__
|
||||
Handle(BRepBuilderAPI_Sewing) aSewing = new BRepBuilderAPI_Sewing;
|
||||
#else
|
||||
Handle(BRepAlgo_Sewing) aSewing = new BRepAlgo_Sewing;
|
||||
#endif
|
||||
|
||||
aSewing->Load(myInitShape);
|
||||
aSewing->SetTolerance(myTolerance);
|
||||
aSewing->SetFaceMode(myFacesMode);
|
||||
@ -221,7 +226,14 @@ Standard_Boolean ShHealOper_Sewing::getWires(const TopoDS_Shape& theSewShape) co
|
||||
//=======================================================================
|
||||
|
||||
Standard_Boolean ShHealOper_Sewing::getModifications(const TopoDS_Shape& theShape,
|
||||
const Handle(BRepAlgo_Sewing)& theSewing) const
|
||||
|
||||
#ifdef __OCC_5_2_4__
|
||||
const Handle(BRepBuilderAPI_Sewing)&
|
||||
#else
|
||||
const Handle(BRepAlgo_Sewing)&
|
||||
#endif
|
||||
|
||||
theSewing) const
|
||||
{
|
||||
if((Standard_Integer)theShape.ShapeType() > (Standard_Integer)myHistoryLevel)
|
||||
return Standard_False;
|
||||
|
@ -28,7 +28,18 @@
|
||||
#include <ShHealOper_Tool.hxx>
|
||||
#include <TopoDS_Shape.hxx>
|
||||
#include <TopAbs_ShapeEnum.hxx>
|
||||
#include <Standard_Version.hxx>
|
||||
#ifdef OCC_VERSION_MAINTENANCE
|
||||
#if (OCC_VERSION_MAJOR >= 5 && OCC_VERSION_MINOR >= 2 && OCC_VERSION_MAINTENANCE >= 4)
|
||||
#include <BRepBuilderAPI_Sewing.hxx>
|
||||
#define __OCC_5_2_4__
|
||||
#else
|
||||
#include <BRepAlgo_Sewing.hxx>
|
||||
#endif
|
||||
#else
|
||||
#include <BRepAlgo_Sewing.hxx>
|
||||
#endif
|
||||
|
||||
#include <TopoDS_Compound.hxx>
|
||||
#include <TopTools_MapOfShape.hxx>
|
||||
#include <TopTools_SequenceOfShape.hxx>
|
||||
@ -125,7 +136,12 @@ class ShHealOper_Sewing : public ShHealOper_Tool
|
||||
Standard_Boolean getShells(const TopoDS_Shape& theSewShape) const;
|
||||
Standard_Boolean getWires(const TopoDS_Shape& theSewShape) const;
|
||||
Standard_Boolean getModifications(const TopoDS_Shape& theShape,
|
||||
const Handle(BRepAlgo_Sewing)& theSewing) const;
|
||||
#ifdef __OCC_5_2_4__
|
||||
const Handle(BRepBuilderAPI_Sewing)&
|
||||
#else
|
||||
const Handle(BRepAlgo_Sewing)&
|
||||
#endif
|
||||
theSewing) const;
|
||||
|
||||
Standard_Boolean isSewed(const TopoDS_Shape& theShape) const;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user