Sketcher: implement possibility to set zero distance

[modules/shaper.git] / src / GDMLPlugin / GDMLPlugin_Ellipsoid.cpp

diff --git a/src/GDMLPlugin/GDMLPlugin_Ellipsoid.cpp b/src/GDMLPlugin/GDMLPlugin_Ellipsoid.cpp
index 55e2d14454f6f688a69b55f5634bd632b2dbdddd..4f92544391afae0d83f07ccbae8c70c6f8f0a3c3 100644 (file)
--- a/src/GDMLPlugin/GDMLPlugin_Ellipsoid.cpp
+++ b/src/GDMLPlugin/GDMLPlugin_Ellipsoid.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<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #include <GDMLPlugin_Ellipsoid.h>
@@ -113,23 +112,26 @@ void GDMLPlugin_Ellipsoid::loadNamingDS(std::shared_ptr<GeomAlgoAPI_Ellipsoid> t
 
   // Insert to faces
   // Naming for faces and edges
-  int num = 1;
   std::map< std::string, std::shared_ptr<GeomAPI_Shape> > listOfFaces =
       theEllipsoidAlgo->getCreatedFaces();
-  for (std::map< std::string, std::shared_ptr<GeomAPI_Shape> >::iterator
-       it=listOfFaces.begin(); it!=listOfFaces.end(); ++it) {
-    std::shared_ptr<GeomAPI_Shape> aFace = (*it).second;
-    theResultEllipsoid->generated(aFace, (*it).first, num++);
+  for (std::map< std::string, std::shared_ptr<GeomAPI_Shape> >::iterator it = listOfFaces.begin();
+       it!=listOfFaces.end();
+       ++it)
+  {
+    theResultEllipsoid->generated((*it).second, (*it).first);
   }
 
   // Naming vertices
   GeomAPI_DataMapOfShapeShape aVertices;
-  GeomAPI_ShapeExplorer aVertExp(theEllipsoidAlgo->shape(), GeomAPI_Shape::VERTEX);
-  for(int anIndex = 1; aVertExp.more(); aVertExp.next()) {
+  int anIndex = 1;
+  for (GeomAPI_ShapeExplorer aVertExp(theEllipsoidAlgo->shape(), GeomAPI_Shape::VERTEX);
+       aVertExp.more();
+       aVertExp.next())
+  {
     if (!aVertices.isBound(aVertExp.current())) {
       std::ostringstream aStream;
       aStream<<"Vertex_"<<anIndex++;
-      theResultEllipsoid->generated(aVertExp.current(), aStream.str(), num++);
+      theResultEllipsoid->generated(aVertExp.current(), aStream.str());
       aVertices.bind(aVertExp.current(), aVertExp.current());
     }
   }