SALOME porting to OCCT 5.2.4

diff --git a/src/GEOMBase/Makefile.in b/src/GEOMBase/Makefile.in
index eaffda30df9b403dafe686f5b1e9826880212ea3..871e7f452365f2ddb652ae72765dff9f9cd1a030 100644 (file)
--- a/src/GEOMBase/Makefile.in
+++ b/src/GEOMBase/Makefile.in
@@ -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
 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@

diff --git a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
index a87816fb3e46bf5358e247c880f9cd337881b193..3fc9299b783d485a00c8e1ccc411815259b8efe9 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
@@ -534,9 +534,13 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::FillHoles (Handle(GEOM_Object)
   pd << aNewObject << " = geompy.SuppressHoles(" << theObject << ", [";
 
   // list of wire ids
-  int i = theWires->Lower(), nb = theWires->Upper();
-  for ( ; i <= nb; i++)
-    pd << theWires->Value( i ) << (( i < nb ) ? ", " : "])");
+  if ( theWires.IsNull() )
+    pd << "])";
+  else {
+    int i = theWires->Lower(), nb = theWires->Upper();
+    for ( ; i <= nb; i++)
+      pd << theWires->Value( i ) << (( i < nb ) ? ", " : "])");
+  }
 
   SetErrorCode(OK);
   return aNewObject;

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

diff --git a/src/ShHealOper/ShHealOper_Sewing.cxx b/src/ShHealOper/ShHealOper_Sewing.cxx
index b0f8e4206a43a007eca91c3fdc28a1af03341fcb..62ed52e4965fee1fab7f4fd4345d61e17bbb0573 100644 (file)
--- a/src/ShHealOper/ShHealOper_Sewing.cxx
+++ b/src/ShHealOper/ShHealOper_Sewing.cxx
@@ -94,7 +94,7 @@ Standard_Boolean ShHealOper_Sewing::sewing(const TopTools_SequenceOfShape& theSe
     return myDone;
   }
   //sewing shape
-  Handle(BRepAlgo_Sewing) aSewing = new BRepAlgo_Sewing;
+  Handle(BRepBuilderAPI_Sewing) aSewing = new BRepBuilderAPI_Sewing;
   aSewing->Load(myInitShape);
   aSewing->SetTolerance(myTolerance);
   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,
-                                                     const Handle(BRepAlgo_Sewing)& theSewing) const
+                                                     const Handle(BRepBuilderAPI_Sewing)& theSewing) const
 {
   if((Standard_Integer)theShape.ShapeType() > (Standard_Integer)myHistoryLevel)
     return Standard_False;

diff --git a/src/ShHealOper/ShHealOper_Sewing.hxx b/src/ShHealOper/ShHealOper_Sewing.hxx
index e7244b227efe6c89d3aa47a9ec50ad60aa514d0a..8872e294d64173dbd945601d35ce6262fea2bf44 100644 (file)
--- a/src/ShHealOper/ShHealOper_Sewing.hxx
+++ b/src/ShHealOper/ShHealOper_Sewing.hxx
@@ -28,7 +28,7 @@
 #include <ShHealOper_Tool.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopAbs_ShapeEnum.hxx>
-#include <BRepAlgo_Sewing.hxx>
+#include <BRepBuilderAPI_Sewing.hxx>
 #include <TopoDS_Compound.hxx>
 #include <TopTools_MapOfShape.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 getWires(const TopoDS_Shape& theSewShape) const;
   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;