X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOM_I%2FGEOM_I3DPrimOperations_i.hh;h=97533349bd0a12a9cbe725c498619d55719053a8;hb=aa818f57a9421a3777f1849926f70df77a446c0d;hp=6a03d8d4226be26c89f0dbd321cdb2d399af1ff6;hpb=2488be88d9b3d65dd3e3487a6bbdb5e96694b8a5;p=modules%2Fgeom.git

diff --git a/src/GEOM_I/GEOM_I3DPrimOperations_i.hh b/src/GEOM_I/GEOM_I3DPrimOperations_i.hh
index 6a03d8d42..97533349b 100644
--- a/src/GEOM_I/GEOM_I3DPrimOperations_i.hh
+++ b/src/GEOM_I/GEOM_I3DPrimOperations_i.hh
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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
@@ -6,7 +6,7 @@
 // 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
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _GEOM_I3DPrimOperations_i_HeaderFile
 #define _GEOM_I3DPrimOperations_i_HeaderFile
@@ -74,6 +75,16 @@ class GEOM_I_EXPORT GEOM_I3DPrimOperations_i :
 					      GEOM::GEOM_Object_ptr theVec,
 					      CORBA::Double theR,
 					      CORBA::Double theH);
+					      
+  GEOM::GEOM_Object_ptr MakeCylinderRHA (CORBA::Double theR,
+					 CORBA::Double theH,
+					 CORBA::Double theA);
+
+  GEOM::GEOM_Object_ptr MakeCylinderPntVecRHA (GEOM::GEOM_Object_ptr thePnt,
+					       GEOM::GEOM_Object_ptr theVec,
+					       CORBA::Double theR,
+					       CORBA::Double theH,
+					       CORBA::Double theA);					      
 
   GEOM::GEOM_Object_ptr MakeConeR1R2H (CORBA::Double theR1,
 				       CORBA::Double theR2,
@@ -142,10 +153,12 @@ class GEOM_I_EXPORT GEOM_I3DPrimOperations_i :
                                         GEOM::GEOM_Object_ptr theBase,
                                         CORBA::Double         theHeight,
                                         CORBA::Double         theAngle,
-                                        CORBA::Boolean        theFuse);
-                            
-  GEOM::GEOM_Object_ptr MakePipe (GEOM::GEOM_Object_ptr theBase,
-				  GEOM::GEOM_Object_ptr thePath);
+                                        CORBA::Boolean        theFuse,
+                                        CORBA::Boolean        theInvert);
+
+  GEOM::ListOfGO* MakePipe (GEOM::GEOM_Object_ptr theBase,
+                            GEOM::GEOM_Object_ptr thePath,
+                            CORBA::Boolean        IsGenerateGroups);
 
   GEOM::GEOM_Object_ptr MakeRevolutionAxisAngle (GEOM::GEOM_Object_ptr theBase,
 						 GEOM::GEOM_Object_ptr theAxis,
@@ -155,7 +168,7 @@ class GEOM_I_EXPORT GEOM_I3DPrimOperations_i :
 						      GEOM::GEOM_Object_ptr theAxis,
 						      CORBA::Double theAngle);
 
-  GEOM::GEOM_Object_ptr MakeFilling(GEOM::GEOM_Object_ptr theShape,
+  GEOM::GEOM_Object_ptr MakeFilling(const GEOM::ListOfGO& theContours,
                                     CORBA::Long theMinDeg, CORBA::Long theMaxDeg,
                                     CORBA::Double theTol2D, CORBA::Double theTol3D,
                                     CORBA::Long theNbIter,
@@ -166,30 +179,41 @@ class GEOM_I_EXPORT GEOM_I3DPrimOperations_i :
 					 CORBA::Boolean theModeSolid,
 					 CORBA::Double thePreci,
 					 CORBA::Boolean theRuled);
-  
-  GEOM::GEOM_Object_ptr MakePipeWithDifferentSections(const GEOM::ListOfGO& theBases,
-						      const GEOM::ListOfGO& theLocations,
-						      GEOM::GEOM_Object_ptr thePath,
-						      CORBA::Boolean theWithContact,
-						      CORBA::Boolean theWithCorrections);
-
-  GEOM::GEOM_Object_ptr MakePipeWithShellSections(const GEOM::ListOfGO& theBases,
-						  const GEOM::ListOfGO& theSubBases,
-						  const GEOM::ListOfGO& theLocations,
-						  GEOM::GEOM_Object_ptr thePath,
-						  CORBA::Boolean theWithContact,
-						  CORBA::Boolean theWithCorrections);
-
-  GEOM::GEOM_Object_ptr MakePipeShellsWithoutPath(const GEOM::ListOfGO& theBases,
-						  const GEOM::ListOfGO& theLocations);
-
-  GEOM::GEOM_Object_ptr MakePipeBiNormalAlongVector (GEOM::GEOM_Object_ptr theBase,
-						     GEOM::GEOM_Object_ptr thePath,
-						     GEOM::GEOM_Object_ptr theVec);
-  
-  GEOM::GEOM_Object_ptr MakeThickening (GEOM::GEOM_Object_ptr theObject,
-                                        CORBA::Double theOffset,
-                                        CORBA::Boolean isCopy);
+
+  GEOM::ListOfGO* MakePipeWithDifferentSections
+                           (const GEOM::ListOfGO        &theBases,
+                            const GEOM::ListOfGO        &theLocations,
+                                  GEOM::GEOM_Object_ptr  thePath,
+                                  CORBA::Boolean         theWithContact,
+                                  CORBA::Boolean         theWithCorrections,
+                                  CORBA::Boolean         IsBySteps,
+                                  CORBA::Boolean         IsGenerateGroups);
+
+  GEOM::ListOfGO* MakePipeWithShellSections
+                           (const GEOM::ListOfGO        &theBases,
+                            const GEOM::ListOfGO        &theSubBases,
+                            const GEOM::ListOfGO        &theLocations,
+                                  GEOM::GEOM_Object_ptr  thePath,
+                                  CORBA::Boolean         theWithContact,
+                                  CORBA::Boolean         theWithCorrections,
+                                  CORBA::Boolean         IsGenerateGroups);
+
+  GEOM::ListOfGO* MakePipeShellsWithoutPath
+                           (const GEOM::ListOfGO &theBases,
+                            const GEOM::ListOfGO &theLocations,
+                                  CORBA::Boolean  IsGenerateGroups);
+
+  GEOM::ListOfGO* MakePipeBiNormalAlongVector
+                           (GEOM::GEOM_Object_ptr theBase,
+                            GEOM::GEOM_Object_ptr thePath,
+                            GEOM::GEOM_Object_ptr theVec,
+                            CORBA::Boolean        IsGenerateGroups);
+
+  GEOM::GEOM_Object_ptr MakeThickening (GEOM::GEOM_Object_ptr   theObject,
+                                        const GEOM::ListOfLong &theFacesIDs,
+                                        CORBA::Double           theOffset,
+                                        CORBA::Boolean          isCopy,
+                                        CORBA::Boolean          theInside);
 
   GEOM::GEOM_Object_ptr RestorePath (GEOM::GEOM_Object_ptr theShape,
                                      GEOM::GEOM_Object_ptr theBase1,