X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAlgoAPI%2FGeomAlgoAPI_ShapeBuilder.cpp;h=cb25126c54996aa879b9e14ea525a87e027c61de;hb=09365c927ebe8d881de2eda7f96bc33a2d9511c8;hp=cc3e24bfec990acc9f50c406944e82b2661f3bdd;hpb=6f2932a147e8e5b2eb226b8fea2c2bf9fec16a0e;p=modules%2Fshaper.git diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeBuilder.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeBuilder.cpp index cc3e24bfe..cb25126c5 100644 --- a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeBuilder.cpp +++ b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeBuilder.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: GeomAlgoAPI_ShapeBuilder.cpp -// Created: 27 April 2016 -// Author: Dmitry Bobylev +// 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_ShapeBuilder.h" @@ -128,7 +141,7 @@ void GeomAlgoAPI_ShapeBuilder::addInternal(const std::shared_ptr // Copy sub-shapes from list to new shape. BRep_Builder aBuilder; std::shared_ptr aMakeShapeCustom(new GeomAlgoAPI_MakeShapeCustom()); - for(ListOfShape::const_iterator + for(ListOfShape::const_iterator anIt = theShapesToAdd.cbegin(); anIt != theShapesToAdd.cend(); ++anIt) { TopoDS_Shape aShapeToAdd = (*anIt)->impl(); TopoDS_Shape aModShapeToAdd = aShapeToAdd; @@ -160,7 +173,7 @@ void GeomAlgoAPI_ShapeBuilder::addInternal(const std::shared_ptr if(aBaseShapeType == TopAbs_WIRE) { if(aShapeToAddType == TopAbs_VERTEX) { // Find on which edge vertex is lie and add to this edge. - for(TopExp_Explorer + for(TopExp_Explorer aResultExp(aResultShape, TopAbs_EDGE); aResultExp.More(); aResultExp.Next()) { TopoDS_Shape anEdge = aResultExp.Current(); BRepExtrema_DistShapeShape aDist(anEdge, aShapeToAdd); @@ -175,8 +188,8 @@ void GeomAlgoAPI_ShapeBuilder::addInternal(const std::shared_ptr } } } - } else if(aBaseShapeType == GeomAPI_Shape::FACE) { - if(aShapeToAddType == GeomAPI_Shape::EDGE) { + } else if(aBaseShapeType == TopAbs_FACE) { + if(aShapeToAddType == TopAbs_EDGE) { aShapeToAdd.Orientation(TopAbs_INTERNAL); TopoDS_Wire aWire; aBuilder.MakeWire(aWire);