Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* store result only after checking if sewn
[modules/shaper.git]
/
src
/
GeomAlgoAPI
/
GeomAlgoAPI_PaveFiller.cpp
diff --git
a/src/GeomAlgoAPI/GeomAlgoAPI_PaveFiller.cpp
b/src/GeomAlgoAPI/GeomAlgoAPI_PaveFiller.cpp
index 9b61619a30c2624525a9fee8cf5489fd9e9379b2..1ac8829a2633fb963fe7d04c087c60fe7b569cd9 100644
(file)
--- a/
src/GeomAlgoAPI/GeomAlgoAPI_PaveFiller.cpp
+++ b/
src/GeomAlgoAPI/GeomAlgoAPI_PaveFiller.cpp
@@
-1,4
+1,4
@@
-// Copyright (C) 2014-20
17
CEA/DEN, EDF R&D
+// Copyright (C) 2014-20
22
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
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-12,10
+12,9
@@
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
//
// 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_PaveFiller.h"
//
#include "GeomAlgoAPI_PaveFiller.h"
@@
-40,8
+39,8
@@
GeomAlgoAPI_PaveFiller::GeomAlgoAPI_PaveFiller(const ListOfShape& theListOfShape
void GeomAlgoAPI_PaveFiller::build(const ListOfShape& theListOfShape,
const bool theIsMakeCompSolids)
{
void GeomAlgoAPI_PaveFiller::build(const ListOfShape& theListOfShape,
const bool theIsMakeCompSolids)
{
- BOPAlgo_PaveFiller
a
PaveFiller;
-
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>();
for(ListOfShape::const_iterator
anIt = theListOfShape.cbegin(); anIt != theListOfShape.cend(); anIt++) {
const TopoDS_Shape& aShape = (*anIt)->impl<TopoDS_Shape>();
@@
-53,32
+52,18
@@
void GeomAlgoAPI_PaveFiller::build(const ListOfShape& theListOfShape,
aListOfShape.Append(aShape);
}
}
aListOfShape.Append(aShape);
}
}
- aPaveFiller.SetArguments(aListOfShape);
- aPaveFiller.Perform();
-#ifdef USE_OCCT_720
- if (aPaveFiller.HasErrors())
+ aPaveFiller->SetArguments(aListOfShape);
+ aPaveFiller->Perform();
+ if (aPaveFiller->HasErrors())
return;
return;
-#else
- Standard_Integer iErr = aPaveFiller.ErrorStatus();
- if(iErr) {
- return;
- }
-#endif
BOPAlgo_Builder* aBuilder = new BOPAlgo_Builder();
this->setImpl(aBuilder);
this->setBuilderType(OCCT_BOPAlgo_Builder);
aBuilder->SetArguments(aListOfShape);
BOPAlgo_Builder* aBuilder = new BOPAlgo_Builder();
this->setImpl(aBuilder);
this->setBuilderType(OCCT_BOPAlgo_Builder);
aBuilder->SetArguments(aListOfShape);
- aBuilder->PerformWithFiller(aPaveFiller);
-#ifdef USE_OCCT_720
+ aBuilder->PerformWithFiller(*aPaveFiller);
if (aBuilder->HasErrors())
return;
if (aBuilder->HasErrors())
return;
-#else
- iErr = aBuilder->ErrorStatus();
- if(iErr) {
- return;
- }
-#endif
TopoDS_Shape aResult = aBuilder->Shape();
if(aResult.ShapeType() == TopAbs_COMPOUND) {
TopoDS_Shape aResult = aBuilder->Shape();
if(aResult.ShapeType() == TopAbs_COMPOUND) {
@@
-87,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));
if(theIsMakeCompSolids && aResult.ShapeType() == TopAbs_COMPOUND) {
std::shared_ptr<GeomAPI_Shape> aGeomShape(new GeomAPI_Shape);
aGeomShape->setImpl(new TopoDS_Shape(aResult));
- ListOfShape a
CompSolids, aFreeSolid
s;
+ ListOfShape a
Result
s;
aGeomShape = GeomAlgoAPI_ShapeTools::combineShapes(aGeomShape,
GeomAPI_Shape::COMPSOLID,
aGeomShape = GeomAlgoAPI_ShapeTools::combineShapes(aGeomShape,
GeomAPI_Shape::COMPSOLID,
- aCompSolids,
- aFreeSolids);
+ aResults);
aResult = aGeomShape->impl<TopoDS_Shape>();
}
aResult = aGeomShape->impl<TopoDS_Shape>();
}