Fix pipe to avoid moving of the path, if it is passed through the first face.

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

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_PaveFiller.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_PaveFiller.cpp
index 6f9d183aa051b982da4108e6d5c6ff1619bc5d95..de0eee7eb3697b91002beda20f49729683832a45 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_PaveFiller.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_PaveFiller.cpp
@@ -1,8 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        GeomAlgoAPI_PaveFiller.cpp
-// Created:     27 August 2015
-// Author:      Dmitry Bobylev
+// Copyright (C) 2014-2017  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<mailto:webmaster.salome@opencascade.com>
+//
 
 #include "GeomAlgoAPI_PaveFiller.h"
 
@@ -15,18 +29,21 @@
 #include <TopoDS_Iterator.hxx>
 
 //=================================================================================================
-GeomAlgoAPI_PaveFiller::GeomAlgoAPI_PaveFiller(const ListOfShape& theListOfShape, const bool theIsMakeCompSolids)
+GeomAlgoAPI_PaveFiller::GeomAlgoAPI_PaveFiller(const ListOfShape& theListOfShape,
+                                               const bool theIsMakeCompSolids)
 {
   build(theListOfShape, theIsMakeCompSolids);
 }
 
 
 //=================================================================================================
-void GeomAlgoAPI_PaveFiller::build(const ListOfShape& theListOfShape, const bool theIsMakeCompSolids)
+void GeomAlgoAPI_PaveFiller::build(const ListOfShape& theListOfShape,
+                                   const bool theIsMakeCompSolids)
 {
-  BOPAlgo_PaveFiller aPaveFiller;
-  BOPCol_ListOfShape aListOfShape;
-  for(ListOfShape::const_iterator anIt = theListOfShape.cbegin(); anIt != theListOfShape.cend(); anIt++) {
+  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>();
     if(aShape.ShapeType() == TopAbs_COMPOUND) {
       for(TopoDS_Iterator anIter(aShape); anIter.More(); anIter.Next()) {
@@ -36,22 +53,18 @@ void GeomAlgoAPI_PaveFiller::build(const ListOfShape& theListOfShape, const bool
       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) {