From 953c011cb416075fbdd3eb3bd9f3eb74966c28de Mon Sep 17 00:00:00 2001
From: Clarisse Genrault <clarisse.genrault@cea.fr>
Date: Thu, 28 Sep 2017 15:53:04 +0200
Subject: [PATCH] Correction on the naming.

---
 .../PrimitivesPlugin_Cone.cpp                 | 21 ++++++++++++++++++-
 .../PrimitivesPlugin_Sphere.cpp               | 17 +++++++++++++++
 .../PrimitivesPlugin_Torus.cpp                | 18 +++++++++++++++-
 3 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/src/PrimitivesPlugin/PrimitivesPlugin_Cone.cpp b/src/PrimitivesPlugin/PrimitivesPlugin_Cone.cpp
index fba4eb498..4d92398d7 100644
--- a/src/PrimitivesPlugin/PrimitivesPlugin_Cone.cpp
+++ b/src/PrimitivesPlugin/PrimitivesPlugin_Cone.cpp
@@ -8,6 +8,7 @@
 
 #include <GeomAPI_Edge.h>
 #include <GeomAPI_Lin.h>
+#include <GeomAPI_ShapeExplorer.h>
 
 #include <GeomAlgoAPI_PointBuilder.h>
 
@@ -17,6 +18,8 @@
 #include <ModelAPI_ResultConstruction.h>
 #include <ModelAPI_Session.h>
 
+#include <sstream>
+
 //=================================================================================================
 PrimitivesPlugin_Cone::PrimitivesPlugin_Cone()
 {
@@ -145,9 +148,25 @@ void PrimitivesPlugin_Cone::loadNamingDS(std::shared_ptr<GeomAlgoAPI_Cone> theCo
   int num = 1;
   std::map< std::string, std::shared_ptr<GeomAPI_Shape> > listOfFaces =
       theConeAlgo->getCreatedFaces();
+  int nbFaces = 0;
   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;
     theResultCone->generated(aFace, (*it).first, num++);
+    nbFaces++;
+  }
+  
+  if (nbFaces == 2) {
+    // Naming vertices
+    GeomAPI_DataMapOfShapeShape aVertices;
+    GeomAPI_ShapeExplorer aVertExp(theConeAlgo->shape(), GeomAPI_Shape::VERTEX);
+    for(int anIndex = 1; aVertExp.more(); aVertExp.next()) {
+      if (!aVertices.isBound(aVertExp.current())) {
+        std::ostringstream aStream;
+        aStream<<"Vertex_"<<anIndex++;
+        theResultCone->generated(aVertExp.current(), aStream.str(), num++);
+        aVertices.bind(aVertExp.current(), aVertExp.current());
+      }
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/src/PrimitivesPlugin/PrimitivesPlugin_Sphere.cpp b/src/PrimitivesPlugin/PrimitivesPlugin_Sphere.cpp
index 9e63047df..e6376b270 100644
--- a/src/PrimitivesPlugin/PrimitivesPlugin_Sphere.cpp
+++ b/src/PrimitivesPlugin/PrimitivesPlugin_Sphere.cpp
@@ -6,6 +6,8 @@
 
 #include <PrimitivesPlugin_Sphere.h>
 
+#include <GeomAPI_ShapeExplorer.h>
+
 #include <GeomAlgoAPI_PointBuilder.h>
 
 #include <ModelAPI_AttributeDouble.h>
@@ -14,6 +16,8 @@
 #include <ModelAPI_ResultConstruction.h>
 #include <ModelAPI_Session.h>
 
+#include <sstream>
+
 //=================================================================================================
 PrimitivesPlugin_Sphere::PrimitivesPlugin_Sphere()
 {
@@ -101,6 +105,7 @@ void PrimitivesPlugin_Sphere::loadNamingDS(std::shared_ptr<GeomAlgoAPI_Sphere> t
   theSphereAlgo->prepareNamingFaces();
 
   // Insert to faces
+  // Naming for faces and edges
   int num = 1;
   std::map< std::string, std::shared_ptr<GeomAPI_Shape> > listOfFaces =
       theSphereAlgo->getCreatedFaces();
@@ -109,4 +114,16 @@ void PrimitivesPlugin_Sphere::loadNamingDS(std::shared_ptr<GeomAlgoAPI_Sphere> t
     std::shared_ptr<GeomAPI_Shape> aFace = (*it).second;
     theResultSphere->generated(aFace, (*it).first, num++);
   }
+  
+  // Naming vertices
+  GeomAPI_DataMapOfShapeShape aVertices;
+  GeomAPI_ShapeExplorer aVertExp(theSphereAlgo->shape(), GeomAPI_Shape::VERTEX);
+  for(int anIndex = 1; aVertExp.more(); aVertExp.next()) {
+    if (!aVertices.isBound(aVertExp.current())) {
+      std::ostringstream aStream;
+      aStream<<"Vertex_"<<anIndex++;
+      theResultSphere->generated(aVertExp.current(), aStream.str(), num++);
+      aVertices.bind(aVertExp.current(), aVertExp.current());
+    }
+  }
 }
diff --git a/src/PrimitivesPlugin/PrimitivesPlugin_Torus.cpp b/src/PrimitivesPlugin/PrimitivesPlugin_Torus.cpp
index 817714a95..bd5a8851b 100644
--- a/src/PrimitivesPlugin/PrimitivesPlugin_Torus.cpp
+++ b/src/PrimitivesPlugin/PrimitivesPlugin_Torus.cpp
@@ -8,6 +8,7 @@
 
 #include <GeomAPI_Edge.h>
 #include <GeomAPI_Lin.h>
+#include <GeomAPI_ShapeExplorer.h>
 
 #include <GeomAlgoAPI_PointBuilder.h>
 
@@ -17,6 +18,8 @@
 #include <ModelAPI_ResultConstruction.h>
 #include <ModelAPI_Session.h>
 
+#include <sstream>
+
 //=================================================================================================
 PrimitivesPlugin_Torus::PrimitivesPlugin_Torus()
 {
@@ -138,6 +141,7 @@ void PrimitivesPlugin_Torus::loadNamingDS(std::shared_ptr<GeomAlgoAPI_Torus> the
   theTorusAlgo->prepareNamingFaces();
 
   // Insert to faces
+  // Naming for faces
   int num = 1;
   std::map< std::string, std::shared_ptr<GeomAPI_Shape> > listOfFaces =
       theTorusAlgo->getCreatedFaces();
@@ -146,4 +150,16 @@ void PrimitivesPlugin_Torus::loadNamingDS(std::shared_ptr<GeomAlgoAPI_Torus> the
     std::shared_ptr<GeomAPI_Shape> aFace = (*it).second;
     theResultTorus->generated(aFace, (*it).first, num++);
   }
-}
\ No newline at end of file
+  
+  // Naming of edges
+  GeomAPI_DataMapOfShapeShape anEdges;
+  GeomAPI_ShapeExplorer anEdgeExp(theTorusAlgo->shape(), GeomAPI_Shape::EDGE);
+  for(int anIndex = 1; anEdgeExp.more(); anEdgeExp.next()) {
+    if (!anEdges.isBound(anEdgeExp.current())) {
+      std::ostringstream aStream;
+      aStream<<"Edge_"<<anIndex++;
+      theResultTorus->generated(anEdgeExp.current(), aStream.str(), num++);
+      anEdges.bind(anEdgeExp.current(), anEdgeExp.current());
+    }
+  }
+}
-- 
2.39.2