X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FBuildPlugin%2FBuildPlugin_Compound.cpp;h=7aa9a81641d78c6c47d0f58ae41f17c78968e6d5;hb=c57d2a7f1a57af01656e47e2e510990492404fce;hp=69c8551bbbc6ee15bb9625feb7433c0858631ea6;hpb=082f07c5a84968fbdc8df7f3e1c9e6c2b6a6f043;p=modules%2Fshaper.git diff --git a/src/BuildPlugin/BuildPlugin_Compound.cpp b/src/BuildPlugin/BuildPlugin_Compound.cpp index 69c8551bb..7aa9a8164 100644 --- a/src/BuildPlugin/BuildPlugin_Compound.cpp +++ b/src/BuildPlugin/BuildPlugin_Compound.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2017-20xx CEA/DEN, EDF R&D +// Copyright (C) 2017-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 @@ -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 -// 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "BuildPlugin_Compound.h" @@ -70,24 +69,16 @@ void BuildPlugin_Compound::execute() // Build compound. GeomShapePtr aCompound = GeomAlgoAPI_CompoundBuilder::compound(anOriginalShapes); // Copy shape. - GeomAlgoAPI_Copy aCopyAlgo(aCompound); - GeomShapePtr aCopyCompound = aCopyAlgo.shape(); + GeomMakeShapePtr aCopyAlgo(new GeomAlgoAPI_Copy(aCompound)); + GeomShapePtr aCopyCompound = aCopyAlgo->shape(); int anIndexToRemove = 0; if (aCopyCompound) { - std::shared_ptr aMapOfShapes = aCopyAlgo.mapOfSubShapes(); - ResultBodyPtr aResultBody = document()->createBody(data(), anIndexToRemove++); - aResultBody->store(aCopyCompound); - aResultBody->loadAndOrientModifiedShapes(&aCopyAlgo, aCompound, GeomAPI_Shape::VERTEX, - 1, "Modified_Vertex", *aMapOfShapes.get(), - true, false, true); - aResultBody->loadAndOrientModifiedShapes(&aCopyAlgo, aCompound, GeomAPI_Shape::EDGE, - 100000, "Modified_Edge", *aMapOfShapes.get(), - true, false, true); - aResultBody->loadAndOrientModifiedShapes(&aCopyAlgo, aCompound, GeomAPI_Shape::FACE, - 200000, "Modified_Face", *aMapOfShapes.get(), - true, false, true); + aResultBody->storeModified(anOriginalShapes, aCopyCompound, aCopyAlgo); + aResultBody->loadModifiedShapes(aCopyAlgo, aCompound, GeomAPI_Shape::VERTEX); + aResultBody->loadModifiedShapes(aCopyAlgo, aCompound, GeomAPI_Shape::EDGE); + aResultBody->loadModifiedShapes(aCopyAlgo, aCompound, GeomAPI_Shape::FACE); setResult(aResultBody); } removeResults(anIndexToRemove);