X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOM_I%2FGEOM_IBlocksOperations_i.hh;h=8fa1e1de7766660df12924f4cd5436e2cfb05b47;hb=8f2d0b5697219b8b53289bd9c25a60ddc354ab53;hp=32c5085dabe31232af8ef05c4f33c7e941113fe4;hpb=d3dd282390888d7dc091ba2c2ffe7923bd7458e6;p=modules%2Fgeom.git

diff --git a/src/GEOM_I/GEOM_IBlocksOperations_i.hh b/src/GEOM_I/GEOM_IBlocksOperations_i.hh
index 32c5085da..8fa1e1de7 100644
--- a/src/GEOM_I/GEOM_IBlocksOperations_i.hh
+++ b/src/GEOM_I/GEOM_IBlocksOperations_i.hh
@@ -1,7 +1,29 @@
+//  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
+//
+//  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.
+//
+//  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
+//  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_IBlocksOperations_i_HeaderFile
 #define _GEOM_IBlocksOperations_i_HeaderFile
 
+#include "GEOMImpl_Gen.hxx"
 
 #include <SALOMEconfig.h>
 
@@ -11,7 +33,7 @@
 
 #include "GEOMImpl_IBlocksOperations.hxx"
 
-class GEOM_IBlocksOperations_i :
+class GEOM_I_EXPORT GEOM_IBlocksOperations_i :
     public virtual POA_GEOM::GEOM_IBlocksOperations,
     public virtual GEOM_IOperations_i
 {
@@ -48,10 +70,13 @@ class GEOM_IBlocksOperations_i :
 
   // Extract elements of blocks and blocks compounds
   GEOM::GEOM_Object_ptr GetPoint (GEOM::GEOM_Object_ptr theShape,
-				  const CORBA::Double   theX,
-				  const CORBA::Double   theY,
-				  const CORBA::Double   theZ,
-				  const CORBA::Double   theEpsilon);
+				  CORBA::Double   theX,
+				  CORBA::Double   theY,
+				  CORBA::Double   theZ,
+				  CORBA::Double   theEpsilon);
+
+  GEOM::GEOM_Object_ptr GetVertexNearPoint (GEOM::GEOM_Object_ptr theShape,
+                                            GEOM::GEOM_Object_ptr thePoint);
 
   GEOM::GEOM_Object_ptr GetEdge (GEOM::GEOM_Object_ptr theShape,
 				 GEOM::GEOM_Object_ptr thePoint1,
@@ -79,10 +104,15 @@ class GEOM_IBlocksOperations_i :
   GEOM::GEOM_Object_ptr GetFaceByNormale (GEOM::GEOM_Object_ptr theBlock,
 					  GEOM::GEOM_Object_ptr theVector);
 
+  GEOM::GEOM_Object_ptr GetShapesNearPoint (GEOM::GEOM_Object_ptr theShape,
+                                            GEOM::GEOM_Object_ptr thePoint,
+                                            CORBA::Long           theShapeType,
+                                            CORBA::Double         theTolerance);
+
   // Check blocks compound
   CORBA::Boolean IsCompoundOfBlocks (GEOM::GEOM_Object_ptr theCompound,
-				     const CORBA::Long     theMinNbFaces,
-				     const CORBA::Long     theMaxNbFaces,
+				     CORBA::Long           theMinNbFaces,
+				     CORBA::Long           theMaxNbFaces,
 				     CORBA::Long&          theNbBlocks);
 
   CORBA::Boolean CheckCompoundOfBlocks (GEOM::GEOM_Object_ptr theCompound,
@@ -91,10 +121,15 @@ class GEOM_IBlocksOperations_i :
   char* PrintBCErrors (GEOM::GEOM_Object_ptr theCompound,
 		       const GEOM::GEOM_IBlocksOperations::BCErrors& theErrors);
 
+  GEOM::GEOM_Object_ptr RemoveExtraEdges (GEOM::GEOM_Object_ptr theShape,
+                                          CORBA::Long           theOptimumNbFaces);
+
+  GEOM::GEOM_Object_ptr CheckAndImprove (GEOM::GEOM_Object_ptr theCompound);
+
   // Extract blocks from blocks compounds
   GEOM::ListOfGO* ExplodeCompoundOfBlocks (GEOM::GEOM_Object_ptr theCompound,
-					   const CORBA::Long     theMinNbFaces,
-					   const CORBA::Long     theMaxNbFaces);
+					   CORBA::Long     theMinNbFaces,
+					   CORBA::Long     theMaxNbFaces);
 
   GEOM::GEOM_Object_ptr GetBlockNearPoint (GEOM::GEOM_Object_ptr theCompound,
 					   GEOM::GEOM_Object_ptr thePoint);
@@ -107,17 +142,20 @@ class GEOM_IBlocksOperations_i :
 
   // Operations on blocks with gluing of result
   GEOM::GEOM_Object_ptr MakeMultiTransformation1D (GEOM::GEOM_Object_ptr theBlock,
-						   const CORBA::Long     theDirFace1,
-						   const CORBA::Long     theDirFace2,
-						   const CORBA::Long     theNbTimes);
+						   CORBA::Long     theDirFace1,
+						   CORBA::Long     theDirFace2,
+						   CORBA::Long     theNbTimes);
 
   GEOM::GEOM_Object_ptr MakeMultiTransformation2D (GEOM::GEOM_Object_ptr theBlock,
-						   const CORBA::Long     theDirFace1U,
-						   const CORBA::Long     theDirFace2U,
-						   const CORBA::Long     theNbTimesU,
-						   const CORBA::Long     theDirFace1V,
-						   const CORBA::Long     theDirFace2V,
-						   const CORBA::Long     theNbTimesV);
+						   CORBA::Long     theDirFace1U,
+						   CORBA::Long     theDirFace2U,
+						   CORBA::Long     theNbTimesU,
+						   CORBA::Long     theDirFace1V,
+						   CORBA::Long     theDirFace2V,
+						   CORBA::Long     theNbTimesV);
+
+  // Build groups for Propagation of 1D hypotheses
+  GEOM::ListOfGO* Propagate (GEOM::GEOM_Object_ptr theShape);
 
   ::GEOMImpl_IBlocksOperations* GetOperations()
   { return (::GEOMImpl_IBlocksOperations*)GetImpl(); }