X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAlgoAPI%2FGeomAlgoAPI_PaveFiller.cpp;h=de0eee7eb3697b91002beda20f49729683832a45;hb=a55586483e5dccc5466d6ec241e2147e210d839f;hp=9b61619a30c2624525a9fee8cf5489fd9e9379b2;hpb=2714903267d23cd0c81166c506fb3edd1e069d40;p=modules%2Fshaper.git diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_PaveFiller.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_PaveFiller.cpp index 9b61619a3..de0eee7eb 100644 --- a/src/GeomAlgoAPI/GeomAlgoAPI_PaveFiller.cpp +++ b/src/GeomAlgoAPI/GeomAlgoAPI_PaveFiller.cpp @@ -40,8 +40,8 @@ GeomAlgoAPI_PaveFiller::GeomAlgoAPI_PaveFiller(const ListOfShape& theListOfShape void GeomAlgoAPI_PaveFiller::build(const ListOfShape& theListOfShape, const bool theIsMakeCompSolids) { - BOPAlgo_PaveFiller aPaveFiller; - BOPCol_ListOfShape aListOfShape; + BOPAlgo_PaveFiller* aPaveFiller = new BOPAlgo_PaveFiller; + TopTools_ListOfShape aListOfShape; for(ListOfShape::const_iterator anIt = theListOfShape.cbegin(); anIt != theListOfShape.cend(); anIt++) { const TopoDS_Shape& aShape = (*anIt)->impl(); @@ -53,32 +53,18 @@ void GeomAlgoAPI_PaveFiller::build(const ListOfShape& theListOfShape, aListOfShape.Append(aShape); } } - aPaveFiller.SetArguments(aListOfShape); - aPaveFiller.Perform(); -#ifdef USE_OCCT_720 - if (aPaveFiller.HasErrors()) + aPaveFiller->SetArguments(aListOfShape); + aPaveFiller->Perform(); + if (aPaveFiller->HasErrors()) return; -#else - Standard_Integer iErr = aPaveFiller.ErrorStatus(); - if(iErr) { - return; - } -#endif BOPAlgo_Builder* aBuilder = new BOPAlgo_Builder(); this->setImpl(aBuilder); this->setBuilderType(OCCT_BOPAlgo_Builder); aBuilder->SetArguments(aListOfShape); - aBuilder->PerformWithFiller(aPaveFiller); -#ifdef USE_OCCT_720 + aBuilder->PerformWithFiller(*aPaveFiller); if (aBuilder->HasErrors()) return; -#else - iErr = aBuilder->ErrorStatus(); - if(iErr) { - return; - } -#endif TopoDS_Shape aResult = aBuilder->Shape(); if(aResult.ShapeType() == TopAbs_COMPOUND) {