From: mpv <mpv@opencascade.com>
Date: Fri, 4 Sep 2015 05:29:26 +0000 (+0300)
Subject: Fix for other than bodies results renaming and issue #908
X-Git-Tag: V_1.4.0_beta4~130
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d3bcb0bf618523bdcbff01470fa09c447163c17e;p=modules%2Fshaper.git

Fix for other than bodies results renaming and issue #908
---

diff --git a/src/FeaturesPlugin/Test/TestExtrusion.py b/src/FeaturesPlugin/Test/TestExtrusion.py
index cd204d7ed..b6122f30a 100644
--- a/src/FeaturesPlugin/Test/TestExtrusion.py
+++ b/src/FeaturesPlugin/Test/TestExtrusion.py
@@ -228,9 +228,9 @@ anExtrusionFt.selectionList("base").append(
 anExtrusionFt.string("CreationMethod").setValue("ByPlanesAndOffsets")
 anExtrusionFt.real("to_size").setValue(0) #TODO: remove
 anExtrusionFt.real("from_size").setValue(0) #TODO: remove
-anExtrusionFt.selection("to_object").selectSubShape("face", "Extrusion_3/LateralFace_2")
+anExtrusionFt.selection("to_object").selectSubShape("face", "Extrusion_3_1/LateralFace_2")
 anExtrusionFt.real("to_offset").setValue(0)
-anExtrusionFt.selection("from_object").selectSubShape("face", "Extrusion_3/LateralFace_1")
+anExtrusionFt.selection("from_object").selectSubShape("face", "Extrusion_3_1/LateralFace_1")
 anExtrusionFt.real("from_offset").setValue(0)
 anExtrusionFt.execute()
 aSession.finishOperation()
diff --git a/src/Model/Model_Objects.cpp b/src/Model/Model_Objects.cpp
index 489ed63d1..adb4363a8 100644
--- a/src/Model/Model_Objects.cpp
+++ b/src/Model/Model_Objects.cpp
@@ -779,7 +779,7 @@ void Model_Objects::storeResult(std::shared_ptr<ModelAPI_Data> theFeatureData,
     std::stringstream aNewName;
     aNewName<<theFeatureData->name();
     // if there are several results (issue #899: any number of result), add unique prefix starting from second
-    if (theResultIndex >= 0)
+    if (theResultIndex > 0 || theResult->groupName() == ModelAPI_ResultBody::group())
       aNewName<<"_"<<theResultIndex + 1;
     theResult->data()->setName(aNewName.str());
   }