Added a unit-test for a sub-shell selection naming.

diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt
index f5d95d6639c3bbe7924197f4a9d48a9b57f779b7..ed4a75d730974897c5dde615042e7069d02ae75f 100644 (file)
--- a/src/ModelAPI/CMakeLists.txt
+++ b/src/ModelAPI/CMakeLists.txt
@@ -211,6 +211,7 @@ ADD_UNIT_TESTS(TestConstants.py
                Test2607.py
                TestBlockRecalculation.py
                TestSelectionScope.py
+               TestSelectorShell.py
                TestWeakNaming2125.py
                TestWeakNaming2222.py
                TestWeakNaming2245.py

diff --git a/src/ModelAPI/Test/TestSelectorShell.py b/src/ModelAPI/Test/TestSelectorShell.py
new file mode 100644 (file)
index 0000000..3038845
--- /dev/null
+++ b/src/ModelAPI/Test/TestSelectorShell.py
@@ -0,0 +1,44 @@
+## Copyright (C) 2014-2017  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
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## 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
+##
+## See http:##www.salome-platform.org/ or
+## email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+##
+
+# -*- coding: utf-8 -*-
+
+from salome.shaper import model
+from GeomAPI import *
+
+model.begin()
+partSet = model.moduleDocument()
+Part_1 = model.addPart(partSet)
+Part_1_doc = Part_1.document()
+Box_1 = model.addBox(Part_1_doc, 10, 10, 10)
+model.do()
+# select a shell of a box : this test checks selection of a shell
+aBoxResult = Box_1.feature().results()[0]
+aShell = GeomAPI_ShapeExplorer(aBoxResult.shape(), GeomAPI_Shape.SHELL)
+aGroup = Part_1_doc.addFeature("Group")
+aGroup.selectionList("group_list").append(aBoxResult, aShell.current())
+model.end()
+
+# check that the resulting group is correct
+from ModelAPI import *
+aFactory = ModelAPI_Session.get().validators()
+assert(aFactory.validate(aGroup))
+
+assert(model.checkPythonDump())

diff --git a/src/Selector/Selector_Selector.cpp b/src/Selector/Selector_Selector.cpp
index 548cd0cc65fe4da6a358dd9d307ac822c225f4cf..4ed6caebc3b20468893d176eb0797a28bc0dc536 100644 (file)
--- a/src/Selector/Selector_Selector.cpp
+++ b/src/Selector/Selector_Selector.cpp
@@ -103,31 +103,6 @@ void Selector_Selector::combineGeometrical(const TopoDS_Shape theContext)
     aNewAlgo->solve(theContext);
     delete myAlgo;
     myAlgo = aNewAlgo;
-  } else {
-    // if can not select, select the compound in a custom way
-    TopTools_MapOfShape aMap;
-    TopoDS_ListOfShape aList;
-    for(TopExp_Explorer anExp(theContext, aValue.ShapeType()); anExp.More(); anExp.Next()) {
-      if (aMap.Add(anExp.Current())) {
-        if (myAlgo->sameGeometry(aValue, anExp.Current()))
-          aList.Append(anExp.Current());
-      }
-    }
-    if (aList.Size() > 1) {
-      TopoDS_Builder aBuilder;
-      TopoDS_Compound aCompound;
-      aBuilder.MakeCompound(aCompound);
-      for(TopoDS_ListIteratorOfListOfShape aListIter(aList); aListIter.More(); aListIter.Next()) {
-        aBuilder.Add(aCompound, aListIter.Value());
-      }
-      Selector_Algo* aNewAlgo = Selector_Algo::relesectWithAllGeometry(myAlgo, theContext);
-      if (aNewAlgo) {
-        aNewAlgo->store();
-        aNewAlgo->solve(theContext);
-        delete myAlgo;
-        myAlgo = aNewAlgo;
-      }
-    }
   }
 }