Issue #17347: B-Splines in Sketcher

[modules/shaper.git] / src / Selector / Selector_Intersect.cpp

diff --git a/src/Selector/Selector_Intersect.cpp b/src/Selector/Selector_Intersect.cpp
index 2d0750b3720331ca49624bad4c335af85681931e..81e54b80a8912931a2519871102f8126127c2e73 100644 (file)
--- a/src/Selector/Selector_Intersect.cpp
+++ b/src/Selector/Selector_Intersect.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2019  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
@@ -12,10 +12,9 @@
 //
 // 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_Intersect.h>
@@ -201,11 +200,6 @@ TDF_Label Selector_Intersect::restoreByName(std::string theName,
         char aShapeChar = theName[anEndPos + 1];
         if (theName[anEndPos + 1] != '[') {
           switch(aShapeChar) {
-          case 'c': aSubShapeType = TopAbs_COMPOUND; break;
-          case 'o': aSubShapeType = TopAbs_COMPSOLID; break;
-          case 's': aSubShapeType = TopAbs_SOLID; break;
-          case 'h': aSubShapeType = TopAbs_SHELL; break;
-          case 'w': aSubShapeType = TopAbs_WIRE; break;
           case 'e': aSubShapeType = TopAbs_EDGE; break;
           case 'v': aSubShapeType = TopAbs_VERTEX; break;
           default:;
@@ -214,8 +208,8 @@ TDF_Label Selector_Intersect::restoreByName(std::string theName,
       }
       TDF_Label aSubContext;
       Selector_Algo* aSubSel =
-        Selector_Algo::restoreByName(
-          newSubLabel(), baseDocument(), aSubStr, aSubShapeType, theNameGenerator, aSubContext);
+        Selector_Algo::restoreByName(newSubLabel(), baseDocument(), aSubStr, aSubShapeType,
+          geometricalNaming(), theNameGenerator, aSubContext);
       if (!append(aSubSel))
         return TDF_Label();
 
@@ -297,11 +291,6 @@ std::string Selector_Intersect::name(Selector_NameGenerator* theNameGenerator)
       TopAbs_ShapeEnum aSubType = aSubVal.ShapeType();
       if (aSubType != TopAbs_FACE) { // in case the sub shape type must be stored
         switch(aSubType) {
-        case TopAbs_COMPOUND: aResult += "c"; break;
-        case TopAbs_COMPSOLID: aResult += "o"; break;
-        case TopAbs_SOLID: aResult += "s"; break;
-        case TopAbs_SHELL: aResult += "h"; break;
-        case TopAbs_WIRE: aResult += "w"; break;
         case TopAbs_EDGE: aResult += "e"; break;
         case TopAbs_VERTEX: aResult += "v"; break;
         default:;