ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-04-02 03:54:29 +05:00
Code Issues Packages Projects Releases Wiki Activity

SALOME porting to OCCT 5.2.4

Browse Source
This commit is contained in:
san 2005-07-28 15:06:06 +00:00
parent 9d528b0574
commit f4e80938ef
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/GEOMBase/Makefile.in
View File

@ -66,6 +66,6 @@ LIB_SERVER_IDL =
CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome
CXXFLAGS += $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome CXXFLAGS += $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome
LDFLAGS += -L$(KERNEL_ROOT_DIR)/lib/salome -L$(GUI_ROOT_DIR)/lib/salome -lDlgRef -lGEOM -lsuit -lOCCViewer -lVTKViewer -lSalomeDS LDFLAGS += -L$(KERNEL_ROOT_DIR)/lib/salome -L$(GUI_ROOT_DIR)/lib/salome $(CAS_LDPATH) -lDlgRef -lGEOM -lsuit -lOCCViewer -lVTKViewer -lSalomeDS -lTKPrim
@CONCLUDE@ @CONCLUDE@

4
src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
View File

@ -534,9 +534,13 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::FillHoles (Handle(GEOM_Object)
pd << aNewObject << " = geompy.SuppressHoles(" << theObject << ", ["; pd << aNewObject << " = geompy.SuppressHoles(" << theObject << ", [";
// list of wire ids // list of wire ids
if ( theWires.IsNull() )
pd << "])";
else {
int i = theWires->Lower(), nb = theWires->Upper(); int i = theWires->Lower(), nb = theWires->Upper();
for ( ; i <= nb; i++) for ( ; i <= nb; i++)
pd << theWires->Value( i ) << (( i < nb ) ? ", " : "])"); pd << theWires->Value( i ) << (( i < nb ) ? ", " : "])");
}
SetErrorCode(OK); SetErrorCode(OK);
return aNewObject; return aNewObject;

4
src/GEOMImpl/GEOMImpl_ShapeDriver.cxx
View File

@ -9,7 +9,7 @@ using namespace std;
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>
#include <BRep_Builder.hxx> #include <BRep_Builder.hxx>
#include <BRepAlgo_FaceRestrictor.hxx> #include <BRepAlgo_FaceRestrictor.hxx>
#include <BRepAlgo_Sewing.hxx> #include <BRepBuilderAPI_Sewing.hxx>
#include <BRepBuilderAPI_Copy.hxx> #include <BRepBuilderAPI_Copy.hxx>
#include <BRepTools_Quilt.hxx> #include <BRepTools_Quilt.hxx>
#include <BRepCheck.hxx> #include <BRepCheck.hxx>
@ -177,7 +177,7 @@ Standard_Integer GEOMImpl_ShapeDriver::Execute(TFunction_Logbook& log) const
unsigned int ind, nbshapes = aShapes->Length(); unsigned int ind, nbshapes = aShapes->Length();
// add faces // add faces
BRepAlgo_Sewing aSewing(Precision::Confusion()*10.0); BRepBuilderAPI_Sewing aSewing(Precision::Confusion()*10.0);
for (ind = 1; ind <= nbshapes; ind++) { for (ind = 1; ind <= nbshapes; ind++) {
Handle(GEOM_Function) aRefShape = Handle(GEOM_Function)::DownCast(aShapes->Value(ind)); Handle(GEOM_Function) aRefShape = Handle(GEOM_Function)::DownCast(aShapes->Value(ind));
TopoDS_Shape aShape_i = aRefShape->GetValue(); TopoDS_Shape aShape_i = aRefShape->GetValue();

4
src/ShHealOper/ShHealOper_Sewing.cxx
View File

@ -94,7 +94,7 @@ Standard_Boolean ShHealOper_Sewing::sewing(const TopTools_SequenceOfShape& theSe
return myDone; return myDone;
} }
//sewing shape //sewing shape
Handle(BRepAlgo_Sewing) aSewing = new BRepAlgo_Sewing; Handle(BRepBuilderAPI_Sewing) aSewing = new BRepBuilderAPI_Sewing;
aSewing->Load(myInitShape); aSewing->Load(myInitShape);
aSewing->SetTolerance(myTolerance); aSewing->SetTolerance(myTolerance);
aSewing->SetFaceMode(myFacesMode); aSewing->SetFaceMode(myFacesMode);
@ -221,7 +221,7 @@ Standard_Boolean ShHealOper_Sewing::getWires(const TopoDS_Shape& theSewShape) co
//======================================================================= //=======================================================================
Standard_Boolean ShHealOper_Sewing::getModifications(const TopoDS_Shape& theShape, Standard_Boolean ShHealOper_Sewing::getModifications(const TopoDS_Shape& theShape,
const Handle(BRepAlgo_Sewing)& theSewing) const const Handle(BRepBuilderAPI_Sewing)& theSewing) const
{ {
if((Standard_Integer)theShape.ShapeType() > (Standard_Integer)myHistoryLevel) if((Standard_Integer)theShape.ShapeType() > (Standard_Integer)myHistoryLevel)
return Standard_False; return Standard_False;

4
src/ShHealOper/ShHealOper_Sewing.hxx
View File

@ -28,7 +28,7 @@
#include <ShHealOper_Tool.hxx> #include <ShHealOper_Tool.hxx>
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
#include <TopAbs_ShapeEnum.hxx> #include <TopAbs_ShapeEnum.hxx>
#include <BRepAlgo_Sewing.hxx> #include <BRepBuilderAPI_Sewing.hxx>
#include <TopoDS_Compound.hxx> #include <TopoDS_Compound.hxx>
#include <TopTools_MapOfShape.hxx> #include <TopTools_MapOfShape.hxx>
#include <TopTools_SequenceOfShape.hxx> #include <TopTools_SequenceOfShape.hxx>
@ -125,7 +125,7 @@ class ShHealOper_Sewing : public ShHealOper_Tool
Standard_Boolean getShells(const TopoDS_Shape& theSewShape) const; Standard_Boolean getShells(const TopoDS_Shape& theSewShape) const;
Standard_Boolean getWires(const TopoDS_Shape& theSewShape) const; Standard_Boolean getWires(const TopoDS_Shape& theSewShape) const;
Standard_Boolean getModifications(const TopoDS_Shape& theShape, Standard_Boolean getModifications(const TopoDS_Shape& theShape,
const Handle(BRepAlgo_Sewing)& theSewing) const; const Handle(BRepBuilderAPI_Sewing)& theSewing) const;
Standard_Boolean isSewed(const TopoDS_Shape& theShape) const; Standard_Boolean isSewed(const TopoDS_Shape& theShape) const;