GeomAlgoAPI_PaveFiller now derived from GeomAlgoAPI_MakeShape

diff --git a/src/FeaturesPlugin/FeaturesPlugin_Boolean.cpp b/src/FeaturesPlugin/FeaturesPlugin_Boolean.cpp
index 7425816a64612668e075c8bd22f24978379f9380..ee767710c25ee08f8ba61412e5e966ed32a43bd5 100644 (file)
--- a/src/FeaturesPlugin/FeaturesPlugin_Boolean.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_Boolean.cpp
@@ -205,19 +205,19 @@ void FeaturesPlugin_Boolean::execute()
         // Add result to not used solids from compsolid.
         ListOfShape aShapesToAdd = aNotUsedSolids;
         aShapesToAdd.push_back(aBoolAlgo->shape());
-        GeomAlgoAPI_PaveFiller aFillerAlgo(aShapesToAdd, true);
-        if(!aFillerAlgo.isDone()) {
+        std::shared_ptr<GeomAlgoAPI_PaveFiller> aFillerAlgo(new GeomAlgoAPI_PaveFiller(aShapesToAdd, true));
+        if(!aFillerAlgo->isDone()) {
           std::string aFeatureError = "PaveFiller algorithm failed";
           setError(aFeatureError);
           return;
         }
 
-        aMakeShapeList.appendAlgo(aFillerAlgo.makeShape());
-        aMapOfShapes.merge(aFillerAlgo.mapOfShapes());
+        aMakeShapeList.appendAlgo(aFillerAlgo);
+        aMapOfShapes.merge(aFillerAlgo->mapOfSubShapes());
 
-        if(GeomAlgoAPI_ShapeTools::volume(aFillerAlgo.shape()) > 1.e-7) {
+        if(GeomAlgoAPI_ShapeTools::volume(aFillerAlgo->shape()) > 1.e-7) {
           std::shared_ptr<ModelAPI_ResultBody> aResultBody = document()->createBody(data(), aResultIndex);
-          loadNamingDS(aResultBody, aCompSolid, aTools, aFillerAlgo.shape(), aMakeShapeList, aMapOfShapes);
+          loadNamingDS(aResultBody, aCompSolid, aTools, aFillerAlgo->shape(), aMakeShapeList, aMapOfShapes);
           setResult(aResultBody, aResultIndex);
           aResultIndex++;
         }
@@ -312,26 +312,26 @@ void FeaturesPlugin_Boolean::execute()
       // Add result to not used solids from compsolid (if we have any).
       if(!aNotUsedSolids.empty()) {
         aNotUsedSolids.push_back(aShape);
-        GeomAlgoAPI_PaveFiller aFillerAlgo(aNotUsedSolids, true);
-        if(!aFillerAlgo.isDone()) {
+        std::shared_ptr<GeomAlgoAPI_PaveFiller> aFillerAlgo(new GeomAlgoAPI_PaveFiller(aNotUsedSolids, true));
+        if(!aFillerAlgo->isDone()) {
           std::string aFeatureError = "PaveFiller algorithm failed";
           setError(aFeatureError);
           return;
         }
-        if(aFillerAlgo.shape()->isNull()) {
+        if(aFillerAlgo->shape()->isNull()) {
           static const std::string aShapeError = "Resulting shape is Null";
           setError(aShapeError);
           return;
         }
-        if(!aFillerAlgo.isValid()) {
+        if(!aFillerAlgo->isValid()) {
           std::string aFeatureError = "Warning: resulting shape is not valid";
           setError(aFeatureError);
           return;
         }
 
-        aShape = aFillerAlgo.shape();
-        aMakeShapeList.appendAlgo(aFillerAlgo.makeShape());
-        aMapOfShapes.merge(aFillerAlgo.mapOfShapes());
+        aShape = aFillerAlgo->shape();
+        aMakeShapeList.appendAlgo(aFillerAlgo);
+        aMapOfShapes.merge(aFillerAlgo->mapOfSubShapes());
       }
 
       std::shared_ptr<ModelAPI_ResultBody> aResultBody = document()->createBody(data(), aResultIndex);

diff --git a/src/FeaturesPlugin/FeaturesPlugin_CompositeBoolean.cpp b/src/FeaturesPlugin/FeaturesPlugin_CompositeBoolean.cpp
index 0eb79e23a44e1f4f66237973dfb714e33296288a..50883b7c0808b0a21338cc990ea708771033a4fa 100644 (file)
--- a/src/FeaturesPlugin/FeaturesPlugin_CompositeBoolean.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_CompositeBoolean.cpp
@@ -246,19 +246,19 @@ void FeaturesPlugin_CompositeBoolean::execute()
         // Add result to not used solids from compsolid.
         ListOfShape aShapesToAdd = aNotUsedSolids;
         aShapesToAdd.push_back(aBoolAlgo->shape());
-        GeomAlgoAPI_PaveFiller aFillerAlgo(aShapesToAdd, true);
-        if(!aFillerAlgo.isDone()) {
+        std::shared_ptr<GeomAlgoAPI_PaveFiller> aFillerAlgo(new GeomAlgoAPI_PaveFiller(aShapesToAdd, true));
+        if(!aFillerAlgo->isDone()) {
           std::string aFeatureError = "PaveFiller algorithm failed";
           setError(aFeatureError);
           return;
         }
 
-        aMakeShapeList.appendAlgo(aFillerAlgo.makeShape());
-        aMapOfShapes.merge(aFillerAlgo.mapOfShapes());
+        aMakeShapeList.appendAlgo(aFillerAlgo);
+        aMapOfShapes.merge(aFillerAlgo->mapOfSubShapes());
 
-        if(GeomAlgoAPI_ShapeTools::volume(aFillerAlgo.shape()) > 1.e-7) {
+        if(GeomAlgoAPI_ShapeTools::volume(aFillerAlgo->shape()) > 1.e-7) {
           std::shared_ptr<ModelAPI_ResultBody> aResultBody = document()->createBody(data(), aResultIndex);
-          loadNamingDS(aResultBody, aShells, aSolidsAlgos, aCompSolid, aTools, aFillerAlgo.shape(), aMakeShapeList, aMapOfShapes);
+          loadNamingDS(aResultBody, aShells, aSolidsAlgos, aCompSolid, aTools, aFillerAlgo->shape(), aMakeShapeList, aMapOfShapes);
           setResult(aResultBody, aResultIndex);
           aResultIndex++;
         }
@@ -337,26 +337,26 @@ void FeaturesPlugin_CompositeBoolean::execute()
       // Add result to not used solids from compsolid (if we have any).
       if(!aNotUsedSolids.empty()) {
         aNotUsedSolids.push_back(aShape);
-        GeomAlgoAPI_PaveFiller aFillerAlgo(aNotUsedSolids, true);
-        if(!aFillerAlgo.isDone()) {
+        std::shared_ptr<GeomAlgoAPI_PaveFiller> aFillerAlgo(new GeomAlgoAPI_PaveFiller(aNotUsedSolids, true));
+        if(!aFillerAlgo->isDone()) {
           std::string aFeatureError = "PaveFiller algorithm failed";
           setError(aFeatureError);
           return;
         }
-        if(aFillerAlgo.shape()->isNull()) {
+        if(aFillerAlgo->shape()->isNull()) {
           static const std::string aShapeError = "Resulting shape is Null";
           setError(aShapeError);
           return;
         }
-        if(!aFillerAlgo.isValid()) {
+        if(!aFillerAlgo->isValid()) {
           std::string aFeatureError = "Warning: resulting shape is not valid";
           setError(aFeatureError);
           return;
         }
 
-        aShape = aFillerAlgo.shape();
-        aMakeShapeList.appendAlgo(aFillerAlgo.makeShape());
-        aMapOfShapes.merge(aFillerAlgo.mapOfShapes());
+        aShape = aFillerAlgo->shape();
+        aMakeShapeList.appendAlgo(aFillerAlgo);
+        aMapOfShapes.merge(aFillerAlgo->mapOfSubShapes());
       }
 
       std::shared_ptr<ModelAPI_ResultBody> aResultBody = document()->createBody(data(), aResultIndex);

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_PaveFiller.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_PaveFiller.cpp
index beeccc72a4d9f355ef91558dca4e9676b6644df7..ad20d9eddf723dfdebd14d1a5af8e68294d13f8d 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_PaveFiller.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_PaveFiller.cpp
@@ -4,20 +4,17 @@
 // Created:     27 August 2015
 // Author:      Dmitry Bobylev
 
-#include <GeomAlgoAPI_PaveFiller.h>
+#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>
 
 //=================================================================================================
 GeomAlgoAPI_PaveFiller::GeomAlgoAPI_PaveFiller(const ListOfShape& theListOfShape, const bool theIsMakeCompSolids)
-: myDone(false)
 {
   build(theListOfShape, theIsMakeCompSolids);
 }
@@ -39,7 +36,8 @@ void GeomAlgoAPI_PaveFiller::build(const ListOfShape& theListOfShape, const bool
   }
 
   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();
@@ -72,47 +70,8 @@ void GeomAlgoAPI_PaveFiller::build(const ListOfShape& theListOfShape, const bool
     }
   }
 
-  // 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);
-  }
-
-  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);
 }

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_PaveFiller.h b/src/GeomAlgoAPI/GeomAlgoAPI_PaveFiller.h
index f508e7e20fc1c62a4024fb72ebfbace666a92f65..d14aacbacba5d184f8de74a54406fd0bceb09b3a 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_PaveFiller.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_PaveFiller.h
@@ -11,47 +11,21 @@
 #include <GeomAlgoAPI_MakeShape.h>
 
 #include <GeomAPI_Shape.h>
-#include <GeomAPI_Interface.h>
-#include <GeomAPI_DataMapOfShapeShape.h>
 
-/** \class GeomAlgoAPI_PaveFiller
- *  \ingroup DataAlgo
- *  \brief Finds the common parts from the list of shapes and breaks it to shapes with shared subshapes.
- */
-class GeomAlgoAPI_PaveFiller : public GeomAPI_Interface
+/// \class GeomAlgoAPI_PaveFiller
+/// \ingroup DataAlgo
+/// \brief Finds the common parts from the list of shapes and breaks it to shapes with shared subshapes.
+class GeomAlgoAPI_PaveFiller : public GeomAlgoAPI_MakeShape
 {
 public:
-  /** \brief Constructor.
-   *  \param[in] theListOfShape list of shape which should be splitted.
-   *  \param[in] theIsMakeCompSolids if true gather shapes with shared faces to compsolids.
-   */
+  /// \brief Constructor.
+  /// \param[in] theListOfShape list of shape which should be splitted.
+  /// \param[in] theIsMakeCompSolids if true gather shapes with shared faces to compsolids.
   GEOMALGOAPI_EXPORT GeomAlgoAPI_PaveFiller(const ListOfShape& theListOfShape, const bool theIsMakeCompSolids = false);
 
-  /// \return true if algorithm succeed.
-  GEOMALGOAPI_EXPORT const bool isDone() const;
-
-  /// \return true if resulting shape is valid.
-  GEOMALGOAPI_EXPORT const bool isValid() const;
-
-  /// \return result of the boolean algorithm.
-  GEOMALGOAPI_EXPORT std::shared_ptr<GeomAPI_Shape> shape() const;
-
-  /// \return map of sub-shapes of the result. To be used for History keeping.
-  GEOMALGOAPI_EXPORT std::shared_ptr<GeomAPI_DataMapOfShapeShape> mapOfShapes() const;
-
-  /// \return interface for for History processing.
-  GEOMALGOAPI_EXPORT std::shared_ptr<GeomAlgoAPI_MakeShape> makeShape() const;
-
 private:
   /// Builds resulting shape.
   void build(const ListOfShape& theListOfShape, const bool theIsMakeCompSolids);
-
-private:
-  /// Fields.
-  bool myDone;
-  std::shared_ptr<GeomAPI_Shape> myShape;
-  std::shared_ptr<GeomAPI_DataMapOfShapeShape> myMap;
-  std::shared_ptr<GeomAlgoAPI_MakeShape> myMkShape;
 };
 
 #endif