Merge from V6_main 11/02/2013

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

diff --git a/src/GEOM_I/GEOM_IMeasureOperations_i.hh b/src/GEOM_I/GEOM_IMeasureOperations_i.hh
index 4534dc45e76cd670c73b82bdd281157bf12a15c4..e8269bd223f8f1d98a289e5197951d4ca7990495 100644 (file)
--- a/src/GEOM_I/GEOM_IMeasureOperations_i.hh
+++ b/src/GEOM_I/GEOM_IMeasureOperations_i.hh
@@ -18,7 +18,6 @@
 // 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_IMeasureOperations_i_HeaderFile
 #define _GEOM_IMeasureOperations_i_HeaderFile
@@ -75,6 +74,8 @@ class GEOM_I_EXPORT GEOM_IMeasureOperations_i :
                        CORBA::Double& Ymin, CORBA::Double& Ymax,
                        CORBA::Double& Zmin, CORBA::Double& Zmax);
 
+  GEOM::GEOM_Object_ptr MakeBoundingBox (GEOM::GEOM_Object_ptr theShape);
+
   void GetTolerance (GEOM::GEOM_Object_ptr theShape,
                      CORBA::Double& FaceMin, CORBA::Double& FaceMax,
                      CORBA::Double& EdgeMin, CORBA::Double& EdgeMax,
@@ -102,6 +103,10 @@ class GEOM_I_EXPORT GEOM_IMeasureOperations_i :
                                 CORBA::Double& X1, CORBA::Double& Y1, CORBA::Double& Z1,
                                 CORBA::Double& X2, CORBA::Double& Y2, CORBA::Double& Z2);
 
+  CORBA::Long ClosestPoints (GEOM::GEOM_Object_ptr theShape1,
+                             GEOM::GEOM_Object_ptr theShape2,
+                             GEOM::ListOfDouble_out theCoords);
+
   void PointCoordinates (GEOM::GEOM_Object_ptr theShape,
                          CORBA::Double& X, CORBA::Double& Y, CORBA::Double& Z);