X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FBuildPlugin%2FBuildPlugin_Interpolation.cpp;h=8d6ed1584e244ce4a44c3d0bfd3340278bfc220e;hb=7ae186c144dfecba2dedeaeba2b6691cef9408f8;hp=bc651c9d6df408b59e3ff68bff6bbff9c38f6266;hpb=704b13912d9014fca20c36fe91a389b9d12353e8;p=modules%2Fshaper.git diff --git a/src/BuildPlugin/BuildPlugin_Interpolation.cpp b/src/BuildPlugin/BuildPlugin_Interpolation.cpp index bc651c9d6..8d6ed1584 100644 --- a/src/BuildPlugin/BuildPlugin_Interpolation.cpp +++ b/src/BuildPlugin/BuildPlugin_Interpolation.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// 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 @@ -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_Interpolation.h" @@ -86,7 +85,7 @@ void BuildPlugin_Interpolation::execute() bool isToReorder = boolean(REORDER_ID())->value(); // Get use tangents flag value - bool isToUseTangents = !string(USE_TANGENTS_ID())->value().empty(); + bool isToUseTangents = isClosed? false : (!string(USE_TANGENTS_ID())->value().empty()); // Get tangent for start and end points GeomDirPtr aDirStart, aDirEnd; @@ -128,12 +127,12 @@ void BuildPlugin_Interpolation::execute() ResultBodyPtr aResultBody = document()->createBody(data()); std::set::const_iterator aContextIt = aContexts.begin(); for (; aContextIt != aContexts.end(); aContextIt++) { - aResultBody->storeModified(*aContextIt, anEdge, aContextIt == aContexts.begin() ? 0 : -2); + aResultBody->storeModified(*aContextIt, anEdge, aContextIt == aContexts.begin()); } int aVertexIndex = 1; for (GeomAPI_ShapeExplorer anExp(anEdge, GeomAPI_Shape::VERTEX); anExp.more(); anExp.next()) { std::string aVertexName = "Vertex_" + std::to_string((long long)aVertexIndex); - aResultBody->generated(anExp.current(), aVertexName, aVertexIndex++); + aResultBody->generated(anExp.current(), aVertexName); } setResult(aResultBody);