remove std::cout.

[modules/geom.git] / src / GEOM_I / GEOM_IShapesOperations_i.hh

diff --git a/src/GEOM_I/GEOM_IShapesOperations_i.hh b/src/GEOM_I/GEOM_IShapesOperations_i.hh
index acc80263fdb74ed16102d651db3fbdbdba67afc9..9cc86a98968be71a2bedbd6106af5f7fcf99ecc8 100644 (file)
--- a/src/GEOM_I/GEOM_IShapesOperations_i.hh
+++ b/src/GEOM_I/GEOM_IShapesOperations_i.hh
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  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
@@ -38,21 +38,24 @@ class GEOM_I_EXPORT GEOM_IShapesOperations_i :
 {
  public:
   GEOM_IShapesOperations_i (PortableServer::POA_ptr       thePOA,
-                           GEOM::GEOM_Gen_ptr            theEngine,
-                           ::GEOMImpl_IShapesOperations* theImpl);
+                            GEOM::GEOM_Gen_ptr            theEngine,
+                            ::GEOMImpl_IShapesOperations* theImpl);
   ~GEOM_IShapesOperations_i();
 
   GEOM::GEOM_Object_ptr MakeEdge (GEOM::GEOM_Object_ptr thePnt1,
-                                 GEOM::GEOM_Object_ptr thePnt2);
+                                  GEOM::GEOM_Object_ptr thePnt2);
+  GEOM::GEOM_Object_ptr MakeEdgeWire (GEOM::GEOM_Object_ptr theWire,
+                                     const CORBA::Double theLinearTolerance,
+                                     const CORBA::Double theAngularTolerance);
 
   GEOM::GEOM_Object_ptr MakeWire (const GEOM::ListOfGO& theEdgesAndWires,
                                   const CORBA::Double   theTolerance);
 
   GEOM::GEOM_Object_ptr MakeFace (GEOM::GEOM_Object_ptr theWire,
-                                 CORBA::Boolean  isPlanarWanted);
+                                  CORBA::Boolean  isPlanarWanted);
 
   GEOM::GEOM_Object_ptr MakeFaceWires (const GEOM::ListOfGO& theWires,
-                                      CORBA::Boolean  isPlanarWanted);
+                                       CORBA::Boolean  isPlanarWanted);
 
   GEOM::GEOM_Object_ptr MakeShell (const GEOM::ListOfGO& theFacesAndShells);
 
@@ -63,34 +66,51 @@ class GEOM_I_EXPORT GEOM_IShapesOperations_i :
   GEOM::GEOM_Object_ptr MakeCompound (const GEOM::ListOfGO& theShapes);
 
   GEOM::GEOM_Object_ptr MakeGlueFaces (GEOM::GEOM_Object_ptr theShape,
-                                      CORBA::Double         theTolerance,
+                                       CORBA::Double         theTolerance,
                                        CORBA::Boolean        doKeepNonSolids);
 
   GEOM::ListOfGO* GetGlueFaces (GEOM::GEOM_Object_ptr theShape,
-                               CORBA::Double         theTolerance);
+                                CORBA::Double         theTolerance);
 
   GEOM::GEOM_Object_ptr MakeGlueFacesByList (GEOM::GEOM_Object_ptr theShape,
-                                            CORBA::Double         theTolerance,
-                                            const GEOM::ListOfGO& theFaces,
-                                                CORBA::Boolean  doKeepNonSolids);
+                                             CORBA::Double         theTolerance,
+                                             const GEOM::ListOfGO& theFaces,
+                                             CORBA::Boolean  doKeepNonSolids);
 
+  GEOM::ListOfGO* GetExistingSubObjects (GEOM::GEOM_Object_ptr theShape,
+                                         CORBA::Boolean        theGroupsOnly);
 
+  // For old SubShapeAll()
+  // Deprecated, use MakeAllSubShapes() instead
   GEOM::ListOfGO* MakeExplode (GEOM::GEOM_Object_ptr theShape,
-                              CORBA::Long           theShapeType,
-                              CORBA::Boolean  isSorted);
+                               CORBA::Long           theShapeType,
+                               CORBA::Boolean        isSorted);
 
+  GEOM::ListOfGO* MakeAllSubShapes (GEOM::GEOM_Object_ptr theShape,
+                                    CORBA::Long           theShapeType,
+                                    CORBA::Boolean        isSorted);
+
+  GEOM::ListOfGO* ExtractSubShapes (GEOM::GEOM_Object_ptr theShape,
+                                    CORBA::Long           theShapeType,
+                                    CORBA::Boolean        isSorted);
+
+  // Deprecated, use GetAllSubShapesIDs() instead
   GEOM::ListOfLong* SubShapeAllIDs (GEOM::GEOM_Object_ptr theShape,
-                                   CORBA::Long           theShapeType,
-                                   CORBA::Boolean  isSorted);
+                                    CORBA::Long           theShapeType,
+                                    CORBA::Boolean        isSorted);
+
+  GEOM::ListOfLong* GetAllSubShapesIDs (GEOM::GEOM_Object_ptr theShape,
+                                        CORBA::Long           theShapeType,
+                                        CORBA::Boolean        isSorted);
 
   GEOM::GEOM_Object_ptr GetSubShape (GEOM::GEOM_Object_ptr theMainShape,
-                                    CORBA::Long           theID);
+                                     CORBA::Long           theID);
 
   CORBA::Long GetSubShapeIndex (GEOM::GEOM_Object_ptr theMainShape,
-                               GEOM::GEOM_Object_ptr theSubShape);
+                                GEOM::GEOM_Object_ptr theSubShape);
 
   CORBA::Long GetTopologyIndex (GEOM::GEOM_Object_ptr theMainShape,
-                               GEOM::GEOM_Object_ptr theSubShape);
+                                GEOM::GEOM_Object_ptr theSubShape);
 
   char* GetShapeTypeString (GEOM::GEOM_Object_ptr theShape);
 
@@ -104,25 +124,28 @@ class GEOM_I_EXPORT GEOM_IShapesOperations_i :
   GEOM::ListOfLong* GetFreeFacesIDs (GEOM::GEOM_Object_ptr theShape);
 
   GEOM::ListOfGO* GetSharedShapes (GEOM::GEOM_Object_ptr theShape1,
-                                  GEOM::GEOM_Object_ptr theShape2,
-                                  CORBA::Long           theShapeType);
+                                   GEOM::GEOM_Object_ptr theShape2,
+                                   CORBA::Long           theShapeType);
+
+  GEOM::ListOfGO* GetSharedShapesMulti (const GEOM::ListOfGO& theShapes,
+                                        CORBA::Long           theShapeType);
 
   GEOM::ListOfGO* GetShapesOnPlane (GEOM::GEOM_Object_ptr theShape,
-                                   CORBA::Long           theShapeType,
-                                   GEOM::GEOM_Object_ptr theAx1,
-                                   GEOM::shape_state     theState);
+                                    CORBA::Long           theShapeType,
+                                    GEOM::GEOM_Object_ptr theAx1,
+                                    GEOM::shape_state     theState);
 
   GEOM::ListOfGO* GetShapesOnPlaneWithLocation(GEOM::GEOM_Object_ptr theShape,
-                                              CORBA::Long           theShapeType,
-                                              GEOM::GEOM_Object_ptr theAx1,
-                                              GEOM::GEOM_Object_ptr thePnt,
-                                              GEOM::shape_state     theState);
+                                               CORBA::Long           theShapeType,
+                                               GEOM::GEOM_Object_ptr theAx1,
+                                               GEOM::GEOM_Object_ptr thePnt,
+                                               GEOM::shape_state     theState);
 
   GEOM::ListOfGO* GetShapesOnCylinder (GEOM::GEOM_Object_ptr theShape,
-                                      CORBA::Long           theShapeType,
-                                      GEOM::GEOM_Object_ptr theAxis,
-                                      CORBA::Double         theRadius,
-                                      GEOM::shape_state     theState);
+                                       CORBA::Long           theShapeType,
+                                       GEOM::GEOM_Object_ptr theAxis,
+                                       CORBA::Double         theRadius,
+                                       GEOM::shape_state     theState);
 
   GEOM::ListOfGO* GetShapesOnCylinderWithLocation (GEOM::GEOM_Object_ptr theShape,
                                                    CORBA::Long           theShapeType,
@@ -132,10 +155,10 @@ class GEOM_I_EXPORT GEOM_IShapesOperations_i :
                                                    GEOM::shape_state     theState);
 
   GEOM::ListOfGO* GetShapesOnSphere (GEOM::GEOM_Object_ptr theShape,
-                                    CORBA::Long           theShapeType,
-                                    GEOM::GEOM_Object_ptr theCenter,
-                                    CORBA::Double         theRadius,
-                                    GEOM::shape_state     theState);
+                                     CORBA::Long           theShapeType,
+                                     GEOM::GEOM_Object_ptr theCenter,
+                                     CORBA::Double         theRadius,
+                                     GEOM::shape_state     theState);
 
   GEOM::ListOfGO* GetShapesOnQuadrangle (GEOM::GEOM_Object_ptr theShape,
                                          CORBA::Long           theShapeType,
@@ -146,21 +169,21 @@ class GEOM_I_EXPORT GEOM_IShapesOperations_i :
                                          GEOM::shape_state     theState);
 
   GEOM::ListOfLong* GetShapesOnPlaneIDs (GEOM::GEOM_Object_ptr theShape,
-                                        CORBA::Long           theShapeType,
-                                        GEOM::GEOM_Object_ptr theAx1,
-                                        GEOM::shape_state     theState);
+                                         CORBA::Long           theShapeType,
+                                         GEOM::GEOM_Object_ptr theAx1,
+                                         GEOM::shape_state     theState);
 
   GEOM::ListOfLong* GetShapesOnPlaneWithLocationIDs (GEOM::GEOM_Object_ptr theShape,
-                                                    CORBA::Long           theShapeType,
-                                                    GEOM::GEOM_Object_ptr theAx1,
-                                                    GEOM::GEOM_Object_ptr thePnt,
-                                                    GEOM::shape_state     theState);
+                                                     CORBA::Long           theShapeType,
+                                                     GEOM::GEOM_Object_ptr theAx1,
+                                                     GEOM::GEOM_Object_ptr thePnt,
+                                                     GEOM::shape_state     theState);
 
   GEOM::ListOfLong* GetShapesOnCylinderIDs (GEOM::GEOM_Object_ptr theShape,
-                                           CORBA::Long           theShapeType,
-                                           GEOM::GEOM_Object_ptr theAxis,
-                                           CORBA::Double         theRadius,
-                                           GEOM::shape_state     theState);
+                                            CORBA::Long           theShapeType,
+                                            GEOM::GEOM_Object_ptr theAxis,
+                                            CORBA::Double         theRadius,
+                                            GEOM::shape_state     theState);
 
   GEOM::ListOfLong* GetShapesOnCylinderWithLocationIDs (GEOM::GEOM_Object_ptr theShape,
                                                         CORBA::Long           theShapeType,
@@ -170,10 +193,10 @@ class GEOM_I_EXPORT GEOM_IShapesOperations_i :
                                                         GEOM::shape_state     theState);
 
   GEOM::ListOfLong* GetShapesOnSphereIDs (GEOM::GEOM_Object_ptr theShape,
-                                         CORBA::Long           theShapeType,
-                                         GEOM::GEOM_Object_ptr theCenter,
-                                         CORBA::Double         theRadius,
-                                         GEOM::shape_state     theState);
+                                          CORBA::Long           theShapeType,
+                                          GEOM::GEOM_Object_ptr theCenter,
+                                          CORBA::Double         theRadius,
+                                          GEOM::shape_state     theState);
 
   GEOM::ListOfLong* GetShapesOnQuadrangleIDs (GEOM::GEOM_Object_ptr theShape,
                                               CORBA::Long           theShapeType,
@@ -184,39 +207,39 @@ class GEOM_I_EXPORT GEOM_IShapesOperations_i :
                                               GEOM::shape_state     theState);
 
   GEOM::ListOfGO* GetShapesOnBox (GEOM::GEOM_Object_ptr theBox,
-                                 GEOM::GEOM_Object_ptr theShape,
-                                 CORBA::Long           theShapeType,
-                                 GEOM::shape_state     theState);
+                                  GEOM::GEOM_Object_ptr theShape,
+                                  CORBA::Long           theShapeType,
+                                  GEOM::shape_state     theState);
 
   GEOM::ListOfLong* GetShapesOnBoxIDs (GEOM::GEOM_Object_ptr theBox,
-                                      GEOM::GEOM_Object_ptr theShape,
-                                      CORBA::Long           theShapeType,
-                                      GEOM::shape_state     theState);
+                                       GEOM::GEOM_Object_ptr theShape,
+                                       CORBA::Long           theShapeType,
+                                       GEOM::shape_state     theState);
 
   GEOM::ListOfGO* GetShapesOnShape (GEOM::GEOM_Object_ptr theSheckShape,
-                                   GEOM::GEOM_Object_ptr theShape,
-                                   CORBA::Short          theShapeType,
-                                   GEOM::shape_state     theState);
+                                    GEOM::GEOM_Object_ptr theShape,
+                                    CORBA::Short          theShapeType,
+                                    GEOM::shape_state     theState);
 
   GEOM::GEOM_Object_ptr GetShapesOnShapeAsCompound
                                    (GEOM::GEOM_Object_ptr theSheckShape,
-                                   GEOM::GEOM_Object_ptr theShape,
-                                   CORBA::Short          theShapeType,
-                                   GEOM::shape_state     theState);
+                                    GEOM::GEOM_Object_ptr theShape,
+                                    CORBA::Short          theShapeType,
+                                    GEOM::shape_state     theState);
 
   GEOM::ListOfLong* GetShapesOnShapeIDs (GEOM::GEOM_Object_ptr theCheckShape,
-                                        GEOM::GEOM_Object_ptr theShape,
-                                        CORBA::Short          theShapeType,
-                                        GEOM::shape_state     theState);
+                                         GEOM::GEOM_Object_ptr theShape,
+                                         CORBA::Short          theShapeType,
+                                         GEOM::shape_state     theState);
 
   GEOM::GEOM_Object_ptr GetInPlace (GEOM::GEOM_Object_ptr theShapeWhere,
-                                   GEOM::GEOM_Object_ptr theShapeWhat);
+                                    GEOM::GEOM_Object_ptr theShapeWhat);
 
   GEOM::GEOM_Object_ptr GetInPlaceByHistory (GEOM::GEOM_Object_ptr theShapeWhere,
-                                            GEOM::GEOM_Object_ptr theShapeWhat);
+                                             GEOM::GEOM_Object_ptr theShapeWhat);
 
   GEOM::GEOM_Object_ptr GetSame (GEOM::GEOM_Object_ptr theShapeWhere,
-                                GEOM::GEOM_Object_ptr theShapeWhat);
+                                 GEOM::GEOM_Object_ptr theShapeWhat);
 
   ::GEOMImpl_IShapesOperations* GetOperations()
   { return (::GEOMImpl_IShapesOperations*)GetImpl(); }