From: dbv <dbv@opencascade.com>
Date: Wed, 3 Jun 2015 16:56:09 +0000 (+0300)
Subject: Small fix to revolution naming.
X-Git-Tag: V_1.2.1~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=cf7f9e68e9aa62462258720dab65b8ce8569ca6c;p=modules%2Fshaper.git

Small fix to revolution naming.
---

diff --git a/src/FeaturesPlugin/FeaturesPlugin_Revolution.cpp b/src/FeaturesPlugin/FeaturesPlugin_Revolution.cpp
index edf556918..63341f8c4 100644
--- a/src/FeaturesPlugin/FeaturesPlugin_Revolution.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_Revolution.cpp
@@ -23,9 +23,9 @@
 
 #define FACE 4
 #define EDGE 6
-#define _GENERATE_TAG 1
-#define _FIRST_TAG 2
-#define _LAST_TAG 3
+#define _LATERAL_TAG 1
+#define _FROM_TAG 2
+#define _TO_TAG 3
 
 //=================================================================================================
 FeaturesPlugin_Revolution::FeaturesPlugin_Revolution()
@@ -168,27 +168,27 @@ void FeaturesPlugin_Revolution::LoadNamingDS(GeomAlgoAPI_Revolution& theFeature,
   GeomAPI_DataMapOfShapeShape* aSubShapes = new GeomAPI_DataMapOfShapeShape();
   theFeature.mapOfShapes(*aSubShapes);
 
-  std::string aGeneratedName = "Generated";
-  theResultBody->loadAndOrientGeneratedShapes(theFeature.makeShape(), theBasis, EDGE,_GENERATE_TAG, aGeneratedName, *aSubShapes);
+  std::string aGeneratedName = "LateralFace";
+  theResultBody->loadAndOrientGeneratedShapes(theFeature.makeShape(), theBasis, EDGE,_LATERAL_TAG, aGeneratedName, *aSubShapes);
 
-  //Insert bottom face
+  //Insert from face
   std::string aBotName = "FromFace";
   std::shared_ptr<GeomAPI_Shape> aBottomFace = theFeature.firstShape();
   if(!aBottomFace->isNull()) {
     if(aSubShapes->isBound(aBottomFace)) {
       aBottomFace = aSubShapes->find(aBottomFace);
     }
-    theResultBody->generated(aBottomFace, aBotName, _FIRST_TAG);
+    theResultBody->generated(aBottomFace, aBotName, _FROM_TAG);
   }
 
-  //Insert top face
+  //Insert to face
   std::string aTopName = "ToFace";
   std::shared_ptr<GeomAPI_Shape> aTopFace = theFeature.lastShape();
   if (!aTopFace->isNull()) {
     if (aSubShapes->isBound(aTopFace)) {
       aTopFace = aSubShapes->find(aTopFace);
     }
-    theResultBody->generated(aTopFace, aTopName, _LAST_TAG);
+    theResultBody->generated(aTopFace, aTopName, _TO_TAG);
   }
 
 }
diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_MakeShapeList.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_MakeShapeList.cpp
index 618bc7c96..50e621abe 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_MakeShapeList.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_MakeShapeList.cpp
@@ -85,12 +85,12 @@ void GeomAlgoAPI_MakeShapeList::result(const std::shared_ptr<GeomAPI_Shape> theS
     for(NCollection_Map<TopoDS_Shape>::Iterator aShapeIt(anAlgoShapes); aShapeIt.More(); aShapeIt.Next()) {
       const TopoDS_Shape& aShape = aShapeIt.Value();
       const TopTools_ListOfShape& aGeneratedList = aBuilder->Generated(aShape);
-      const TopTools_ListOfShape& aModifiedList = aBuilder->Modified(aShape);
       for(TopTools_ListIteratorOfListOfShape anIt(aGeneratedList); anIt.More(); anIt.Next()) {
         aTempShapes.Add(anIt.Value());
         aResultShapes.Add(anIt.Value());
         hasResults = true;
       }
+      const TopTools_ListOfShape& aModifiedList = aBuilder->Modified(aShape);
       for(TopTools_ListIteratorOfListOfShape anIt(aModifiedList); anIt.More(); anIt.Next()) {
         aTempShapes.Add(anIt.Value());
         aResultShapes.Add(anIt.Value());