-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2020 CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include "GeomAlgoAPI_PaveFiller.h"
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<TopoDS_Shape>();
aListOfShape.Append(aShape);
}
}
- aPaveFiller.SetArguments(aListOfShape);
- aPaveFiller.Perform();
- Standard_Integer iErr = aPaveFiller.ErrorStatus();
- if(iErr) {
+ aPaveFiller->SetArguments(aListOfShape);
+ aPaveFiller->Perform();
+ if (aPaveFiller->HasErrors())
return;
- }
BOPAlgo_Builder* aBuilder = new BOPAlgo_Builder();
this->setImpl(aBuilder);
this->setBuilderType(OCCT_BOPAlgo_Builder);
aBuilder->SetArguments(aListOfShape);
- aBuilder->PerformWithFiller(aPaveFiller);
- iErr = aBuilder->ErrorStatus();
- if(iErr) {
+ aBuilder->PerformWithFiller(*aPaveFiller);
+ if (aBuilder->HasErrors())
return;
- }
TopoDS_Shape aResult = aBuilder->Shape();
if(aResult.ShapeType() == TopAbs_COMPOUND) {
if(theIsMakeCompSolids && aResult.ShapeType() == TopAbs_COMPOUND) {
std::shared_ptr<GeomAPI_Shape> aGeomShape(new GeomAPI_Shape);
aGeomShape->setImpl(new TopoDS_Shape(aResult));
- ListOfShape aCompSolids, aFreeSolids;
+ ListOfShape aResults;
aGeomShape = GeomAlgoAPI_ShapeTools::combineShapes(aGeomShape,
GeomAPI_Shape::COMPSOLID,
- aCompSolids,
- aFreeSolids);
+ aResults);
aResult = aGeomShape->impl<TopoDS_Shape>();
}