X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMImpl%2FGEOMImpl_IShapesOperations.hxx;h=f11bd4fc45a24291428f962893590b68691beec9;hb=b6f0965afb72083a5234f9b4fb0b233adaaf8d9d;hp=d45ad5419db5a2cb459e19cfbbde6e373cd57cec;hpb=8370b4a1c488f6ef18d8944869d6a8cd3a2d18d2;p=modules%2Fgeom.git

diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx
index d45ad5419..f11bd4fc4 100644
--- a/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2022  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
@@ -37,14 +37,15 @@
 
 #include <TColStd_HSequenceOfTransient.hxx>
 #include <TColStd_HSequenceOfInteger.hxx>
+#include <TColStd_HArray1OfInteger.hxx>
 
 #include <Geom_Surface.hxx>
 
 #include <list>
+#include <vector>
 
 class GEOM_Engine;
-class Handle(GEOM_Object);
-class Handle(TColStd_HArray1OfInteger);
+class GEOM_Object;
 class TopoDS_Shape;
 
 class GEOMImpl_IShapesOperations : public GEOM_IOperations
@@ -78,7 +79,7 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
     std::list<Standard_Integer> indices; ///< Shape indices touched by this type of modification.
   };
 
-  Standard_EXPORT GEOMImpl_IShapesOperations(GEOM_Engine* theEngine, int theDocID);
+  Standard_EXPORT GEOMImpl_IShapesOperations(GEOM_Engine* theEngine);
   Standard_EXPORT ~GEOMImpl_IShapesOperations();
 
   Standard_EXPORT Handle(GEOM_Object) MakeEdge (Handle(GEOM_Object) thePoint1,
@@ -275,9 +276,9 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
     * \param theShape - the shape to explore
     * \param theShapeType - type of sub-shape of theShape
     * \param theTopLeftPoint - top left quadrangle corner
-    * \param theTopRigthPoint - top right quadrangle corner
+    * \param theTopRightPoint - top right quadrangle corner
     * \param theBottomLeftPoint - bottom left quadrangle corner
-    * \param theBottomRigthPoint - bottom right quadrangle corner
+    * \param theBottomRightPoint - bottom right quadrangle corner
     * \param theState - required state
     * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found sub-shapes
    */
@@ -285,9 +286,9 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
     GetShapesOnQuadrangle (const Handle(GEOM_Object)& theShape,
                            const Standard_Integer     theShapeType,
                            const Handle(GEOM_Object)& theTopLeftPoint,
-                           const Handle(GEOM_Object)& theTopRigthPoint,
+                           const Handle(GEOM_Object)& theTopRightPoint,
                            const Handle(GEOM_Object)& theBottomLeftPoint,
-                           const Handle(GEOM_Object)& theBottomRigthPoint,
+                           const Handle(GEOM_Object)& theBottomRightPoint,
                            const GEOMAlgo_State       theState);
 
   /*!
@@ -295,9 +296,9 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
     * \param theShape - the shape to explore
     * \param theShapeType - type of sub-shape of theShape
     * \param theTopLeftPoint - top left quadrangle corner
-    * \param theTopRigthPoint - top right quadrangle corner
+    * \param theTopRightPoint - top right quadrangle corner
     * \param theBottomLeftPoint - bottom left quadrangle corner
-    * \param theBottomRigthPoint - bottom right quadrangle corner
+    * \param theBottomRightPoint - bottom right quadrangle corner
     * \param theState - required state
     * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found sub-shapes
    */
@@ -305,9 +306,9 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
     GetShapesOnQuadrangleIDs (const Handle(GEOM_Object)& theShape,
                               const Standard_Integer     theShapeType,
                               const Handle(GEOM_Object)& theTopLeftPoint,
-                              const Handle(GEOM_Object)& theTopRigthPoint,
+                              const Handle(GEOM_Object)& theTopRightPoint,
                               const Handle(GEOM_Object)& theBottomLeftPoint,
-                              const Handle(GEOM_Object)& theBottomRigthPoint,
+                              const Handle(GEOM_Object)& theBottomRightPoint,
                               const GEOMAlgo_State       theState);
 
   Standard_EXPORT Handle(GEOM_Object) GetShapesOnCylinderOld (Handle(GEOM_Object)    theShape,
@@ -329,6 +330,10 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
   Standard_EXPORT Handle(GEOM_Object) GetInPlaceByHistory (Handle(GEOM_Object) theShapeWhere,
                                                            Handle(GEOM_Object) theShapeWhat);
 
+  Standard_EXPORT void GetInPlaceMap (Handle(GEOM_Object)                 theShapeWhere,
+                                      Handle(GEOM_Object)                 theShapeWhat,
+                                      std::vector< std::vector< int > > & theResVec);
+
   /*!
    * \brief Searches a shape equal to theWhat in the context of theWhere
    * \param theShapeWhere - a context shap
@@ -499,7 +504,7 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
    * \param theStats the operation statistics. Output parameter.
    * \return the shape without extracted sub-shapes.
    */
-  Handle(GEOM_Object) MakeExtraction
+  Standard_EXPORT Handle(GEOM_Object) MakeExtraction
                      (const Handle(GEOM_Object)              &theShape,
                       const Handle(TColStd_HArray1OfInteger) &theSubShapeIDs,
                       std::list<ExtractionStat>              &theStats);
@@ -572,9 +577,9 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
    * \param theShape - the shape to explore
    * \param theShapeType - type of sub-shape of theShape
    * \param theTopLeftPoint - top left quadrangle corner
-   * \param theTopRigthPoint - top right quadrangle corner
+   * \param theTopRightPoint - top right quadrangle corner
    * \param theBottomLeftPoint - bottom left quadrangle corner
-   * \param theBottomRigthPoint - bottom right quadrangle corner
+   * \param theBottomRightPoint - bottom right quadrangle corner
    * \param theState - required state
    * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found sub-shapes
    */
@@ -582,9 +587,9 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
     getShapesOnQuadrangleIDs (const Handle(GEOM_Object)& theShape,
                               const Standard_Integer     theShapeType,
                               const Handle(GEOM_Object)& theTopLeftPoint,
-                              const Handle(GEOM_Object)& theTopRigthPoint,
+                              const Handle(GEOM_Object)& theTopRightPoint,
                               const Handle(GEOM_Object)& theBottomLeftPoint,
-                              const Handle(GEOM_Object)& theBottomRigthPoint,
+                              const Handle(GEOM_Object)& theBottomRightPoint,
                               const GEOMAlgo_State       theState);
 
   /*!