Salome HOME
Mantis issue 0021414: There is a difference between vectors and other edges in Geometry.
[modules/geom.git] / src / GEOMImpl / GEOMImpl_IShapesOperations.hxx
index 6506de36e55fc3b7db8c78c3ec5697c2eb27a86f..c30ae1868b653415731cab7819cb34c219803035 100644 (file)
@@ -1,52 +1,61 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-// 
+//
 // 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 
+// License as published by the Free Software Foundation; either
 // version 2.1 of the License.
-// 
-// 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 
+//
+// 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 
+// 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
 //
+
 //=============================================================================
 // File      : GEOMImpl_IShapesOperations.hxx
-// Created   : 
+// Created   :
 // Author    : modified by Lioka RAZAFINDRAZAKA (CEA) 22/06/2007
 // Project   : SALOME
-// Copyright : CEA 2003
-// $Header$
 //=============================================================================
+
 #ifndef _GEOMImpl_IShapesOperations_HXX_
 #define _GEOMImpl_IShapesOperations_HXX_
 
-using namespace std;
-
 #include "GEOM_IOperations.hxx"
 
 #include "GEOMAlgo_State.hxx"
 
+#include <TopoDS_Shape.hxx>
 #include <TopTools_ListOfShape.hxx>
+#include <NCollection_DataMap.hxx>
 #include <TColStd_HSequenceOfTransient.hxx>
 #include <TColStd_HSequenceOfInteger.hxx>
 
-#include <list>
 #include <Handle_Geom_Surface.hxx>
 
 #include <gp_Pnt.hxx>
 
+#include <list>
+#include <functional>
+
 class GEOM_Engine;
 class Handle(GEOM_Object);
 class Handle(TColStd_HArray1OfInteger);
 
+inline Standard_Boolean IsEqual (const TopoDS_Shape& S1, const TopoDS_Shape& S2)
+{
+  return S1.IsSame(S2);
+}
+
 class GEOMImpl_IShapesOperations : public GEOM_IOperations
 {
  public:
@@ -54,46 +63,83 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
   Standard_EXPORT ~GEOMImpl_IShapesOperations();
 
   Standard_EXPORT Handle(GEOM_Object) MakeEdge (Handle(GEOM_Object) thePoint1,
-                                Handle(GEOM_Object) thePoint2);
+                                                Handle(GEOM_Object) thePoint2);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeWire (list<Handle(GEOM_Object)> theEdgesAndWires);
+  Standard_EXPORT Handle(GEOM_Object) MakeEdgeOnCurveByLength (Handle(GEOM_Object) theCurve,
+                                                               const Standard_Real theLength,
+                                                               Handle(GEOM_Object) theStartPoint);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeFace (Handle(GEOM_Object) theWire, const bool isPlanarWanted);
+  Standard_EXPORT Handle(GEOM_Object) MakeEdgeWire (Handle(GEOM_Object) theWire,
+                                                    const Standard_Real theLinearTolerance,
+                                                    const Standard_Real theAngularTolerance);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeFaceWires (list<Handle(GEOM_Object)> theWires,
-                                     const bool isPlanarWanted);
+  Standard_EXPORT Handle(GEOM_Object) MakeWire (std::list<Handle(GEOM_Object)> theEdgesAndWires,
+                                                const Standard_Real            theTolerance);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeShell (list<Handle(GEOM_Object)> theShapes);
+  Standard_EXPORT Handle(GEOM_Object) MakeFace (Handle(GEOM_Object) theWire, const bool isPlanarWanted);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeSolidShell (Handle(GEOM_Object) theShell);
+  Standard_EXPORT Handle(GEOM_Object) MakeFaceWires (std::list<Handle(GEOM_Object)> theWires,
+                                                     const bool isPlanarWanted);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeSolidShells (list<Handle(GEOM_Object)> theShells);
+  Standard_EXPORT Handle(GEOM_Object) MakeShell (std::list<Handle(GEOM_Object)> theShapes);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeCompound (list<Handle(GEOM_Object)> theShapes);
+  Standard_EXPORT Handle(GEOM_Object) MakeSolidShells (std::list<Handle(GEOM_Object)> theShells);
+
+  Standard_EXPORT Handle(GEOM_Object) MakeCompound (std::list<Handle(GEOM_Object)> theShapes);
 
   Standard_EXPORT Handle(GEOM_Object) MakeGlueFaces (Handle(GEOM_Object) theShape,
-                                                    const Standard_Real theTolerance,
+                                                     const Standard_Real theTolerance,
                                                      const Standard_Boolean doKeepNonSolids);
 
-  Standard_EXPORT Handle(TColStd_HSequenceOfTransient) GetGlueFaces (Handle(GEOM_Object) theShape,
-                                                                    const Standard_Real theTolerance);
+  //Standard_EXPORT Handle(TColStd_HSequenceOfTransient) GetGlueFaces (Handle(GEOM_Object) theShape,
+  //                                                                   const Standard_Real theTolerance);
 
   Standard_EXPORT Handle(GEOM_Object) MakeGlueFacesByList (Handle(GEOM_Object) theShape,
-                                                          const Standard_Real theTolerance,
-                                                          list<Handle(GEOM_Object)> theFaces,
-                                                           const Standard_Boolean doKeepNonSolids);
-
-  Standard_EXPORT Handle(TColStd_HSequenceOfTransient) MakeExplode (Handle(GEOM_Object)    theShape,
-                                                                    const Standard_Integer theShapeType,
-                                                                    const Standard_Boolean isSorted);
-
-  Standard_EXPORT Handle(TColStd_HSequenceOfInteger) SubShapeAllIDs (Handle(GEOM_Object)    theShape,
-                                                                     const Standard_Integer theShapeType,
-                                                                     const Standard_Boolean isSorted);
+                                                           const Standard_Real theTolerance,
+                                                           std::list<Handle(GEOM_Object)> theFaces,
+                                                           const Standard_Boolean doKeepNonSolids,
+                                                           const Standard_Boolean doGlueAllEdges);
+
+  Standard_EXPORT Handle(GEOM_Object) MakeGlueEdges (Handle(GEOM_Object) theShape,
+                                                     const Standard_Real theTolerance);
+
+  Standard_EXPORT Handle(TColStd_HSequenceOfTransient) GetGlueShapes (Handle(GEOM_Object) theShape,
+                                                                      const Standard_Real theTolerance,
+                                                                      const TopAbs_ShapeEnum theType);
+
+  Standard_EXPORT Handle(GEOM_Object) MakeGlueEdgesByList (Handle(GEOM_Object) theShape,
+                                                           const Standard_Real theTolerance,
+                                                           std::list<Handle(GEOM_Object)> theEdges);
+
+  Standard_EXPORT Handle(TColStd_HSequenceOfTransient) GetExistingSubObjects
+    (Handle(GEOM_Object)    theShape,
+     const Standard_Boolean theGroupsOnly);
+
+  enum ExplodeType {
+    EXPLODE_OLD_INCLUDE_MAIN,
+    EXPLODE_NEW_INCLUDE_MAIN,
+    EXPLODE_NEW_EXCLUDE_MAIN
+  };
+
+  Standard_EXPORT Handle(TColStd_HSequenceOfTransient) MakeExplode
+    (Handle(GEOM_Object)    theShape,
+     const Standard_Integer theShapeType,
+     const Standard_Boolean isSorted,
+     const ExplodeType      theExplodeType = EXPLODE_NEW_INCLUDE_MAIN);
+
+  Standard_EXPORT Handle(TColStd_HSequenceOfInteger) SubShapeAllIDs
+    (Handle(GEOM_Object)    theShape,
+     const Standard_Integer theShapeType,
+     const Standard_Boolean isSorted,
+     const ExplodeType      theExplodeType = EXPLODE_NEW_INCLUDE_MAIN);
 
   Standard_EXPORT Handle(GEOM_Object) GetSubShape (Handle(GEOM_Object)    theMainShape,
                                                    const Standard_Integer theID);
 
+  Standard_EXPORT Handle(TColStd_HSequenceOfTransient) MakeSubShapes
+    (Handle(GEOM_Object)              theMainShape,
+     Handle(TColStd_HArray1OfInteger) theIndices);
+
   Standard_EXPORT Standard_Integer GetSubShapeIndex (Handle(GEOM_Object) theMainShape,
                                                      Handle(GEOM_Object) theSubShape);
 
@@ -102,21 +148,27 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
 
   Standard_EXPORT TCollection_AsciiString GetShapeTypeString (Handle(GEOM_Object) theShape);
 
-  Standard_EXPORT Standard_Integer NumberOfFaces (Handle(GEOM_Object) theShape);
-  Standard_EXPORT Standard_Integer NumberOfEdges (Handle(GEOM_Object) theShape);
+  Standard_EXPORT Standard_Integer NumberOfSubShapes (Handle(GEOM_Object)    theShape,
+                                                      const Standard_Integer theShapeType);
 
   Standard_EXPORT Handle(GEOM_Object) ReverseShape(Handle(GEOM_Object) theShapes);
 
   Standard_EXPORT Handle(TColStd_HSequenceOfInteger) GetFreeFacesIDs (Handle(GEOM_Object) theShape);
 
-  Standard_EXPORT Handle(TColStd_HSequenceOfTransient) GetSharedShapes (Handle(GEOM_Object)    theShape1,
-                                                        Handle(GEOM_Object)    theShape2,
-                                                        const Standard_Integer theShapeType);
+  Standard_EXPORT Handle(TColStd_HSequenceOfTransient)
+    GetSharedShapes (Handle(GEOM_Object)    theShape1,
+                     Handle(GEOM_Object)    theShape2,
+                     const Standard_Integer theShapeType);
+
+  Standard_EXPORT Handle(TColStd_HSequenceOfTransient)
+    GetSharedShapes (std::list<Handle(GEOM_Object)> theShapes,
+                     const Standard_Integer         theShapeType);
 
-  Standard_EXPORT Handle(TColStd_HSequenceOfTransient) GetShapesOnPlane (const Handle(GEOM_Object)& theShape,
-                                                         const Standard_Integer     theShapeType,
-                                                         const Handle(GEOM_Object)& theAx1,
-                                                         const GEOMAlgo_State       theState);
+  Standard_EXPORT Handle(TColStd_HSequenceOfTransient)
+    GetShapesOnPlane (const Handle(GEOM_Object)& theShape,
+                      const Standard_Integer     theShapeType,
+                      const Handle(GEOM_Object)& theAx1,
+                      const GEOMAlgo_State       theState);
 
   Standard_EXPORT Handle(TColStd_HSequenceOfTransient)
     GetShapesOnPlaneWithLocation (const Handle(GEOM_Object)& theShape,
@@ -133,6 +185,14 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
                          const Standard_Real        theRadius,
                          const GEOMAlgo_State       theState);
 
+  Standard_EXPORT Handle(TColStd_HSequenceOfTransient)
+    GetShapesOnCylinderWithLocation (const Handle(GEOM_Object)& theShape,
+                                     const Standard_Integer     theShapeType,
+                                     const Handle(GEOM_Object)& theAxis,
+                                     const Handle(GEOM_Object)& thePnt,
+                                     const Standard_Real        theRadius,
+                                     const GEOMAlgo_State       theState);
+
   Standard_EXPORT Handle(TColStd_HSequenceOfTransient)
     GetShapesOnSphere (const Handle(GEOM_Object)& theShape,
                        const Standard_Integer     theShapeType,
@@ -160,6 +220,14 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
                             const Standard_Real        theRadius,
                             const GEOMAlgo_State       theState);
 
+  Standard_EXPORT Handle(TColStd_HSequenceOfInteger)
+    GetShapesOnCylinderWithLocationIDs (const Handle(GEOM_Object)& theShape,
+                                        const Standard_Integer     theShapeType,
+                                        const Handle(GEOM_Object)& theAxis,
+                                        const Handle(GEOM_Object)& thePnt,
+                                        const Standard_Real        theRadius,
+                                        const GEOMAlgo_State       theState);
+
   Standard_EXPORT Handle(TColStd_HSequenceOfInteger)
     GetShapesOnSphereIDs (const Handle(GEOM_Object)& theShape,
                           const Standard_Integer     theShapeType,
@@ -208,20 +276,23 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
                               const GEOMAlgo_State       theState);
 
   Standard_EXPORT Handle(GEOM_Object) GetShapesOnCylinderOld (Handle(GEOM_Object)    theShape,
-                                              const Standard_Integer theShapeType,
-                                              Handle(GEOM_Object)    theAxis,
-                                              const Standard_Real    theRadius);
+                                                              const Standard_Integer theShapeType,
+                                                              Handle(GEOM_Object)    theAxis,
+                                                              const Standard_Real    theRadius);
 
   Standard_EXPORT Handle(GEOM_Object) GetShapesOnSphereOld (Handle(GEOM_Object)    theShape,
-                                            const Standard_Integer theShapeType,
-                                            Handle(GEOM_Object)    theCenter,
-                                            const Standard_Real    theRadius);
+                                                            const Standard_Integer theShapeType,
+                                                            Handle(GEOM_Object)    theCenter,
+                                                            const Standard_Real    theRadius);
 
   void GetShapeProperties(const TopoDS_Shape aShape, Standard_Real propertiesArray[], gp_Pnt & aPnt);
 
   Standard_EXPORT Handle(GEOM_Object) GetInPlace (Handle(GEOM_Object) theShapeWhere,
                                                   Handle(GEOM_Object) theShapeWhat);
 
+  Standard_EXPORT Handle(GEOM_Object) GetInPlaceOld (Handle(GEOM_Object) theShapeWhere,
+                                                     Handle(GEOM_Object) theShapeWhat);
+
   Standard_EXPORT Handle(GEOM_Object) GetInPlaceByHistory (Handle(GEOM_Object) theShapeWhere,
                                                            Handle(GEOM_Object) theShapeWhat);
 
@@ -254,20 +325,66 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
    * \param theShape - the shape to explore
    * \param theShapeType - type of subshape of theShape
    * \param theState - required state
+   * \retval Handle(TColStd_HSequenceOfTransient) - found shape objects
+   */
+  Standard_EXPORT Handle(TColStd_HSequenceOfTransient)
+                             GetShapesOnBox(const Handle(GEOM_Object)& theBox,
+                                            const Handle(GEOM_Object)& theShape,
+                                            const Standard_Integer theShapeType,
+                                            GEOMAlgo_State theState);
+
+  /*!
+   * \brief Find IDs of subshapes complying with given status about surface
+   * \param theCheckShape - the shape to check state of subshapes against
+   * \param theShape - the shape to explore
+   * \param theShapeType - type of subshape of theShape
+   * \param theState - required state
    * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
    */
+  Standard_EXPORT Handle(TColStd_HSequenceOfInteger)
+                   GetShapesOnShapeIDs(const Handle(GEOM_Object)& theCheckShape,
+                                       const Handle(GEOM_Object)& theShape,
+                                       const Standard_Integer theShapeType,
+                                       GEOMAlgo_State theState);
+
+  /*!
+   * \brief Find subshapes complying with given status about surface
+   * \param theCheckShape - the shape to check state of subshapes against
+   * \param theShape - the shape to explore
+   * \param theShapeType - type of subshape of theShape
+   * \param theState - required state
+   * \retval Handle(TColStd_HSequenceOfTransient) - found shape objects
+   */
   Standard_EXPORT Handle(TColStd_HSequenceOfTransient)
-                                GetShapesOnBox(const Handle(GEOM_Object)& theBox,
-                                               const Handle(GEOM_Object)& theShape,
-                                               const Standard_Integer theShapeType,
-                                               GEOMAlgo_State theState);
+                      GetShapesOnShape(const Handle(GEOM_Object)& theCheckShape,
+                                       const Handle(GEOM_Object)& theShape,
+                                       const Standard_Integer theShapeType,
+                                       GEOMAlgo_State theState);
+  Standard_EXPORT Handle(GEOM_Object)
+            GetShapesOnShapeAsCompound(const Handle(GEOM_Object)& theCheckShape,
+                                       const Handle(GEOM_Object)& theShape,
+                                       const Standard_Integer theShapeType,
+                                       GEOMAlgo_State theState);
 
  public:
   /*!
    * \brief Sort shapes in the list by their coordinates.
    * \param SL The list of shapes to sort.
    */
-  Standard_EXPORT static void SortShapes (TopTools_ListOfShape& SL);
+  struct CompareShapes : public std::binary_function<TopoDS_Shape, TopoDS_Shape, bool>
+  {
+    CompareShapes (bool isOldSorting)
+      : myIsOldSorting(isOldSorting) {}
+
+    bool operator()(const TopoDS_Shape& lhs, const TopoDS_Shape& rhs);
+
+    typedef NCollection_DataMap<TopoDS_Shape, std::pair<double, double> > NCollection_DataMapOfShapeDouble;
+    NCollection_DataMapOfShapeDouble myMap;
+    bool myIsOldSorting;
+  };
+
+  Standard_EXPORT static void SortShapes (TopTools_ListOfShape& SL,
+                                          const Standard_Boolean isOldSorting = Standard_True);
 
   /*!
    * \brief Convert TopoDS_COMPSOLID to TopoDS_COMPOUND.
@@ -286,8 +403,15 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
    */
   Standard_EXPORT static bool CheckTriangulation (const TopoDS_Shape& theShape);
 
+  /*!
+   * \brief Return type of shape for explode. In case of compound it will be a type of its first sub shape.
+   * \param theShape The shape to get type of.
+   * \retval TopAbs_ShapeEnum Return type of shape for explode.
+   */
+  Standard_EXPORT static TopAbs_ShapeEnum GetTypeOfSimplePart (const TopoDS_Shape& theShape);
+
  private:
-  Handle(GEOM_Object) MakeShape (list<Handle(GEOM_Object)>      theShapes,
+  Handle(GEOM_Object) MakeShape (std::list<Handle(GEOM_Object)>      theShapes,
                                  const Standard_Integer         theObjectType,
                                  const Standard_Integer         theFunctionType,
                                  const TCollection_AsciiString& theMethodName);
@@ -298,34 +422,34 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
 
   /*!
    * \brief Checks if theShapeType parameter of GetShapesOnXXX() is OK
-    * \param theShapeType - the shape type to check
-    * \retval bool  - result of the check
+   * \param theShapeType - the shape type to check
+   * \retval bool  - result of the check
    */
   bool checkTypeShapesOn(const Standard_Integer theShapeType);
 
   /*!
    * \brief Creates Geom_Plane
-    * \param theAx1 - edge defining plane normal
-    * \retval Handle(Geom_Surface) - resulting surface
+   * \param theAx1 - edge defining plane normal
+   * \retval Handle(Geom_Surface) - resulting surface
    */
   Handle(Geom_Surface) makePlane(const TopoDS_Shape& theAx1);
 
   /*!
    * \brief Creates Geom_CylindricalSurface
-    * \param theAx1 - edge defining cylinder axis
-    * \param theRadius - cylinder radius
-    * \retval Handle(Geom_Surface) - resulting surface
+   * \param theAx1 - edge defining cylinder axis
+   * \param theRadius - cylinder radius
+   * \retval Handle(Geom_Surface) - resulting surface
    */
   Handle(Geom_Surface) makeCylinder(const TopoDS_Shape& theAx1,
                                     const Standard_Real theRadius);
 
   /*!
    * \brief Find IDs of subshapes complying with given status about surface
-    * \param theSurface - the surface to check state of subshapes against
-    * \param theShape - the shape to explore
-    * \param theShapeType - type of subshape of theShape
-    * \param theState - required state
-    * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
+   * \param theSurface - the surface to check state of subshapes against
+   * \param theShape - the shape to explore
+   * \param theShapeType - type of subshape of theShape
+   * \param theState - required state
+   * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
    */
   Handle(TColStd_HSequenceOfInteger)
     getShapesOnSurfaceIDs(const Handle(Geom_Surface)& theSurface,
@@ -335,12 +459,12 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
 
   /*!
    * \brief Find subshapes complying with given status about surface
-    * \param theSurface - the surface to check state of subshapes against
-    * \param theShape - the shape to explore
-    * \param theShapeType - type of subshape of theShape
-    * \param theState - required state
-    * \param theShapeEntries - outgoing entries like "entry1, entry2, ..."
-    * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
+   * \param theSurface - the surface to check state of subshapes against
+   * \param theShape - the shape to explore
+   * \param theShapeType - type of subshape of theShape
+   * \param theState - required state
+   * \param theShapeEntries - outgoing entries like "entry1, entry2, ..."
+   * \retval Handle(TColStd_HSequenceOfTransient) - found shape objects
    */
   Handle(TColStd_HSequenceOfTransient)
     getShapesOnSurface(const Handle(Geom_Surface)& theSurface,
@@ -351,14 +475,14 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
 
   /*!
    * \brief Find IDs of subshapes complying with given status about quadrangle
-    * \param theShape - the shape to explore
-    * \param theShapeType - type of subshape of theShape
-    * \param theTopLeftPoint - top left quadrangle corner
-    * \param theTopRigthPoint - top right quadrangle corner
-    * \param theBottomLeftPoint - bottom left quadrangle corner
-    * \param theBottomRigthPoint - bottom right quadrangle corner
-    * \param theState - required state
-    * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
+   * \param theShape - the shape to explore
+   * \param theShapeType - type of subshape of theShape
+   * \param theTopLeftPoint - top left quadrangle corner
+   * \param theTopRigthPoint - top right quadrangle corner
+   * \param theBottomLeftPoint - bottom left quadrangle corner
+   * \param theBottomRigthPoint - bottom right quadrangle corner
+   * \param theState - required state
+   * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
    */
   Handle(TColStd_HSequenceOfInteger)
     getShapesOnQuadrangleIDs (const Handle(GEOM_Object)& theShape,
@@ -371,23 +495,37 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
 
   /*!
    * \brief Find IDs of subshapes complying with given status about surface
-    * \param theBox - the box to check state of subshapes against
-    * \param theShape - the shape to explore
-    * \param theShapeType - type of subshape of theShape
-    * \param theState - required state
-    * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
+   * \param theBox - the box to check state of subshapes against
+   * \param theShape - the shape to explore
+   * \param theShapeType - type of subshape of theShape
+   * \param theState - required state
+   * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
    */
   Handle(TColStd_HSequenceOfInteger) getShapesOnBoxIDs(const Handle(GEOM_Object)& theBox,
                                                        const Handle(GEOM_Object)& theShape,
                                                        const Standard_Integer theShapeType,
                                                        GEOMAlgo_State theState);
 
+  /*!
+   * \brief Find IDs of subshapes complying with given status about surface
+   * \param theCheckShape - the shape to check state of subshapes against
+   * \param theShape - the shape to explore
+   * \param theShapeType - type of subshape of theShape
+   * \param theState - required state
+   * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
+   */
+  Handle(TColStd_HSequenceOfInteger) getShapesOnShapeIDs
+                                      (const Handle(GEOM_Object)& theCheckShape,
+                                       const Handle(GEOM_Object)& theShape,
+                                       const Standard_Integer theShapeType,
+                                       GEOMAlgo_State theState);
+
   /*!
    * \brief Find shape objects and their entries by their ids
-    * \param theShape - the main shape
-    * \param theShapeIDs - theShapeIDs - incoming shape ids
-    * \param theShapeEntries - outgoing entries like "entry1, entry2, ..."
-    * \retval Handle(TColStd_HSequenceOfTransient) - found shape objects
+   * \param theShape - the main shape
+   * \param theShapeIDs - theShapeIDs - incoming shape ids
+   * \param theShapeEntries - outgoing entries like "entry1, entry2, ..."
+   * \retval Handle(TColStd_HSequenceOfTransient) - found shape objects
    */
   Handle(TColStd_HSequenceOfTransient)
     getObjectsShapesOn(const Handle(GEOM_Object)&                theShape,
@@ -396,9 +534,9 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
 
   /*!
    * \brief Select the object created last
-    * \param theObj1 - Object 1
-    * \param theObj2 - Object 2
-    * \retval Handle(GEOM_Object) - selected object
+   * \param theObj1 - Object 1
+   * \param theObj2 - Object 2
+   * \retval Handle(GEOM_Object) - selected object
    */
   static Handle(GEOM_Object) getCreatedLast(const Handle(GEOM_Object)& theObj1,
                                             const Handle(GEOM_Object)& theObj2);