Fix the python dump of whole-results groups for specific test-case.

[modules/shaper.git] / src / GeomAlgoAPI / GeomAlgoAPI_PaveFiller.cpp

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_PaveFiller.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_PaveFiller.cpp
index 2718e5c98ef35b538fbd56d77eafd49106677d05..7a2e45baa02b9ae2d7dc8bc5f448105f0631695c 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_PaveFiller.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_PaveFiller.cpp
@@ -1,8 +1,21 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        GeomAlgoAPI_PaveFiller.cpp
-// Created:     27 August 2015
-// Author:      Dmitry Bobylev
+// Copyright (C) 2014-2019  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
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// 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
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include "GeomAlgoAPI_PaveFiller.h"
 
@@ -26,8 +39,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<TopoDS_Shape>();
@@ -39,22 +52,18 @@ void GeomAlgoAPI_PaveFiller::build(const ListOfShape& theListOfShape,
       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) {
@@ -63,11 +72,10 @@ void GeomAlgoAPI_PaveFiller::build(const ListOfShape& theListOfShape,
   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>();
   }