- // Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2020 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
//
// 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
+// 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>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include <Selector_Selector.h>
Selector_NameGenerator* theNameGenerator, const bool theGeometricalNaming)
{
TDF_Label aResult;
- myAlgo = Selector_Algo::restoreByName(
- myLab, myBaseDocumentLab, theName, theShapeType, theNameGenerator, aResult);
+ myAlgo = Selector_Algo::restoreByName(myLab, myBaseDocumentLab, theName, theShapeType,
+ theGeometricalNaming, theNameGenerator, aResult);
if (myAlgo) {
return aResult;
}
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;
- }
- }
}
}