0022767: [EDF] Construction of composite solids

[modules/geom.git] / src / GEOMImpl / GEOMImpl_IShapesOperations.hxx

diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx
index e620817feaf4f3a5ad3538d399c11f2b741557e2..dca4233a9e69bcffc7cb0328e01eb2f664b750d1 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx
@@ -54,6 +54,15 @@ class Handle(TColStd_HArray1OfInteger);
 class GEOMImpl_IShapesOperations : public GEOM_IOperations
 {
  public:
+
+  enum SubShapeType {
+    None      = 0x00,
+    Groups    = 0x01,
+    Fields    = 0x02,
+    SubShapes = 0x04,
+    All       = Groups | Fields | SubShapes,
+  };
+
   Standard_EXPORT GEOMImpl_IShapesOperations(GEOM_Engine* theEngine, int theDocID);
   Standard_EXPORT ~GEOMImpl_IShapesOperations();
 
@@ -76,40 +85,45 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
   Standard_EXPORT Handle(GEOM_Object) MakeFaceWires (std::list<Handle(GEOM_Object)> theWires,
                                                      const bool isPlanarWanted);
 
+  Standard_EXPORT Handle(GEOM_Object) MakeFaceFromSurface
+                                              (Handle(GEOM_Object) theFace,
+                                               Handle(GEOM_Object) theWire);
+
   Standard_EXPORT Handle(GEOM_Object) MakeShell (std::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,
+  Standard_EXPORT Handle(GEOM_Object) MakeSolidFromConnectedFaces (std::list<Handle(GEOM_Object)> theFacesOrShells,
+                                                                   const Standard_Boolean isIntersect);
+
+  Standard_EXPORT Handle(GEOM_Object) MakeGlueFaces (std::list< Handle(GEOM_Object) >& theShapes,
                                                      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(GEOM_Object) MakeGlueFacesByList (Handle(GEOM_Object) theShape,
+  Standard_EXPORT Handle(GEOM_Object) MakeGlueFacesByList (std::list< Handle(GEOM_Object) >& theShapes,
                                                            const Standard_Real theTolerance,
-                                                           std::list<Handle(GEOM_Object)> theFaces,
+                                                           std::list<Handle(GEOM_Object)>& theFaces,
                                                            const Standard_Boolean doKeepNonSolids,
                                                            const Standard_Boolean doGlueAllEdges);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeGlueEdges (Handle(GEOM_Object) theShape,
+  Standard_EXPORT Handle(GEOM_Object) MakeGlueEdges (std::list< Handle(GEOM_Object) >& theShapes,
                                                      const Standard_Real theTolerance);
 
-  Standard_EXPORT Handle(TColStd_HSequenceOfTransient) GetGlueShapes (Handle(GEOM_Object) theShape,
+  Standard_EXPORT Handle(TColStd_HSequenceOfTransient) GetGlueShapes (std::list< Handle(GEOM_Object) >& theShapes,
                                                                       const Standard_Real theTolerance,
                                                                       const TopAbs_ShapeEnum theType);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeGlueEdgesByList (Handle(GEOM_Object) theShape,
+  Standard_EXPORT Handle(GEOM_Object) MakeGlueEdgesByList (std::list< Handle(GEOM_Object) >& theShapes,
                                                            const Standard_Real theTolerance,
-                                                           std::list<Handle(GEOM_Object)> theEdges);
-
-  Standard_EXPORT Handle(TColStd_HSequenceOfTransient) GetExistingSubObjects
-    (Handle(GEOM_Object)    theShape,
-     const Standard_Boolean theGroupsOnly);
+                                                           std::list<Handle(GEOM_Object)> & theEdges);
 
+  Standard_EXPORT Handle(TColStd_HSequenceOfTransient) GetExistingSubObjects(Handle(GEOM_Object)    theShape,
+                                                                             const Standard_Boolean theGroupsOnly);
+  Standard_EXPORT Handle(TColStd_HSequenceOfTransient) GetExistingSubObjects(Handle(GEOM_Object)    theShape,
+                                                                             const Standard_Integer theTypes = All);
+  
   enum ExplodeType {
     EXPLODE_OLD_INCLUDE_MAIN,
     EXPLODE_NEW_INCLUDE_MAIN,
@@ -159,8 +173,8 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
                      const Standard_Integer theShapeType);
 
   Standard_EXPORT Handle(TColStd_HSequenceOfTransient)
-    GetSharedShapes (std::list<Handle(GEOM_Object)> theShapes,
-                     const Standard_Integer         theShapeType);
+    GetSharedShapes (std::list<Handle(GEOM_Object)>& theShapes,
+                     const Standard_Integer          theShapeType);
 
   Standard_EXPORT Handle(TColStd_HSequenceOfTransient)
     GetShapesOnPlane (const Handle(GEOM_Object)& theShape,
@@ -373,6 +387,21 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
                                        const Standard_Integer theShapeType,
                                        GEOMAlgo_State theState);
 
+  Standard_EXPORT Handle(GEOM_Object)
+                            ExtendEdge(const Handle(GEOM_Object) &theEdge,
+                                       const Standard_Real        theMin,
+                                       const Standard_Real        theMax);
+
+  Standard_EXPORT Handle(GEOM_Object)
+                            ExtendFace(const Handle(GEOM_Object) &theFace,
+                                       const Standard_Real        theUMin,
+                                       const Standard_Real        theUMax,
+                                       const Standard_Real        theVMin,
+                                       const Standard_Real        theVMax);
+
+  Standard_EXPORT Handle(GEOM_Object)
+                   MakeSurfaceFromFace(const Handle(GEOM_Object) &theFace);
+
  private:
   Handle(GEOM_Object) MakeShape (std::list<Handle(GEOM_Object)>      theShapes,
                                  const Standard_Integer         theObjectType,