X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAlgoAPI%2FGeomAlgoAPI_PaveFiller.cpp;h=7a2e45baa02b9ae2d7dc8bc5f448105f0631695c;hb=b7f954c1e5b9da1fc425908ac4edfebb513ebf23;hp=beeccc72a4d9f355ef91558dca4e9676b6644df7;hpb=868158fe6d39b25e60ac528295b1c908821e4af5;p=modules%2Fshaper.git

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_PaveFiller.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_PaveFiller.cpp
index beeccc72a..7a2e45baa 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_PaveFiller.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_PaveFiller.cpp
@@ -1,118 +1,86 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        GeomAlgoAPI_PaveFiller.cpp
-// Created:     27 August 2015
-// Author:      Dmitry Bobylev
-
-#include <GeomAlgoAPI_PaveFiller.h>
+// 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"
 
 #include <GeomAlgoAPI_DFLoader.h>
 #include <GeomAlgoAPI_ShapeTools.h>
 
 #include <BOPAlgo_Builder.hxx>
 #include <BOPAlgo_PaveFiller.hxx>
-#include <BRepCheck_Analyzer.hxx>
-#include <TopExp_Explorer.hxx>
 #include <TopoDS_Builder.hxx>
+#include <TopoDS_Iterator.hxx>
 
 //=================================================================================================
-GeomAlgoAPI_PaveFiller::GeomAlgoAPI_PaveFiller(const ListOfShape& theListOfShape, const bool theIsMakeCompSolids)
-: myDone(false)
+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++) {
-    aListOfShape.Append((*anIt)->impl<TopoDS_Shape>());
+  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()) {
+        aListOfShape.Append(anIter.Value());
+      }
+    } else {
+      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();
-  myMkShape.reset(new GeomAlgoAPI_MakeShape(aBuilder, GeomAlgoAPI_MakeShape::OCCT_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) {
     aResult = GeomAlgoAPI_DFLoader::refineResult(aResult);
   }
   if(theIsMakeCompSolids && aResult.ShapeType() == TopAbs_COMPOUND) {
-    std::shared_ptr<GeomAPI_Shape> aCompound(new GeomAPI_Shape);
-    aCompound->setImpl(new TopoDS_Shape(aResult));
-    ListOfShape aCompSolids, aFreeSolids;
-    GeomAlgoAPI_ShapeTools::combineShapes(aCompound, GeomAPI_Shape::COMPSOLID, aCompSolids, aFreeSolids);
-    if(aCompSolids.size() == 1 && aFreeSolids.size() == 0) {
-      aResult = aCompSolids.front()->impl<TopoDS_Shape>();
-    } else if (aCompSolids.size() > 1 || (aCompSolids.size() >= 1 && aFreeSolids.size() >= 1)) {
-      TopoDS_Compound aResultComp;
-      TopoDS_Builder aBuilder;
-      aBuilder.MakeCompound(aResultComp);
-      for(ListOfShape::const_iterator anIter = aCompSolids.cbegin(); anIter != aCompSolids.cend(); anIter++) {
-        aBuilder.Add(aResultComp, (*anIter)->impl<TopoDS_Shape>());
-      }
-      for(ListOfShape::const_iterator anIter = aFreeSolids.cbegin(); anIter != aFreeSolids.cend(); anIter++) {
-        aBuilder.Add(aResultComp, (*anIter)->impl<TopoDS_Shape>());
-      }
-      aResult = aResultComp;
-    }
-  }
-
-  // fill data map to keep correct orientation of sub-shapes
-  myMap.reset(new GeomAPI_DataMapOfShapeShape());
-  for (TopExp_Explorer Exp(aResult, TopAbs_FACE); Exp.More(); Exp.Next()) {
-    std::shared_ptr<GeomAPI_Shape> aCurrentShape(new GeomAPI_Shape());
-    aCurrentShape->setImpl(new TopoDS_Shape(Exp.Current()));
-    myMap->bind(aCurrentShape, aCurrentShape);
+    std::shared_ptr<GeomAPI_Shape> aGeomShape(new GeomAPI_Shape);
+    aGeomShape->setImpl(new TopoDS_Shape(aResult));
+    ListOfShape aResults;
+    aGeomShape = GeomAlgoAPI_ShapeTools::combineShapes(aGeomShape,
+                                                       GeomAPI_Shape::COMPSOLID,
+                                                       aResults);
+    aResult = aGeomShape->impl<TopoDS_Shape>();
   }
 
-  myShape.reset(new GeomAPI_Shape());
-  myShape->setImpl(new TopoDS_Shape(aResult));
-
-  myDone = true;
-}
-
-//=================================================================================================
-const bool GeomAlgoAPI_PaveFiller::isDone() const
-{
-  return myDone;
-}
-
-//=================================================================================================
-const bool GeomAlgoAPI_PaveFiller::isValid() const
-{
-  BRepCheck_Analyzer aChecker(myShape->impl<TopoDS_Shape>());
-  return (aChecker.IsValid() == Standard_True);
-}
-
-//=================================================================================================
-std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_PaveFiller::shape() const
-{
-  return myShape;
-}
-
-//=================================================================================================
-std::shared_ptr<GeomAPI_DataMapOfShapeShape> GeomAlgoAPI_PaveFiller::mapOfShapes() const
-{
-  return myMap;
-}
-
-//=================================================================================================
-std::shared_ptr<GeomAlgoAPI_MakeShape> GeomAlgoAPI_PaveFiller::makeShape() const
-{
-  return myMkShape;
+  std::shared_ptr<GeomAPI_Shape> aShape(new GeomAPI_Shape());
+  aShape->setImpl(new TopoDS_Shape(aResult));
+  this->setShape(aShape);
+  this->setDone(true);
 }