-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2023 CEA, EDF
//
// 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_MakeVolume.h"
+#include <GeomAPI_ShapeExplorer.h>
+
#include <GeomAlgoAPI_ShapeTools.h>
#include <BOPAlgo_MakerVolume.hxx>
//=================================================================================================
std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_MakeVolume::make(const ListOfShape& theFaces)
{
- GeomAlgoAPI_MakeVolume aMkVolAlgo(theFaces);
+ GeomAlgoAPI_MakeVolume aMkVolAlgo(theFaces, false);
GeomShapePtr aResult;
if(aMkVolAlgo.isDone() && !aMkVolAlgo.shape()->isNull() && aMkVolAlgo.isValid())
aResult = aMkVolAlgo.shape();
}
//=================================================================================================
-GeomAlgoAPI_MakeVolume::GeomAlgoAPI_MakeVolume(const ListOfShape& theFaces)
+GeomAlgoAPI_MakeVolume::GeomAlgoAPI_MakeVolume(
+ const ListOfShape& theFaces, const bool theAvoidInternal)
{
+ myAvoidInternal = theAvoidInternal;
build(theFaces);
}
// parameters of the volume maker
aVolumeMaker->SetArguments(anArgs);
aVolumeMaker->SetIntersect(true); // split edges and faces
-#ifdef USE_OCCT_720
- aVolumeMaker->SetAvoidInternalShapes(true);
-#endif
- aVolumeMaker->SetGlue(BOPAlgo_GlueShift);
+ aVolumeMaker->SetAvoidInternalShapes(myAvoidInternal);
+ aVolumeMaker->SetGlue(BOPAlgo_GlueOff);
// building and getting result
aVolumeMaker->Perform();
-#ifdef USE_OCCT_720
if (aVolumeMaker->HasErrors())
return;
-#else
- if(aVolumeMaker->ErrorStatus() != 0) {
- return;
- }
-#endif
TopoDS_Shape aResult = aVolumeMaker->Shape();
if(aResult.ShapeType() == TopAbs_COMPOUND) {
this->setShape(aShape);
this->setDone(true);
}
+
+//=================================================================================================
+void GeomAlgoAPI_MakeVolume::modified(const GeomShapePtr theOldShape,
+ ListOfShape& theNewShapes)
+{
+ if (theOldShape->shapeType() == GeomAPI_Shape::SOLID) {
+ ListOfShape aNewShapes;
+ // collect faces and parent shapes, if it is not done yet
+ if (!isNewShapesCollected(theOldShape, GeomAPI_Shape::FACE))
+ collectNewShapes(theOldShape, GeomAPI_Shape::FACE);
+
+ for (GeomAPI_ShapeExplorer anIt(shape(), GeomAPI_Shape::SOLID); anIt.more(); anIt.next()) {
+ for (GeomAPI_ShapeExplorer anExp(anIt.current(), GeomAPI_Shape::FACE);
+ anExp.more(); anExp.next()) {
+ GeomShapePtr anOldShapesCompound =
+ oldShapesForNew(theOldShape, anExp.current(), GeomAPI_Shape::FACE);
+ if (!anOldShapesCompound->isNull()) {
+ aNewShapes.push_back(anIt.current());
+ break;
+ }
+ }
+ }
+
+ if (!aNewShapes.empty())
+ theNewShapes = aNewShapes;
+ }
+ else
+ GeomAlgoAPI_MakeShape::modified(theOldShape, theNewShapes);
+}