From b06e6d2c58e13330fcfc3363bc4c4c957ec0a663 Mon Sep 17 00:00:00 2001
From: mpv <mpv@opencascade.com>
Date: Fri, 15 Dec 2017 13:35:43 +0300
Subject: [PATCH] Fix the naming problems for the sub-solids sub elements
 selection

---
 src/Model/Model_AttributeSelection.cpp | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/Model/Model_AttributeSelection.cpp b/src/Model/Model_AttributeSelection.cpp
index 3f4ee57be..64516d223 100644
--- a/src/Model/Model_AttributeSelection.cpp
+++ b/src/Model/Model_AttributeSelection.cpp
@@ -869,7 +869,7 @@ void Model_AttributeSelection::selectSubShape(
       if (aCont.get() && aShapeToBeSelected.get()) {
         ResultCompSolidPtr aComp = std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(aCont);
         if (aComp && aComp->numberOfSubs()) {
-          for(int aSubNum = aComp->numberOfSubs() - 1; aSubNum >= 0; aSubNum--) {
+          for(int aSubNum = 0; aSubNum < aComp->numberOfSubs(); aSubNum++) {
             ResultPtr aSub = aComp->subResult(aSubNum);
             if (aSub && aSub->shape().get() && aSub->shape()->isSubShape(aShapeToBeSelected)) {
               aCont = aSub;
@@ -895,10 +895,24 @@ void Model_AttributeSelection::selectSubShape(
             continue;
           // search the feature result that contains sub-shape selected
           std::list<std::shared_ptr<ModelAPI_Result> > aResults;
-          ModelAPI_Tools::allResults(aRefFeat, aResults);
-          std::list<std::shared_ptr<ModelAPI_Result> >::reverse_iterator aResIter =
-            aResults.rbegin(); // iterate from the end to find the sub-solid first than compsolid
-          for(; aResIter != aResults.rend(); aResIter++) {
+
+          // take all sub-results or one result
+          const std::list<std::shared_ptr<ModelAPI_Result> >& aFResults = aRefFeat->results();
+          std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aRIter = aFResults.begin();
+          for (; aRIter != aFResults.cend(); aRIter++) {
+            // iterate sub-bodies of compsolid
+            ResultCompSolidPtr aComp = std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(*aRIter);
+            if (aComp.get() && aComp->numberOfSubs() > 0) {
+              int aNumSub = aComp->numberOfSubs();
+              for(int a = 0; a < aNumSub; a++) {
+                aResults.push_back(aComp->subResult(a));
+              }
+            } else {
+              aResults.push_back(*aRIter);
+            }
+          }
+          std::list<std::shared_ptr<ModelAPI_Result> >::iterator aResIter = aResults.begin();
+          for(; aResIter != aResults.end(); aResIter++) {
             if (!aResIter->get() || !(*aResIter)->data()->isValid() || (*aResIter)->isDisabled())
               continue;
             GeomShapePtr aShape = (*aResIter)->shape();
-- 
2.39.2