Salome HOME
21854: Add persistent dimensions
[modules/geom.git] / src / GEOMImpl / GEOMImpl_IMeasureOperations.cxx
index 4cc2facc4282a79223aeb38d365b03ded5cd6dc7..aaa0b4ed86df74b97ec38973f0acc4b00ae37a9c 100644 (file)
@@ -1,22 +1,25 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// Copyright (C) 2007-2013  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 
+// 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 
+//
+// 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 
+// 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/
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include <Standard_Stream.hxx>
 
 #include <GEOMImpl_IMeasureOperations.hxx>
 #include <GEOMImpl_Types.hxx>
 #include <GEOMImpl_MeasureDriver.hxx>
 #include <GEOMImpl_IMeasure.hxx>
+#include <GEOMImpl_IShapesOperations.hxx>
+
+#include <GEOMUtils.hxx>
+
+#include <GEOMAlgo_ShapeInfo.hxx>
+#include <GEOMAlgo_ShapeInfoFiller.hxx>
 
 #include <GEOM_Function.hxx>
 #include <GEOM_PythonDump.hxx>
 
-#include "utilities.h"
+#include <Basics_OCCTVersion.hxx>
+
+#include <utilities.h>
 #include <OpUtil.hxx>
 #include <Utils_ExceptHandlers.hxx>
 
+// OCCT Includes
 #include <TFunction_DriverTable.hxx>
 #include <TFunction_Driver.hxx>
 #include <TFunction_Logbook.hxx>
 #include <TDF_Tool.hxx>
 
+#include <BRep_Builder.hxx>
+#include <BRep_TFace.hxx>
 #include <BRep_Tool.hxx>
+#include <BRepAdaptor_Surface.hxx>
+#include <BRepBuilderAPI_Copy.hxx>
+#include <BRepBndLib.hxx>
 #include <BRepCheck.hxx>
-#include <BRepCheck_Result.hxx>
 #include <BRepCheck_ListIteratorOfListOfStatus.hxx>
-#include <BRepGProp.hxx>
-#include <BRepBndLib.hxx>
+#include <BRepCheck_Result.hxx>
+#include <BRepCheck_Shell.hxx>
+#include <BRepClass3d_SolidClassifier.hxx>
+#include <BRepClass_FaceClassifier.hxx>
 #include <BRepExtrema_DistShapeShape.hxx>
+#include <BRepGProp.hxx>
+#include <BRepTools.hxx>
 
 #include <Bnd_Box.hxx>
 
-#include <GProp_GProps.hxx>
-#include <GProp_PrincipalProps.hxx>
-
 #include <TopAbs.hxx>
+#include <TopExp.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
+#include <TopoDS_Compound.hxx>
 #include <TopoDS_Iterator.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopTools_MapOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 
+#include <ShapeAnalysis.hxx>
+#include <ShapeAnalysis_Surface.hxx>
+
+#include <GeomAPI_IntSS.hxx>
+#include <GeomAPI_ProjectPointOnCurve.hxx>
+#include <GeomAPI_ProjectPointOnSurf.hxx>
+
+#include <GeomAbs_SurfaceType.hxx>
+
+#include <Geom_Line.hxx>
+#include <Geom_Surface.hxx>
+
+#include <GeomLProp_CLProps.hxx>
+#include <GeomLProp_SLProps.hxx>
+
+#include <GProp_GProps.hxx>
+#include <GProp_PrincipalProps.hxx>
+
+#include <gp_Pln.hxx>
+#include <gp_Lin.hxx>
+
+#include <BOPCol_ListOfShape.hxx>
+#include <BOPDS_DS.hxx>
+#include <BOPDS_MapOfPassKey.hxx>
+#include <BOPDS_PassKey.hxx>
+#include <GEOMAlgo_AlgoTools.hxx>
+#include <BOPAlgo_CheckerSI.hxx>
+
+#include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
 
 //=============================================================================
 /*!
- *   constructor:
+ *  Constructor
  */
 //=============================================================================
 GEOMImpl_IMeasureOperations::GEOMImpl_IMeasureOperations (GEOM_Engine* theEngine, int theDocID)
@@ -77,7 +125,7 @@ GEOMImpl_IMeasureOperations::GEOMImpl_IMeasureOperations (GEOM_Engine* theEngine
 
 //=============================================================================
 /*!
- *  destructor
+ *  Destructor
  */
 //=============================================================================
 GEOMImpl_IMeasureOperations::~GEOMImpl_IMeasureOperations()
@@ -85,6 +133,680 @@ GEOMImpl_IMeasureOperations::~GEOMImpl_IMeasureOperations()
   MESSAGE("GEOMImpl_IMeasureOperations::~GEOMImpl_IMeasureOperations");
 }
 
+//=============================================================================
+/*! Get kind and parameters of the given shape.
+ */
+//=============================================================================
+GEOMImpl_IMeasureOperations::ShapeKind GEOMImpl_IMeasureOperations::KindOfShape
+                             (Handle(GEOM_Object) theShape,
+                              Handle(TColStd_HSequenceOfInteger)& theIntegers,
+                              Handle(TColStd_HSequenceOfReal)&    theDoubles)
+{
+  SetErrorCode(KO);
+  ShapeKind aKind = SK_NO_SHAPE;
+
+  if (theIntegers.IsNull()) theIntegers = new TColStd_HSequenceOfInteger;
+  else                      theIntegers->Clear();
+
+  if (theDoubles.IsNull()) theDoubles = new TColStd_HSequenceOfReal;
+  else                     theDoubles->Clear();
+
+  if (theShape.IsNull())
+    return aKind;
+
+  Handle(GEOM_Function) aRefShape = theShape->GetLastFunction();
+  if (aRefShape.IsNull()) return aKind;
+
+  TopoDS_Shape aShape = aRefShape->GetValue();
+  if (aShape.IsNull()) return aKind;
+
+  int geom_type = theShape->GetType();
+
+  // check if it's advanced shape
+  if ( geom_type > ADVANCED_BASE ) {
+    SetErrorCode(OK);
+    return SK_ADVANCED;
+  }
+
+  // Call algorithm
+  GEOMAlgo_ShapeInfoFiller aSF;
+  aSF.SetShape(aShape);
+  aSF.Perform();
+  Standard_Integer iErr = aSF.ErrorStatus();
+  if (iErr) {
+    SetErrorCode("Error in GEOMAlgo_ShapeInfoFiller");
+    return SK_NO_SHAPE;
+  }
+  const GEOMAlgo_ShapeInfo& anInfo = aSF.Info();
+
+  // Interprete results
+  TopAbs_ShapeEnum aType = anInfo.Type();
+  switch (aType)
+  {
+  case TopAbs_COMPOUND:
+  case TopAbs_COMPSOLID:
+    {
+      // (+) geompy.kind.COMPOUND     nb_solids nb_faces nb_edges nb_vertices
+      // (+) geompy.kind.COMPSOLID    nb_solids nb_faces nb_edges nb_vertices
+      // ??? "nb_faces" - all faces or only 'standalone' faces?
+      if (aType == TopAbs_COMPOUND)
+        aKind = SK_COMPOUND;
+      else
+        aKind = SK_COMPSOLID;
+
+      //theIntegers->Append(anInfo.NbSubShapes(TopAbs_COMPOUND));
+      //theIntegers->Append(anInfo.NbSubShapes(TopAbs_COMPSOLID));
+      theIntegers->Append(anInfo.NbSubShapes(TopAbs_SOLID));
+      theIntegers->Append(anInfo.NbSubShapes(TopAbs_FACE));
+      theIntegers->Append(anInfo.NbSubShapes(TopAbs_EDGE));
+      theIntegers->Append(anInfo.NbSubShapes(TopAbs_VERTEX));
+    }
+    break;
+
+  case TopAbs_SHELL:
+    {
+      // (+) geompy.kind.SHELL  geompy.info.closed   nb_faces nb_edges nb_vertices
+      // (+) geompy.kind.SHELL  geompy.info.unclosed nb_faces nb_edges nb_vertices
+      aKind = SK_SHELL;
+
+      theIntegers->Append((int)anInfo.KindOfClosed());
+
+      theIntegers->Append(anInfo.NbSubShapes(TopAbs_FACE));
+      theIntegers->Append(anInfo.NbSubShapes(TopAbs_EDGE));
+      theIntegers->Append(anInfo.NbSubShapes(TopAbs_VERTEX));
+    }
+    break;
+
+  case TopAbs_WIRE:
+    {
+      // (+) geompy.kind.WIRE  geompy.info.closed   nb_edges nb_vertices
+      // (+) geompy.kind.WIRE  geompy.info.unclosed nb_edges nb_vertices
+      aKind = SK_WIRE;
+
+      theIntegers->Append((int)anInfo.KindOfClosed());
+
+      theIntegers->Append(anInfo.NbSubShapes(TopAbs_EDGE));
+      theIntegers->Append(anInfo.NbSubShapes(TopAbs_VERTEX));
+    }
+    break;
+
+  case TopAbs_SOLID:
+    {
+      aKind = SK_SOLID;
+
+      GEOMAlgo_KindOfName aKN = anInfo.KindOfName();
+      switch (aKN)
+      {
+      case GEOMAlgo_KN_SPHERE:
+        // (+) geompy.kind.SPHERE  xc yc zc  R
+        {
+          aKind = SK_SPHERE;
+
+          gp_Pnt aC = anInfo.Location();
+          theDoubles->Append(aC.X());
+          theDoubles->Append(aC.Y());
+          theDoubles->Append(aC.Z());
+
+          theDoubles->Append(anInfo.Radius1());
+        }
+        break;
+      case GEOMAlgo_KN_CYLINDER:
+        // (+) geompy.kind.CYLINDER  xb yb zb  dx dy dz  R  H
+        {
+          aKind = SK_CYLINDER;
+
+          gp_Pnt aC = anInfo.Location();
+          theDoubles->Append(aC.X());
+          theDoubles->Append(aC.Y());
+          theDoubles->Append(aC.Z());
+
+          gp_Ax3 anAx3 = anInfo.Position();
+          gp_Dir aD = anAx3.Direction();
+          theDoubles->Append(aD.X());
+          theDoubles->Append(aD.Y());
+          theDoubles->Append(aD.Z());
+
+          theDoubles->Append(anInfo.Radius1());
+          theDoubles->Append(anInfo.Height());
+        }
+        break;
+      case GEOMAlgo_KN_BOX:
+        // (+) geompy.kind.BOX  xc yc zc  ax ay az
+        {
+          aKind = SK_BOX;
+
+          gp_Pnt aC = anInfo.Location();
+          theDoubles->Append(aC.X());
+          theDoubles->Append(aC.Y());
+          theDoubles->Append(aC.Z());
+
+          gp_Ax3 anAx3 = anInfo.Position();
+          gp_Dir aD = anAx3.Direction();
+          gp_Dir aX = anAx3.XDirection();
+
+          // ax ay az
+          if (aD.IsParallel(gp::DZ(), Precision::Angular()) &&
+              aX.IsParallel(gp::DX(), Precision::Angular())) {
+            theDoubles->Append(anInfo.Length()); // ax'
+            theDoubles->Append(anInfo.Width());  // ay'
+            theDoubles->Append(anInfo.Height()); // az'
+          }
+          else if (aD.IsParallel(gp::DZ(), Precision::Angular()) &&
+                   aX.IsParallel(gp::DY(), Precision::Angular())) {
+            theDoubles->Append(anInfo.Width());  // ay'
+            theDoubles->Append(anInfo.Length()); // ax'
+            theDoubles->Append(anInfo.Height()); // az'
+          }
+          else if (aD.IsParallel(gp::DX(), Precision::Angular()) &&
+                   aX.IsParallel(gp::DZ(), Precision::Angular())) {
+            theDoubles->Append(anInfo.Height()); // az'
+            theDoubles->Append(anInfo.Width());  // ay'
+            theDoubles->Append(anInfo.Length()); // ax'
+          }
+          else if (aD.IsParallel(gp::DX(), Precision::Angular()) &&
+                   aX.IsParallel(gp::DY(), Precision::Angular())) {
+            theDoubles->Append(anInfo.Height()); // az'
+            theDoubles->Append(anInfo.Length()); // ax'
+            theDoubles->Append(anInfo.Width());  // ay'
+          }
+          else if (aD.IsParallel(gp::DY(), Precision::Angular()) &&
+                   aX.IsParallel(gp::DZ(), Precision::Angular())) {
+            theDoubles->Append(anInfo.Width());  // ay'
+            theDoubles->Append(anInfo.Height()); // az'
+            theDoubles->Append(anInfo.Length()); // ax'
+          }
+          else if (aD.IsParallel(gp::DY(), Precision::Angular()) &&
+                   aX.IsParallel(gp::DX(), Precision::Angular())) {
+            theDoubles->Append(anInfo.Length()); // ax'
+            theDoubles->Append(anInfo.Height()); // az'
+            theDoubles->Append(anInfo.Width());  // ay'
+          }
+          else {
+            // (+) geompy.kind.ROTATED_BOX  xo yo zo  zx zy zz  xx xy xz  ax ay az
+            aKind = SK_ROTATED_BOX;
+
+            // Direction and XDirection
+            theDoubles->Append(aD.X());
+            theDoubles->Append(aD.Y());
+            theDoubles->Append(aD.Z());
+
+            theDoubles->Append(aX.X());
+            theDoubles->Append(aX.Y());
+            theDoubles->Append(aX.Z());
+
+            // ax ay az
+            theDoubles->Append(anInfo.Length());
+            theDoubles->Append(anInfo.Width());
+            theDoubles->Append(anInfo.Height());
+          }
+        }
+        break;
+      case GEOMAlgo_KN_TORUS:
+        // (+) geompy.kind.TORUS  xc yc zc  dx dy dz  R_1 R_2
+        {
+          aKind = SK_TORUS;
+
+          gp_Pnt aO = anInfo.Location();
+          theDoubles->Append(aO.X());
+          theDoubles->Append(aO.Y());
+          theDoubles->Append(aO.Z());
+
+          gp_Ax3 anAx3 = anInfo.Position();
+          gp_Dir aD = anAx3.Direction();
+          theDoubles->Append(aD.X());
+          theDoubles->Append(aD.Y());
+          theDoubles->Append(aD.Z());
+
+          theDoubles->Append(anInfo.Radius1());
+          theDoubles->Append(anInfo.Radius2());
+        }
+        break;
+      case GEOMAlgo_KN_CONE:
+        // (+) geompy.kind.CONE  xb yb zb  dx dy dz  R_1 R_2  H
+        {
+          aKind = SK_CONE;
+
+          gp_Pnt aO = anInfo.Location();
+          theDoubles->Append(aO.X());
+          theDoubles->Append(aO.Y());
+          theDoubles->Append(aO.Z());
+
+          gp_Ax3 anAx3 = anInfo.Position();
+          gp_Dir aD = anAx3.Direction();
+          theDoubles->Append(aD.X());
+          theDoubles->Append(aD.Y());
+          theDoubles->Append(aD.Z());
+
+          theDoubles->Append(anInfo.Radius1());
+          theDoubles->Append(anInfo.Radius2());
+          theDoubles->Append(anInfo.Height());
+        }
+        break;
+      case GEOMAlgo_KN_POLYHEDRON:
+        // (+) geompy.kind.POLYHEDRON  nb_faces nb_edges nb_vertices
+        {
+          aKind = SK_POLYHEDRON;
+
+          theIntegers->Append(anInfo.NbSubShapes(TopAbs_FACE));
+          theIntegers->Append(anInfo.NbSubShapes(TopAbs_EDGE));
+          theIntegers->Append(anInfo.NbSubShapes(TopAbs_VERTEX));
+        }
+        break;
+      default:
+        // (+) geompy.kind.SOLID  nb_faces nb_edges nb_vertices
+        {
+          theIntegers->Append(anInfo.NbSubShapes(TopAbs_FACE));
+          theIntegers->Append(anInfo.NbSubShapes(TopAbs_EDGE));
+          theIntegers->Append(anInfo.NbSubShapes(TopAbs_VERTEX));
+        }
+      }
+    }
+    break;
+
+  case TopAbs_FACE:
+    {
+      aKind = SK_FACE;
+
+      GEOMAlgo_KindOfName aKN = anInfo.KindOfName();
+      switch (aKN) {
+      case GEOMAlgo_KN_SPHERE:
+        // (+) geompy.kind.SPHERE2D  xc yc zc  R
+        {
+          aKind = SK_SPHERE2D;
+
+          gp_Pnt aC = anInfo.Location();
+          theDoubles->Append(aC.X());
+          theDoubles->Append(aC.Y());
+          theDoubles->Append(aC.Z());
+
+          theDoubles->Append(anInfo.Radius1());
+        }
+        break;
+      case GEOMAlgo_KN_CYLINDER:
+        // (+) geompy.kind.CYLINDER2D  xb yb zb  dx dy dz  R  H
+        {
+          aKind = SK_CYLINDER2D;
+
+          gp_Pnt aO = anInfo.Location();
+          theDoubles->Append(aO.X());
+          theDoubles->Append(aO.Y());
+          theDoubles->Append(aO.Z());
+
+          gp_Ax3 anAx3 = anInfo.Position();
+          gp_Dir aD = anAx3.Direction();
+          theDoubles->Append(aD.X());
+          theDoubles->Append(aD.Y());
+          theDoubles->Append(aD.Z());
+
+          theDoubles->Append(anInfo.Radius1());
+          theDoubles->Append(anInfo.Height());
+        }
+        break;
+      case GEOMAlgo_KN_TORUS:
+        // (+) geompy.kind.TORUS2D  xc yc zc  dx dy dz  R_1 R_2
+        {
+          aKind = SK_TORUS2D;
+
+          gp_Pnt aO = anInfo.Location();
+          theDoubles->Append(aO.X());
+          theDoubles->Append(aO.Y());
+          theDoubles->Append(aO.Z());
+
+          gp_Ax3 anAx3 = anInfo.Position();
+          gp_Dir aD = anAx3.Direction();
+          theDoubles->Append(aD.X());
+          theDoubles->Append(aD.Y());
+          theDoubles->Append(aD.Z());
+
+          theDoubles->Append(anInfo.Radius1());
+          theDoubles->Append(anInfo.Radius2());
+        }
+        break;
+      case GEOMAlgo_KN_CONE:
+        // (+) geompy.kind.CONE2D  xc yc zc  dx dy dz  R_1 R_2  H
+        {
+          aKind = SK_CONE2D;
+
+          gp_Pnt aO = anInfo.Location();
+          theDoubles->Append(aO.X());
+          theDoubles->Append(aO.Y());
+          theDoubles->Append(aO.Z());
+
+          gp_Ax3 anAx3 = anInfo.Position();
+          gp_Dir aD = anAx3.Direction();
+          theDoubles->Append(aD.X());
+          theDoubles->Append(aD.Y());
+          theDoubles->Append(aD.Z());
+
+          theDoubles->Append(anInfo.Radius1());
+          theDoubles->Append(anInfo.Radius2());
+          theDoubles->Append(anInfo.Height());
+        }
+        break;
+      case GEOMAlgo_KN_DISKCIRCLE:
+        // (+) geompy.kind.DISK_CIRCLE  xc yc zc  dx dy dz  R
+        {
+          aKind = SK_DISK_CIRCLE;
+
+          gp_Pnt aC = anInfo.Location();
+          theDoubles->Append(aC.X());
+          theDoubles->Append(aC.Y());
+          theDoubles->Append(aC.Z());
+
+          gp_Ax3 anAx3 = anInfo.Position();
+          gp_Dir aD = anAx3.Direction();
+          theDoubles->Append(aD.X());
+          theDoubles->Append(aD.Y());
+          theDoubles->Append(aD.Z());
+
+          theDoubles->Append(anInfo.Radius1());
+        }
+        break;
+      case GEOMAlgo_KN_DISKELLIPSE:
+        // (+) geompy.kind.DISK_ELLIPSE  xc yc zc  dx dy dz  R_1 R_2
+        {
+          aKind = SK_DISK_ELLIPSE;
+
+          gp_Pnt aC = anInfo.Location();
+          theDoubles->Append(aC.X());
+          theDoubles->Append(aC.Y());
+          theDoubles->Append(aC.Z());
+
+          gp_Ax3 anAx3 = anInfo.Position();
+          gp_Dir aD = anAx3.Direction();
+          theDoubles->Append(aD.X());
+          theDoubles->Append(aD.Y());
+          theDoubles->Append(aD.Z());
+
+          theDoubles->Append(anInfo.Radius1());
+          theDoubles->Append(anInfo.Radius2());
+        }
+        break;
+      case GEOMAlgo_KN_RECTANGLE:
+      case GEOMAlgo_KN_TRIANGLE:
+      case GEOMAlgo_KN_QUADRANGLE:
+      case GEOMAlgo_KN_POLYGON:
+        // (+) geompy.kind.POLYGON  xo yo zo  dx dy dz  nb_edges nb_vertices
+        {
+          aKind = SK_POLYGON;
+
+          gp_Pnt aO = anInfo.Location();
+          theDoubles->Append(aO.X());
+          theDoubles->Append(aO.Y());
+          theDoubles->Append(aO.Z());
+
+          gp_Ax3 anAx3 = anInfo.Position();
+          gp_Dir aD = anAx3.Direction();
+          theDoubles->Append(aD.X());
+          theDoubles->Append(aD.Y());
+          theDoubles->Append(aD.Z());
+
+          theIntegers->Append(anInfo.NbSubShapes(TopAbs_EDGE));
+          theIntegers->Append(anInfo.NbSubShapes(TopAbs_VERTEX));
+        }
+        break;
+      case GEOMAlgo_KN_PLANE: // infinite
+        // (+) geompy.kind.PLANE  xo yo zo  dx dy dz
+        {
+          aKind = SK_PLANE;
+
+          gp_Pnt aC = anInfo.Location();
+          theDoubles->Append(aC.X());
+          theDoubles->Append(aC.Y());
+          theDoubles->Append(aC.Z());
+
+          gp_Ax3 anAx3 = anInfo.Position();
+          gp_Dir aD = anAx3.Direction();
+          theDoubles->Append(aD.X());
+          theDoubles->Append(aD.Y());
+          theDoubles->Append(aD.Z());
+        }
+        break;
+      default:
+        if (anInfo.KindOfShape() == GEOMAlgo_KS_PLANE) {
+          // (+) geompy.kind.PLANAR  xo yo zo  dx dy dz  nb_edges nb_vertices
+
+          aKind = SK_PLANAR;
+
+          gp_Pnt aC = anInfo.Location();
+          theDoubles->Append(aC.X());
+          theDoubles->Append(aC.Y());
+          theDoubles->Append(aC.Z());
+
+          gp_Ax3 anAx3 = anInfo.Position();
+          gp_Dir aD = anAx3.Direction();
+          theDoubles->Append(aD.X());
+          theDoubles->Append(aD.Y());
+          theDoubles->Append(aD.Z());
+
+          theIntegers->Append(anInfo.NbSubShapes(TopAbs_EDGE));
+          theIntegers->Append(anInfo.NbSubShapes(TopAbs_VERTEX));
+        }
+        else {
+          // ??? geompy.kind.FACE  nb_edges nb_vertices _surface_type_id_
+          // (+) geompy.kind.FACE  nb_edges nb_vertices
+
+          theIntegers->Append(anInfo.NbSubShapes(TopAbs_EDGE));
+          theIntegers->Append(anInfo.NbSubShapes(TopAbs_VERTEX));
+        }
+      }
+    }
+    break;
+
+  case TopAbs_EDGE:
+    {
+      aKind = SK_EDGE;
+
+      GEOMAlgo_KindOfName aKN = anInfo.KindOfName();
+      switch (aKN) {
+      case GEOMAlgo_KN_CIRCLE:
+        {
+          // (+) geompy.kind.CIRCLE  xc yc zc  dx dy dz  R
+          aKind = SK_CIRCLE;
+
+          gp_Pnt aC = anInfo.Location();
+          theDoubles->Append(aC.X());
+          theDoubles->Append(aC.Y());
+          theDoubles->Append(aC.Z());
+
+          gp_Ax3 anAx3 = anInfo.Position();
+          gp_Dir aD = anAx3.Direction();
+          theDoubles->Append(aD.X());
+          theDoubles->Append(aD.Y());
+          theDoubles->Append(aD.Z());
+
+          theDoubles->Append(anInfo.Radius1());
+        }
+        break;
+      case GEOMAlgo_KN_ARCCIRCLE:
+        {
+          // (+) geompy.kind.ARC_CIRCLE  xc yc zc  dx dy dz  R  x1 y1 z1  x2 y2 z2
+          aKind = SK_ARC_CIRCLE;
+
+          gp_Pnt aC = anInfo.Location();
+          theDoubles->Append(aC.X());
+          theDoubles->Append(aC.Y());
+          theDoubles->Append(aC.Z());
+
+          gp_Ax3 anAx3 = anInfo.Position();
+          gp_Dir aD = anAx3.Direction();
+          theDoubles->Append(aD.X());
+          theDoubles->Append(aD.Y());
+          theDoubles->Append(aD.Z());
+
+          theDoubles->Append(anInfo.Radius1());
+
+          gp_Pnt aP1 = anInfo.Pnt1();
+          theDoubles->Append(aP1.X());
+          theDoubles->Append(aP1.Y());
+          theDoubles->Append(aP1.Z());
+
+          gp_Pnt aP2 = anInfo.Pnt2();
+          theDoubles->Append(aP2.X());
+          theDoubles->Append(aP2.Y());
+          theDoubles->Append(aP2.Z());
+        }
+        break;
+      case GEOMAlgo_KN_ELLIPSE:
+        {
+          // (+) geompy.kind.ELLIPSE  xc yc zc  dx dy dz  R_1 R_2
+          aKind = SK_ELLIPSE;
+
+          gp_Pnt aC = anInfo.Location();
+          theDoubles->Append(aC.X());
+          theDoubles->Append(aC.Y());
+          theDoubles->Append(aC.Z());
+
+          gp_Ax3 anAx3 = anInfo.Position();
+          gp_Dir aD = anAx3.Direction();
+          theDoubles->Append(aD.X());
+          theDoubles->Append(aD.Y());
+          theDoubles->Append(aD.Z());
+
+          theDoubles->Append(anInfo.Radius1());
+          theDoubles->Append(anInfo.Radius2());
+        }
+        break;
+      case GEOMAlgo_KN_ARCELLIPSE:
+        {
+          // (+) geompy.kind.ARC_ELLIPSE  xc yc zc  dx dy dz  R_1 R_2  x1 y1 z1  x2 y2 z2
+          aKind = SK_ARC_ELLIPSE;
+
+          gp_Pnt aC = anInfo.Location();
+          theDoubles->Append(aC.X());
+          theDoubles->Append(aC.Y());
+          theDoubles->Append(aC.Z());
+
+          gp_Ax3 anAx3 = anInfo.Position();
+          gp_Dir aD = anAx3.Direction();
+          theDoubles->Append(aD.X());
+          theDoubles->Append(aD.Y());
+          theDoubles->Append(aD.Z());
+
+          theDoubles->Append(anInfo.Radius1());
+          theDoubles->Append(anInfo.Radius2());
+
+          gp_Pnt aP1 = anInfo.Pnt1();
+          theDoubles->Append(aP1.X());
+          theDoubles->Append(aP1.Y());
+          theDoubles->Append(aP1.Z());
+
+          gp_Pnt aP2 = anInfo.Pnt2();
+          theDoubles->Append(aP2.X());
+          theDoubles->Append(aP2.Y());
+          theDoubles->Append(aP2.Z());
+        }
+        break;
+      case GEOMAlgo_KN_LINE:
+        {
+          // ??? geompy.kind.LINE  x1 y1 z1  x2 y2 z2
+          // (+) geompy.kind.LINE  x1 y1 z1  dx dy dz
+          aKind = SK_LINE;
+
+          gp_Pnt aO = anInfo.Location();
+          theDoubles->Append(aO.X());
+          theDoubles->Append(aO.Y());
+          theDoubles->Append(aO.Z());
+
+          gp_Dir aD = anInfo.Direction();
+          theDoubles->Append(aD.X());
+          theDoubles->Append(aD.Y());
+          theDoubles->Append(aD.Z());
+        }
+        break;
+      case GEOMAlgo_KN_SEGMENT:
+        {
+          // (+) geompy.kind.SEGMENT  x1 y1 z1  x2 y2 z2
+          aKind = SK_SEGMENT;
+
+          gp_Pnt aP1 = anInfo.Pnt1();
+          theDoubles->Append(aP1.X());
+          theDoubles->Append(aP1.Y());
+          theDoubles->Append(aP1.Z());
+
+          gp_Pnt aP2 = anInfo.Pnt2();
+          theDoubles->Append(aP2.X());
+          theDoubles->Append(aP2.Y());
+          theDoubles->Append(aP2.Z());
+        }
+        break;
+      default:
+        // ??? geompy.kind.EDGE  nb_vertices _curve_type_id_
+        // (+) geompy.kind.EDGE  nb_vertices
+        theIntegers->Append(anInfo.NbSubShapes(TopAbs_VERTEX));
+      }
+    }
+    break;
+
+  case TopAbs_VERTEX:
+    {
+      // (+) geompy.kind.VERTEX  x y z
+      aKind = SK_VERTEX;
+
+      gp_Pnt aP = anInfo.Location();
+      theDoubles->Append(aP.X());
+      theDoubles->Append(aP.Y());
+      theDoubles->Append(aP.Z());
+    }
+    break;
+  }
+
+  SetErrorCode(OK);
+  return aKind;
+}
+
+//=============================================================================
+/*!
+ *  GetPosition
+ */
+//=============================================================================
+void GEOMImpl_IMeasureOperations::GetPosition
+                   (Handle(GEOM_Object) theShape,
+                    Standard_Real& Ox, Standard_Real& Oy, Standard_Real& Oz,
+                    Standard_Real& Zx, Standard_Real& Zy, Standard_Real& Zz,
+                    Standard_Real& Xx, Standard_Real& Xy, Standard_Real& Xz)
+{
+  SetErrorCode(KO);
+
+  //Set default values: global CS
+  Ox = Oy = Oz = Zx = Zy = Xy = Xz = 0.;
+  Zz = Xx = 1.;
+
+  if (theShape.IsNull()) return;
+
+  Handle(GEOM_Function) aRefShape = theShape->GetLastFunction();
+  if (aRefShape.IsNull()) return;
+
+  TopoDS_Shape aShape = aRefShape->GetValue();
+  if (aShape.IsNull()) {
+    SetErrorCode("The Objects has NULL Shape");
+    return;
+  }
+
+  try {
+#if OCC_VERSION_LARGE > 0x06010000
+    OCC_CATCH_SIGNALS;
+#endif
+
+    gp_Ax3 anAx3 = GEOMUtils::GetPosition(aShape);
+
+    gp_Pnt anOri = anAx3.Location();
+    gp_Dir aDirZ = anAx3.Direction();
+    gp_Dir aDirX = anAx3.XDirection();
+
+    // Output values
+    anOri.Coord(Ox, Oy, Oz);
+    aDirZ.Coord(Zx, Zy, Zz);
+    aDirX.Coord(Xx, Xy, Xz);
+  }
+  catch (Standard_Failure) {
+    Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+    SetErrorCode(aFail->GetMessageString());
+    return;
+  }
+
+  SetErrorCode(OK);
+}
 
 //=============================================================================
 /*!
@@ -118,6 +840,9 @@ Handle(GEOM_Object) GEOMImpl_IMeasureOperations::GetCentreOfMass
 
   //Compute the CentreOfMass value
   try {
+#if OCC_VERSION_LARGE > 0x06010000
+    OCC_CATCH_SIGNALS;
+#endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
       SetErrorCode("Measure driver failed to compute centre of mass");
       return NULL;
@@ -136,6 +861,124 @@ Handle(GEOM_Object) GEOMImpl_IMeasureOperations::GetCentreOfMass
   return aCDG;
 }
 
+//=============================================================================
+/*!
+ *  GetVertexByIndex
+ */
+//=============================================================================
+Handle(GEOM_Object) GEOMImpl_IMeasureOperations::GetVertexByIndex
+                                                (Handle(GEOM_Object) theShape,
+                                                 Standard_Integer theIndex)
+{
+  SetErrorCode(KO);
+
+  if (theShape.IsNull()) return NULL;
+
+  Handle(GEOM_Function) aRefShape = theShape->GetLastFunction();
+  if (aRefShape.IsNull()) return NULL;
+
+  //Add a new Vertex object
+  Handle(GEOM_Object) aVertex = GetEngine()->AddObject(GetDocID(), GEOM_POINT);
+
+  //Add a function
+  Handle(GEOM_Function) aFunction =
+    aVertex->AddFunction(GEOMImpl_MeasureDriver::GetID(), VERTEX_BY_INDEX);
+  if (aFunction.IsNull()) return NULL;
+
+  //Check if the function is set correctly
+  if (aFunction->GetDriverGUID() != GEOMImpl_MeasureDriver::GetID()) return NULL;
+
+  GEOMImpl_IMeasure aCI (aFunction);
+  aCI.SetBase(aRefShape);
+  aCI.SetIndex(theIndex);
+
+  //Compute
+  try {
+#if OCC_VERSION_LARGE > 0x06010000
+    OCC_CATCH_SIGNALS;
+#endif
+    if (!GetSolver()->ComputeFunction(aFunction)) {
+      SetErrorCode("Vertex by index driver failed.");
+      return NULL;
+    }
+  }
+  catch (Standard_Failure) {
+    Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+    SetErrorCode(aFail->GetMessageString());
+    return NULL;
+  }
+
+  //Make a Python command
+  GEOM::TPythonDump(aFunction) << aVertex << " = geompy.GetVertexByIndex(" << theShape << ", " << theIndex << ")";
+
+  SetErrorCode(OK);
+  return aVertex;
+}
+
+//=============================================================================
+/*!
+ *  GetNormal
+ */
+//=============================================================================
+Handle(GEOM_Object) GEOMImpl_IMeasureOperations::GetNormal
+                                         (Handle(GEOM_Object) theFace,
+                                          Handle(GEOM_Object) theOptionalPoint)
+{
+  SetErrorCode(KO);
+
+  if (theFace.IsNull()) return NULL;
+
+  //Add a new Normale object
+  Handle(GEOM_Object) aNorm = GetEngine()->AddObject(GetDocID(), GEOM_VECTOR);
+
+  //Add a new Normale function
+  Handle(GEOM_Function) aFunction =
+    aNorm->AddFunction(GEOMImpl_MeasureDriver::GetID(), VECTOR_FACE_NORMALE);
+  if (aFunction.IsNull()) return NULL;
+
+  //Check if the function is set correctly
+  if (aFunction->GetDriverGUID() != GEOMImpl_MeasureDriver::GetID()) return NULL;
+
+  GEOMImpl_IMeasure aCI (aFunction);
+
+  Handle(GEOM_Function) aFace = theFace->GetLastFunction();
+  if (aFace.IsNull()) return NULL;
+
+  aCI.SetBase(aFace);
+
+  if (!theOptionalPoint.IsNull()) {
+    Handle(GEOM_Function) anOptPnt = theOptionalPoint->GetLastFunction();
+    aCI.SetPoint(anOptPnt);
+  }
+
+  //Compute the Normale value
+  try {
+#if OCC_VERSION_LARGE > 0x06010000
+    OCC_CATCH_SIGNALS;
+#endif
+    if (!GetSolver()->ComputeFunction(aFunction)) {
+      SetErrorCode("Measure driver failed to compute normake of face");
+      return NULL;
+    }
+  }
+  catch (Standard_Failure) {
+    Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+    SetErrorCode(aFail->GetMessageString());
+    return NULL;
+  }
+
+  //Make a Python command
+  GEOM::TPythonDump pd (aFunction);
+  pd << aNorm << " = geompy.GetNormal(" << theFace;
+  if (!theOptionalPoint.IsNull()) {
+    pd << ", " << theOptionalPoint;
+  }
+  pd << ")";
+
+  SetErrorCode(OK);
+  return aNorm;
+}
+
 //=============================================================================
 /*!
  *  GetBasicProperties
@@ -162,6 +1005,9 @@ void GEOMImpl_IMeasureOperations::GetBasicProperties (Handle(GEOM_Object) theSha
   //Compute the parameters
   GProp_GProps LProps, SProps;
   try {
+#if OCC_VERSION_LARGE > 0x06010000
+    OCC_CATCH_SIGNALS;
+#endif
     BRepGProp::LinearProperties(aShape, LProps);
     theLength = LProps.Mass();
 
@@ -171,9 +1017,9 @@ void GEOMImpl_IMeasureOperations::GetBasicProperties (Handle(GEOM_Object) theSha
     theVolume = 0.0;
     if (aShape.ShapeType() < TopAbs_SHELL) {
       for (TopExp_Explorer Exp (aShape, TopAbs_SOLID); Exp.More(); Exp.Next()) {
-       GProp_GProps VProps;
-       BRepGProp::VolumeProperties(Exp.Current(), VProps);
-       theVolume += VProps.Mass();
+        GProp_GProps VProps;
+        BRepGProp::VolumeProperties(Exp.Current(), VProps);
+        theVolume += VProps.Mass();
       }
     }
   }
@@ -200,373 +1046,1258 @@ void GEOMImpl_IMeasureOperations::GetInertia
 {
   SetErrorCode(KO);
 
-  if (theShape.IsNull()) return;
+  if (theShape.IsNull()) return;
+
+  Handle(GEOM_Function) aRefShape = theShape->GetLastFunction();
+  if (aRefShape.IsNull()) return;
+
+  TopoDS_Shape aShape = aRefShape->GetValue();
+  if (aShape.IsNull()) {
+    SetErrorCode("The Objects has NULL Shape");
+    return;
+  }
+
+  //Compute the parameters
+  GProp_GProps System;
+
+  try {
+#if OCC_VERSION_LARGE > 0x06010000
+    OCC_CATCH_SIGNALS;
+#endif
+    if (aShape.ShapeType() == TopAbs_VERTEX ||
+        aShape.ShapeType() == TopAbs_EDGE ||
+        aShape.ShapeType() == TopAbs_WIRE) {
+      BRepGProp::LinearProperties(aShape, System);
+    } else if (aShape.ShapeType() == TopAbs_FACE ||
+               aShape.ShapeType() == TopAbs_SHELL) {
+      BRepGProp::SurfaceProperties(aShape, System);
+    } else {
+      BRepGProp::VolumeProperties(aShape, System);
+    }
+    gp_Mat I = System.MatrixOfInertia();
+
+    I11 = I(1,1);
+    I12 = I(1,2);
+    I13 = I(1,3);
+
+    I21 = I(2,1);
+    I22 = I(2,2);
+    I23 = I(2,3);
+
+    I31 = I(3,1);
+    I32 = I(3,2);
+    I33 = I(3,3);
+
+    GProp_PrincipalProps Pr = System.PrincipalProperties();
+    Pr.Moments(Ix,Iy,Iz);
+  }
+  catch (Standard_Failure) {
+    Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+    SetErrorCode(aFail->GetMessageString());
+    return;
+  }
+
+  SetErrorCode(OK);
+}
+
+//=============================================================================
+/*!
+ *  GetBoundingBox
+ */
+//=============================================================================
+void GEOMImpl_IMeasureOperations::GetBoundingBox
+                                     (Handle(GEOM_Object) theShape,
+                                      const Standard_Boolean precise,
+                                      Standard_Real& Xmin, Standard_Real& Xmax,
+                                      Standard_Real& Ymin, Standard_Real& Ymax,
+                                      Standard_Real& Zmin, Standard_Real& Zmax)
+{
+  SetErrorCode(KO);
+
+  if (theShape.IsNull()) return;
+
+  Handle(GEOM_Function) aRefShape = theShape->GetLastFunction();
+  if (aRefShape.IsNull()) return;
+
+  TopoDS_Shape aShape = aRefShape->GetValue();
+  if (aShape.IsNull()) {
+    SetErrorCode("The Objects has NULL Shape");
+    return;
+  }
+
+  //Compute the parameters
+  Bnd_Box B;
+
+  try {
+#if OCC_VERSION_LARGE > 0x06010000
+    OCC_CATCH_SIGNALS;
+#endif
+    BRepBuilderAPI_Copy aCopyTool (aShape);
+    if (!aCopyTool.IsDone()) {
+      SetErrorCode("GetBoundingBox Error: Bad shape detected");
+      return;
+    }
+
+    aShape = aCopyTool.Shape();
+
+    // remove triangulation to obtain more exact boundaries
+    BRepTools::Clean(aShape);
+
+    BRepBndLib::Add(aShape, B);
+
+    if (precise) {
+      if (!GEOMUtils::PreciseBoundingBox(aShape, B)) {
+        SetErrorCode("GetBoundingBox Error: Bounding box cannot be precised");
+        return;
+      }
+    }
+
+    B.Get(Xmin, Ymin, Zmin, Xmax, Ymax, Zmax);
+  }
+  catch (Standard_Failure) {
+    Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+    SetErrorCode(aFail->GetMessageString());
+    return;
+  }
+
+  SetErrorCode(OK);
+}
+
+//=============================================================================
+/*!
+ *  GetBoundingBox
+ */
+//=============================================================================
+Handle(GEOM_Object) GEOMImpl_IMeasureOperations::GetBoundingBox
+                                                (Handle(GEOM_Object) theShape,
+                                                 const Standard_Boolean precise)
+{
+  SetErrorCode(KO);
+
+  if (theShape.IsNull()) return NULL;
+
+  //Add a new BoundingBox object
+  Handle(GEOM_Object) aBnd = GetEngine()->AddObject(GetDocID(), GEOM_BOX);
+
+  //Add a new BoundingBox function
+  const int aType = (precise ? BND_BOX_MEASURE_PRECISE : BND_BOX_MEASURE);
+  Handle(GEOM_Function) aFunction =
+    aBnd->AddFunction(GEOMImpl_MeasureDriver::GetID(), aType);
+  if (aFunction.IsNull()) return NULL;
+
+  //Check if the function is set correctly
+  if (aFunction->GetDriverGUID() != GEOMImpl_MeasureDriver::GetID()) return NULL;
+
+  GEOMImpl_IMeasure aCI (aFunction);
+
+  Handle(GEOM_Function) aRefShape = theShape->GetLastFunction();
+  if (aRefShape.IsNull()) return NULL;
+
+  aCI.SetBase(aRefShape);
+
+  //Compute the BoundingBox value
+  try {
+#if OCC_VERSION_LARGE > 0x06010000
+    OCC_CATCH_SIGNALS;
+#endif
+    if (!GetSolver()->ComputeFunction(aFunction)) {
+      SetErrorCode("Measure driver failed to compute a bounding box");
+      return NULL;
+    }
+  }
+  catch (Standard_Failure) {
+    Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+    SetErrorCode(aFail->GetMessageString());
+    return NULL;
+  }
+
+  //Make a Python command
+  GEOM::TPythonDump aPd(aFunction);
+  
+  aPd << aBnd << " = geompy.MakeBoundingBox(" << theShape;
+
+  if (precise) {
+    aPd << ", True";
+  }
+
+  aPd << ")";
+
+  SetErrorCode(OK);
+  return aBnd;
+}
+
+//=============================================================================
+/*!
+ *  GetTolerance
+ */
+//=============================================================================
+void GEOMImpl_IMeasureOperations::GetTolerance
+                               (Handle(GEOM_Object) theShape,
+                                Standard_Real& FaceMin, Standard_Real& FaceMax,
+                                Standard_Real& EdgeMin, Standard_Real& EdgeMax,
+                                Standard_Real& VertMin, Standard_Real& VertMax)
+{
+  SetErrorCode(KO);
+
+  if (theShape.IsNull()) return;
+
+  Handle(GEOM_Function) aRefShape = theShape->GetLastFunction();
+  if (aRefShape.IsNull()) return;
+
+  TopoDS_Shape aShape = aRefShape->GetValue();
+  if (aShape.IsNull()) {
+    SetErrorCode("The Objects has NULL Shape");
+    return;
+  }
+
+  //Compute the parameters
+  Standard_Real T;
+  FaceMin = EdgeMin = VertMin = RealLast();
+  FaceMax = EdgeMax = VertMax = -RealLast();
+
+  try {
+#if OCC_VERSION_LARGE > 0x06010000
+    OCC_CATCH_SIGNALS;
+#endif
+    for (TopExp_Explorer ExF (aShape, TopAbs_FACE); ExF.More(); ExF.Next()) {
+      TopoDS_Face Face = TopoDS::Face(ExF.Current());
+      T = BRep_Tool::Tolerance(Face);
+      if (T > FaceMax)
+        FaceMax = T;
+      if (T < FaceMin)
+        FaceMin = T;
+    }
+    for (TopExp_Explorer ExE (aShape, TopAbs_EDGE); ExE.More(); ExE.Next()) {
+      TopoDS_Edge Edge = TopoDS::Edge(ExE.Current());
+      T = BRep_Tool::Tolerance(Edge);
+      if (T > EdgeMax)
+        EdgeMax = T;
+      if (T < EdgeMin)
+        EdgeMin = T;
+    }
+    for (TopExp_Explorer ExV (aShape, TopAbs_VERTEX); ExV.More(); ExV.Next()) {
+      TopoDS_Vertex Vertex = TopoDS::Vertex(ExV.Current());
+      T = BRep_Tool::Tolerance(Vertex);
+      if (T > VertMax)
+        VertMax = T;
+      if (T < VertMin)
+        VertMin = T;
+    }
+  }
+  catch (Standard_Failure) {
+    Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+    SetErrorCode(aFail->GetMessageString());
+    return;
+  }
+
+  SetErrorCode(OK);
+}
+
+//=============================================================================
+/*!
+ *  CheckShape
+ */
+//=============================================================================
+bool GEOMImpl_IMeasureOperations::CheckShape (Handle(GEOM_Object)      theShape,
+                                              const Standard_Boolean   theIsCheckGeom,
+                                              TCollection_AsciiString& theDump)
+{
+  SetErrorCode(KO);
+
+  if (theShape.IsNull()) return false;
+
+  Handle(GEOM_Function) aRefShape = theShape->GetLastFunction();
+  if (aRefShape.IsNull()) return false;
+
+  TopoDS_Shape aShape = aRefShape->GetValue();
+  if (aShape.IsNull()) {
+    SetErrorCode("The Objects has NULL Shape");
+    return false;
+  }
+
+  //Compute the parameters
+  bool isValid = false;
+  try {
+#if OCC_VERSION_LARGE > 0x06010000
+    OCC_CATCH_SIGNALS;
+#endif
+    BRepCheck_Analyzer ana (aShape, theIsCheckGeom);
+    if (ana.IsValid()) {
+      theDump.Clear();
+      isValid = true;
+    } else {
+      StructuralDump(ana, aShape, theDump);
+    }
+  }
+  catch (Standard_Failure) {
+    Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+    SetErrorCode(aFail->GetMessageString());
+    return false;
+  }
+
+  SetErrorCode(OK);
+  return isValid;
+}
+
+//=============================================================================
+/*!
+ *  CheckSelfIntersections
+ */
+//=============================================================================
+bool GEOMImpl_IMeasureOperations::CheckSelfIntersections
+                         (Handle(GEOM_Object)                 theShape,
+                          Handle(TColStd_HSequenceOfInteger)& theIntersections)
+{
+  SetErrorCode(KO);
+  bool isGood = false;
+
+  if (theIntersections.IsNull())
+    theIntersections = new TColStd_HSequenceOfInteger;
+  else
+    theIntersections->Clear();
+
+  if (theShape.IsNull())
+    return isGood;
+
+  Handle(GEOM_Function) aRefShape = theShape->GetLastFunction();
+  if (aRefShape.IsNull()) return isGood;
+
+  TopoDS_Shape aShape = aRefShape->GetValue();
+  if (aShape.IsNull()) return isGood;
+
+  // 0. Prepare data
+  BRep_Builder aBB;
+  TopoDS_Compound aCS;
+  TopoDS_Shape aScopy;
+  //
+  GEOMAlgo_AlgoTools::CopyShape(aShape, aScopy);
+  //
+  // Map sub-shapes and their indices
+  TopTools_IndexedMapOfShape anIndices;
+  TopExp::MapShapes(aScopy, anIndices);
+
+  aBB.MakeCompound(aCS);
+  aBB.Add(aCS, aScopy);
+
+  BOPCol_ListOfShape aLCS;
+  aLCS.Append(aScopy);
+  //
+  BOPAlgo_CheckerSI aCSI; // checker of self-interferences
+  aCSI.SetArguments(aLCS);
+
+  // 1. Launch the checker
+  aCSI.Perform();
+  Standard_Integer iErr = aCSI.ErrorStatus();
+  if (iErr) {
+    return false; // Error
+  }
+
+  isGood = true;
+  //
+  Standard_Integer aNbS, n1, n2;
+  BOPDS_MapIteratorMapOfPassKey aItMPK;
+  //
+  // 2. Take the shapes from DS
+  const BOPDS_DS& aDS = aCSI.DS();
+  aNbS=aDS.NbShapes();
+  //
+  // 3. Get the pairs of interfered shapes
+  const BOPDS_MapOfPassKey& aMPK=aDS.Interferences();
+  aItMPK.Initialize(aMPK);
+  for (; aItMPK.More(); aItMPK.Next()) {
+    const BOPDS_PassKey& aPK=aItMPK.Value();
+    aPK.Ids(n1, n2);
+    //
+    if (n1 > aNbS || n2 > aNbS){
+      return false; // Error
+    }
+    const TopoDS_Shape& aS1 = aDS.Shape(n1);
+    const TopoDS_Shape& aS2 = aDS.Shape(n2);
+
+    theIntersections->Append(anIndices.FindIndex(aS1));
+    theIntersections->Append(anIndices.FindIndex(aS2));
+    isGood = false;
+  }
+
+  SetErrorCode(OK);
+  return isGood;
+}
+
+//=============================================================================
+/*!
+ *  IsGoodForSolid
+ */
+//=============================================================================
+TCollection_AsciiString GEOMImpl_IMeasureOperations::IsGoodForSolid (Handle(GEOM_Object) theShape)
+{
+  SetErrorCode(KO);
+
+  TCollection_AsciiString aRes = "";
+
+  if (theShape.IsNull()) {
+    aRes = "WRN_NULL_OBJECT_OR_SHAPE";
+  }
+  else {
+    Handle(GEOM_Function) aRefShape = theShape->GetLastFunction();
+    if (aRefShape.IsNull()) {
+      aRes = "WRN_NULL_OBJECT_OR_SHAPE";
+    }
+    else {
+      TopoDS_Shape aShape = aRefShape->GetValue();
+      if (aShape.IsNull()) {
+        aRes = "WRN_NULL_OBJECT_OR_SHAPE";
+      }
+      else {
+        if (aShape.ShapeType() == TopAbs_COMPOUND) {
+          TopoDS_Iterator It (aShape, Standard_True, Standard_True);
+          if (It.More()) aShape = It.Value();
+        }
+        if (aShape.ShapeType() == TopAbs_SHELL) {
+          BRepCheck_Shell chkShell (TopoDS::Shell(aShape));
+          if (chkShell.Closed() == BRepCheck_NotClosed) {
+            aRes = "WRN_SHAPE_UNCLOSED";
+          }
+        }
+        else {
+          aRes = "WRN_SHAPE_NOT_SHELL";
+        }
+      }
+    }
+  }
+
+  if (aRes.IsEmpty())
+    SetErrorCode(OK);
+
+  return aRes;
+}
+
+//=============================================================================
+/*!
+ *  WhatIs
+ */
+//=============================================================================
+TCollection_AsciiString GEOMImpl_IMeasureOperations::WhatIs (Handle(GEOM_Object) theShape)
+{
+  SetErrorCode(KO);
+
+  TCollection_AsciiString Astr;
+
+  if (theShape.IsNull()) return Astr;
+
+  Handle(GEOM_Function) aRefShape = theShape->GetLastFunction();
+  if (aRefShape.IsNull()) return Astr;
+
+  TopoDS_Shape aShape = aRefShape->GetValue();
+  if (aShape.IsNull()) {
+    SetErrorCode("The Objects has NULL Shape");
+    return Astr;
+  }
+
+  //Compute the parameters
+  if (aShape.ShapeType() == TopAbs_EDGE) {
+    if (BRep_Tool::Degenerated(TopoDS::Edge(aShape))) {
+      Astr = Astr + " It is a degenerated edge \n";
+    }
+  }
+
+  Astr = Astr + " Number of sub-shapes : \n";
+
+  try {
+#if OCC_VERSION_LARGE > 0x06010000
+    OCC_CATCH_SIGNALS;
+#endif
+    int iType, nbTypes [TopAbs_SHAPE];
+    for (iType = 0; iType < TopAbs_SHAPE; ++iType)
+      nbTypes[iType] = 0;
+    nbTypes[aShape.ShapeType()]++;
+
+    TopTools_MapOfShape aMapOfShape;
+    aMapOfShape.Add(aShape);
+    TopTools_ListOfShape aListOfShape;
+    aListOfShape.Append(aShape);
+
+    TopTools_ListIteratorOfListOfShape itL (aListOfShape);
+    for (; itL.More(); itL.Next()) {
+      TopoDS_Iterator it (itL.Value());
+      for (; it.More(); it.Next()) {
+        TopoDS_Shape s = it.Value();
+        if (aMapOfShape.Add(s)) {
+          aListOfShape.Append(s);
+          nbTypes[s.ShapeType()]++;
+        }
+      }
+    }
+
+    Astr = Astr + " VERTEX : " + TCollection_AsciiString(nbTypes[TopAbs_VERTEX]) + "\n";
+    Astr = Astr + " EDGE : " + TCollection_AsciiString(nbTypes[TopAbs_EDGE]) + "\n";
+    Astr = Astr + " WIRE : " + TCollection_AsciiString(nbTypes[TopAbs_WIRE]) + "\n";
+    Astr = Astr + " FACE : " + TCollection_AsciiString(nbTypes[TopAbs_FACE]) + "\n";
+    Astr = Astr + " SHELL : " + TCollection_AsciiString(nbTypes[TopAbs_SHELL]) + "\n";
+    Astr = Astr + " SOLID : " + TCollection_AsciiString(nbTypes[TopAbs_SOLID]) + "\n";
+    Astr = Astr + " COMPSOLID : " + TCollection_AsciiString(nbTypes[TopAbs_COMPSOLID]) + "\n";
+    Astr = Astr + " COMPOUND : " + TCollection_AsciiString(nbTypes[TopAbs_COMPOUND]) + "\n";
+    Astr = Astr + " SHAPE : " + TCollection_AsciiString(aMapOfShape.Extent());
+  }
+  catch (Standard_Failure) {
+    Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+    SetErrorCode(aFail->GetMessageString());
+    return Astr;
+  }
+
+  SetErrorCode(OK);
+  return Astr;
+}
+
+//=============================================================================
+/*!
+ *  AreCoordsInside
+ */
+//=============================================================================
+std::vector<bool>
+GEOMImpl_IMeasureOperations::AreCoordsInside(Handle(GEOM_Object)        theShape,
+                                             const std::vector<double>& coords,
+                                             double                     tolerance)
+{
+  std::vector<bool> isInsideRes;
+  if (!theShape.IsNull()) {
+    Handle(GEOM_Function) aRefShape = theShape->GetLastFunction();
+    if (!aRefShape.IsNull()) {
+      TopoDS_Shape aShape = aRefShape->GetValue();
+      if (!aShape.IsNull())
+      {
+        TopTools_IndexedMapOfShape mapShape;
+        {
+          TopExp_Explorer anExp;
+          for ( anExp.Init( aShape, TopAbs_SOLID ); anExp.More(); anExp.Next() )
+            mapShape.Add( anExp.Current() );
+          for ( anExp.Init( aShape, TopAbs_FACE, TopAbs_SOLID ); anExp.More(); anExp.Next() )
+            mapShape.Add( anExp.Current() );
+          for ( anExp.Init( aShape, TopAbs_EDGE, TopAbs_FACE ); anExp.More(); anExp.Next() )
+            mapShape.Add( anExp.Current() );
+          for ( anExp.Init( aShape, TopAbs_VERTEX, TopAbs_EDGE ); anExp.More(); anExp.Next() )
+            mapShape.Add( anExp.Current() ); //// ?????????
+        }
+        size_t nb_points = coords.size()/3, nb_points_inside = 0;
+        isInsideRes.resize( nb_points, false );
+
+        for ( int iS = 1; iS <= mapShape.Extent(); ++iS )
+        {
+          if ( nb_points_inside == nb_points )
+            break;
+          aShape = mapShape( iS );
+          switch ( aShape.ShapeType() ) {
+          case TopAbs_SOLID:
+          {
+            BRepClass3d_SolidClassifier SC( TopoDS::Solid( aShape ));
+            for ( size_t i = 0; i < nb_points; i++)
+            {
+              if ( isInsideRes[ i ]) continue;
+              gp_Pnt aPnt( coords[3*i], coords[3*i+1], coords[3*i+2] );
+              SC.Perform( aPnt, tolerance );
+              isInsideRes[ i ] = (( SC.State() == TopAbs_IN ) || ( SC.State() == TopAbs_ON ));
+              nb_points_inside += isInsideRes[ i ];
+            }
+            break;
+          }
+          case TopAbs_FACE:
+          {
+            Standard_Real u1,u2,v1,v2;
+            const TopoDS_Face&   face = TopoDS::Face( aShape );
+            Handle(Geom_Surface) surf = BRep_Tool::Surface( face );
+            surf->Bounds( u1,u2,v1,v2 );
+            GeomAPI_ProjectPointOnSurf project;
+            project.Init(surf, u1,u2, v1,v2, tolerance );
+            for ( size_t i = 0; i < nb_points; i++)
+            {
+              if ( isInsideRes[ i ]) continue;
+              gp_Pnt aPnt( coords[3*i], coords[3*i+1], coords[3*i+2] );
+              project.Perform( aPnt );
+              if ( project.IsDone() &&
+                   project.NbPoints() > 0 &&
+                   project.LowerDistance() <= tolerance )
+              {
+                Quantity_Parameter u, v;
+                project.LowerDistanceParameters(u, v);
+                gp_Pnt2d uv( u, v );
+                BRepClass_FaceClassifier FC ( face, uv, tolerance );
+                isInsideRes[ i ] = (( FC.State() == TopAbs_IN ) || ( FC.State() == TopAbs_ON ));
+                nb_points_inside += isInsideRes[ i ];
+              }
+            }
+            break;
+          }
+          case TopAbs_EDGE:
+          {
+            Standard_Real f,l;
+            const TopoDS_Edge&  edge = TopoDS::Edge( aShape );
+            Handle(Geom_Curve) curve = BRep_Tool::Curve( edge, f, l );
+            GeomAPI_ProjectPointOnCurve project;
+            project.Init( curve, f, l );
+            for ( size_t i = 0; i < nb_points; i++)
+            {
+              if ( isInsideRes[ i ]) continue;
+              gp_Pnt aPnt( coords[3*i], coords[3*i+1], coords[3*i+2] );
+              project.Perform( aPnt );
+              isInsideRes[ i ] = ( project.NbPoints() > 0 &&
+                                   project.LowerDistance() <= tolerance );
+              nb_points_inside += isInsideRes[ i ];
+            }
+            break;
+          }
+          case TopAbs_VERTEX:
+          {
+            gp_Pnt aVPnt = BRep_Tool::Pnt( TopoDS::Vertex( aShape ));
+            for ( size_t i = 0; i < nb_points; i++)
+            {
+              if ( isInsideRes[ i ]) continue;
+              gp_Pnt aPnt( coords[3*i], coords[3*i+1], coords[3*i+2] );
+              isInsideRes[ i ] = ( aPnt.SquareDistance( aVPnt ) <= tolerance * tolerance );
+              nb_points_inside += isInsideRes[ i ];
+            }
+            break;
+          }
+          default:;
+          } // switch ( aShape.ShapeType() )
+        }
+      }
+    }
+  }
+  return isInsideRes;
+}
+
+//=============================================================================
+/*!
+ *  GetMinDistance
+ */
+//=============================================================================
+Standard_Real
+GEOMImpl_IMeasureOperations::GetMinDistance (Handle(GEOM_Object) theShape1,
+                                             Handle(GEOM_Object) theShape2,
+                                             Standard_Real& X1,
+                                             Standard_Real& Y1,
+                                             Standard_Real& Z1,
+                                             Standard_Real& X2,
+                                             Standard_Real& Y2,
+                                             Standard_Real& Z2)
+{
+  SetErrorCode(KO);
+  Standard_Real MinDist = 1.e9;
+
+  if (theShape1.IsNull() || theShape2.IsNull()) return MinDist;
+
+  Handle(GEOM_Function) aRefShape1 = theShape1->GetLastFunction();
+  Handle(GEOM_Function) aRefShape2 = theShape2->GetLastFunction();
+  if (aRefShape1.IsNull() || aRefShape2.IsNull()) return MinDist;
+
+  TopoDS_Shape aShape1 = aRefShape1->GetValue();
+  TopoDS_Shape aShape2 = aRefShape2->GetValue();
+  if (aShape1.IsNull() || aShape2.IsNull()) {
+    SetErrorCode("One of Objects has NULL Shape");
+    return MinDist;
+  }
+
+  //Compute the parameters
+  try {
+#if OCC_VERSION_LARGE > 0x06010000
+    OCC_CATCH_SIGNALS;
+#endif
+
+    gp_Pnt aPnt1, aPnt2;
+
+    MinDist = GEOMUtils::GetMinDistance(aShape1, aShape2, aPnt1, aPnt2);
+
+    if (MinDist >= 0.0) {
+      aPnt1.Coord(X1, Y1, Z1);
+      aPnt2.Coord(X2, Y2, Z2);
+    } else {
+      return MinDist;
+    }
+  }
+  catch (Standard_Failure) {
+    Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+    SetErrorCode(aFail->GetMessageString());
+    return MinDist;
+  }
+
+  SetErrorCode(OK);
+  return MinDist;
+}
+
+//=======================================================================
+/*!
+ *  Get coordinates of closest points of two shapes
+ */
+//=======================================================================
+Standard_Integer GEOMImpl_IMeasureOperations::ClosestPoints (Handle(GEOM_Object) theShape1,
+                                                             Handle(GEOM_Object) theShape2,
+                                                             Handle(TColStd_HSequenceOfReal)& theDoubles)
+{
+  SetErrorCode(KO);
+  Standard_Integer nbSolutions = 0;
+
+  if (theShape1.IsNull() || theShape2.IsNull()) return nbSolutions;
+
+  Handle(GEOM_Function) aRefShape1 = theShape1->GetLastFunction();
+  Handle(GEOM_Function) aRefShape2 = theShape2->GetLastFunction();
+  if (aRefShape1.IsNull() || aRefShape2.IsNull()) return nbSolutions;
+
+  TopoDS_Shape aShape1 = aRefShape1->GetValue();
+  TopoDS_Shape aShape2 = aRefShape2->GetValue();
+  if (aShape1.IsNull() || aShape2.IsNull()) {
+    SetErrorCode("One of Objects has NULL Shape");
+    return nbSolutions;
+  }
+
+  // Compute the extremities
+  try {
+#if OCC_VERSION_LARGE > 0x06010000
+    OCC_CATCH_SIGNALS;
+#endif
+
+    // skl 30.06.2008
+    // additional workaround for bugs 19899, 19908 and 19910 from Mantis
+    gp_Pnt P1, P2;
+    double dist = GEOMUtils::GetMinDistanceSingular(aShape1, aShape2, P1, P2);
+    if (dist > -1.0) {
+      nbSolutions = 1;
+
+      theDoubles->Append(P1.X());
+      theDoubles->Append(P1.Y());
+      theDoubles->Append(P1.Z());
+      theDoubles->Append(P2.X());
+      theDoubles->Append(P2.Y());
+      theDoubles->Append(P2.Z());
+
+      SetErrorCode(OK);
+      return nbSolutions;
+    }
+
+    BRepExtrema_DistShapeShape dst (aShape1, aShape2);
+    if (dst.IsDone()) {
+      nbSolutions = dst.NbSolution();
+      if (theDoubles.IsNull()) theDoubles = new TColStd_HSequenceOfReal;
+
+      gp_Pnt P1, P2;
+      for (int i = 1; i <= nbSolutions; i++) {
+        P1 = dst.PointOnShape1(i);
+        P2 = dst.PointOnShape2(i);
+
+        theDoubles->Append(P1.X());
+        theDoubles->Append(P1.Y());
+        theDoubles->Append(P1.Z());
+        theDoubles->Append(P2.X());
+        theDoubles->Append(P2.Y());
+        theDoubles->Append(P2.Z());
+      }
+    }
+  }
+  catch (Standard_Failure) {
+    Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+    SetErrorCode(aFail->GetMessageString());
+    return nbSolutions;
+  }
+
+  SetErrorCode(OK);
+  return nbSolutions;
+}
+
+//=======================================================================
+/*!
+ *  Get coordinates of point
+ */
+//=======================================================================
+void GEOMImpl_IMeasureOperations::PointCoordinates (Handle(GEOM_Object) theShape,
+                        Standard_Real& theX, Standard_Real& theY, Standard_Real& theZ)
+{
+  SetErrorCode(KO);
+
+  if (theShape.IsNull())
+    return;
+
+  Handle(GEOM_Function) aRefShape = theShape->GetLastFunction();
+  if (aRefShape.IsNull())
+    return;
+
+  TopoDS_Shape aShape = aRefShape->GetValue();
+  if (aShape.IsNull() || aShape.ShapeType() != TopAbs_VERTEX)
+  {
+    SetErrorCode( "Shape must be a vertex" );
+    return;
+  }
+
+  try {
+#if OCC_VERSION_LARGE > 0x06010000
+    OCC_CATCH_SIGNALS;
+#endif
+    gp_Pnt aPnt = BRep_Tool::Pnt( TopoDS::Vertex( aShape ) );
+    theX = aPnt.X();
+    theY = aPnt.Y();
+    theZ = aPnt.Z();
+
+    SetErrorCode(OK);
+  }
+  catch (Standard_Failure)
+  {
+    Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+    SetErrorCode( aFail->GetMessageString() );
+  }
+}
+
+//=======================================================================
+/*!
+ *  Compute angle (in degrees) between two lines
+ */
+//=======================================================================
+Standard_Real GEOMImpl_IMeasureOperations::GetAngle (Handle(GEOM_Object) theLine1,
+                                                     Handle(GEOM_Object) theLine2)
+{
+  if (theLine1->GetType() == GEOM_VECTOR &&
+      theLine2->GetType() == GEOM_VECTOR)
+    return GetAngleBtwVectors(theLine1, theLine2);
+
+  SetErrorCode(KO);
+
+  Standard_Real anAngle = -1.0;
+
+  if (theLine1.IsNull() || theLine2.IsNull())
+    return anAngle;
+
+  Handle(GEOM_Function) aRefLine1 = theLine1->GetLastFunction();
+  Handle(GEOM_Function) aRefLine2 = theLine2->GetLastFunction();
+  if (aRefLine1.IsNull() || aRefLine2.IsNull())
+    return anAngle;
+
+  TopoDS_Shape aLine1 = aRefLine1->GetValue();
+  TopoDS_Shape aLine2 = aRefLine2->GetValue();
+  if (aLine1.IsNull() || aLine2.IsNull() ||
+      aLine1.ShapeType() != TopAbs_EDGE ||
+      aLine2.ShapeType() != TopAbs_EDGE)
+  {
+    SetErrorCode("Two edges must be given");
+    return anAngle;
+  }
+
+  try {
+#if OCC_VERSION_LARGE > 0x06010000
+    OCC_CATCH_SIGNALS;
+#endif
+    TopoDS_Edge E1 = TopoDS::Edge(aLine1);
+    TopoDS_Edge E2 = TopoDS::Edge(aLine2);
+
+    double fp,lp;
+    Handle(Geom_Curve) C1 = BRep_Tool::Curve(E1,fp,lp);
+    Handle(Geom_Curve) C2 = BRep_Tool::Curve(E2,fp,lp);
+
+    if ( C1.IsNull() || C2.IsNull() ||
+        !C1->IsKind(STANDARD_TYPE(Geom_Line)) ||
+        !C2->IsKind(STANDARD_TYPE(Geom_Line)))
+    {
+      SetErrorCode("The edges must be linear");
+      return anAngle;
+    }
+
+    Handle(Geom_Line) L1 = Handle(Geom_Line)::DownCast(C1);
+    Handle(Geom_Line) L2 = Handle(Geom_Line)::DownCast(C2);
+
+    gp_Lin aLin1 = L1->Lin();
+    gp_Lin aLin2 = L2->Lin();
+
+    anAngle = aLin1.Angle(aLin2);
+    anAngle *= 180. / M_PI; // convert radians into degrees
+
+    if (anAngle > 90.0) {
+      anAngle = 180.0 - anAngle;
+    }
+
+    SetErrorCode(OK);
+  }
+  catch (Standard_Failure)
+  {
+    Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+    SetErrorCode(aFail->GetMessageString());
+  }
+
+  return anAngle;
+}
+
+//=======================================================================
+/*!
+ *  Compute angle (in degrees) between two vectors
+ */
+//=======================================================================
+Standard_Real GEOMImpl_IMeasureOperations::GetAngleBtwVectors (Handle(GEOM_Object) theVec1,
+                                                               Handle(GEOM_Object) theVec2)
+{
+  SetErrorCode(KO);
+
+  Standard_Real anAngle = -1.0;
 
-  Handle(GEOM_Function) aRefShape = theShape->GetLastFunction();
-  if (aRefShape.IsNull()) return;
+  if (theVec1.IsNull() || theVec2.IsNull())
+    return anAngle;
 
-  TopoDS_Shape aShape = aRefShape->GetValue();
-  if (aShape.IsNull()) {
-    SetErrorCode("The Objects has NULL Shape");
-    return;
+  if (theVec1->GetType() != GEOM_VECTOR || theVec2->GetType() != GEOM_VECTOR) {
+    SetErrorCode("Two vectors must be given");
+    return anAngle;
   }
 
-  //Compute the parameters
-  GProp_GProps System;
+  Handle(GEOM_Function) aRefVec1 = theVec1->GetLastFunction();
+  Handle(GEOM_Function) aRefVec2 = theVec2->GetLastFunction();
+  if (aRefVec1.IsNull() || aRefVec2.IsNull())
+    return anAngle;
+
+  TopoDS_Shape aVec1 = aRefVec1->GetValue();
+  TopoDS_Shape aVec2 = aRefVec2->GetValue();
+  if (aVec1.IsNull() || aVec2.IsNull() ||
+      aVec1.ShapeType() != TopAbs_EDGE ||
+      aVec2.ShapeType() != TopAbs_EDGE)
+  {
+    SetErrorCode("Two edges must be given");
+    return anAngle;
+  }
 
   try {
-    if (aShape.ShapeType() == TopAbs_VERTEX ||
-        aShape.ShapeType() == TopAbs_EDGE ||
-        aShape.ShapeType() == TopAbs_WIRE) {
-      BRepGProp::LinearProperties(aShape, System);
-    } else if (aShape.ShapeType() == TopAbs_FACE ||
-               aShape.ShapeType() == TopAbs_SHELL) {
-      BRepGProp::SurfaceProperties(aShape, System);
-    } else {
-      BRepGProp::VolumeProperties(aShape, System);
+#if OCC_VERSION_LARGE > 0x06010000
+    OCC_CATCH_SIGNALS;
+#endif
+    TopoDS_Edge aE1 = TopoDS::Edge(aVec1);
+    TopoDS_Edge aE2 = TopoDS::Edge(aVec2);
+
+    TopoDS_Vertex aP11, aP12, aP21, aP22;
+    TopExp::Vertices(aE1, aP11, aP12, Standard_True);
+    TopExp::Vertices(aE2, aP21, aP22, Standard_True);
+    if (aP11.IsNull() || aP12.IsNull() || aP21.IsNull() || aP22.IsNull()) {
+      SetErrorCode("Bad edge given");
+      return anAngle;
     }
-    gp_Mat I = System.MatrixOfInertia();
-
-    I11 = I(1,1);
-    I12 = I(1,2);
-    I13 = I(1,3);
 
-    I21 = I(2,1);
-    I22 = I(2,2);
-    I23 = I(2,3);
+    gp_Vec aV1 (BRep_Tool::Pnt(aP11), BRep_Tool::Pnt(aP12));
+    gp_Vec aV2 (BRep_Tool::Pnt(aP21), BRep_Tool::Pnt(aP22)) ;
 
-    I31 = I(3,1);
-    I32 = I(3,2);
-    I33 = I(3,3);
+    anAngle = aV1.Angle(aV2);
+    anAngle *= 180. / M_PI; // convert radians into degrees
 
-    GProp_PrincipalProps Pr = System.PrincipalProperties();
-    Pr.Moments(Ix,Iy,Iz);
+    SetErrorCode(OK);
   }
-  catch (Standard_Failure) {
+  catch (Standard_Failure)
+  {
     Handle(Standard_Failure) aFail = Standard_Failure::Caught();
     SetErrorCode(aFail->GetMessageString());
-    return;
   }
 
-  SetErrorCode(OK);
+  return anAngle;
 }
 
+
 //=============================================================================
 /*!
- *  GetBoundingBox
+ *  CurveCurvatureByParam
  */
 //=============================================================================
-void GEOMImpl_IMeasureOperations::GetBoundingBox
-                                     (Handle(GEOM_Object) theShape,
-                                      Standard_Real& Xmin, Standard_Real& Xmax,
-                                      Standard_Real& Ymin, Standard_Real& Ymax,
-                                      Standard_Real& Zmin, Standard_Real& Zmax)
+Standard_Real GEOMImpl_IMeasureOperations::CurveCurvatureByParam
+                        (Handle(GEOM_Object) theCurve, Standard_Real& theParam)
 {
   SetErrorCode(KO);
+  Standard_Real aRes = -1.0;
 
-  if (theShape.IsNull()) return;
+  if(theCurve.IsNull()) return aRes;
 
-  Handle(GEOM_Function) aRefShape = theShape->GetLastFunction();
-  if (aRefShape.IsNull()) return;
+  Handle(GEOM_Function) aRefShape = theCurve->GetLastFunction();
+  if(aRefShape.IsNull()) return aRes;
 
   TopoDS_Shape aShape = aRefShape->GetValue();
-  if (aShape.IsNull()) {
-    SetErrorCode("The Objects has NULL Shape");
-    return;
+  if(aShape.IsNull()) {
+    SetErrorCode("One of Objects has NULL Shape");
+    return aRes;
   }
 
-  //Compute the parameters
-  Bnd_Box B;
+  Standard_Real aFP, aLP, aP;
+  Handle(Geom_Curve) aCurve = BRep_Tool::Curve(TopoDS::Edge(aShape), aFP, aLP);
+  aP = aFP + (aLP - aFP) * theParam;
+
+  if(aCurve.IsNull()) return aRes;
 
+  //Compute curvature
   try {
-    BRepBndLib::Add(aShape, B);
-    B.Get(Xmin, Ymin, Zmin, Xmax, Ymax, Zmax);
+#if OCC_VERSION_LARGE > 0x06010000
+    OCC_CATCH_SIGNALS;
+#endif
+    GeomLProp_CLProps Prop = GeomLProp_CLProps
+      (aCurve, aP, 2, Precision::Confusion());
+    aRes = fabs(Prop.Curvature());
+    SetErrorCode(OK);
   }
   catch (Standard_Failure) {
     Handle(Standard_Failure) aFail = Standard_Failure::Caught();
     SetErrorCode(aFail->GetMessageString());
-    return;
+    return aRes;
   }
 
-  SetErrorCode(OK);
+  if( aRes > Precision::Confusion() )
+    aRes = 1/aRes;
+  else
+    aRes = RealLast();
+
+  return aRes;
 }
 
+
 //=============================================================================
 /*!
- *  GetTolerance
+ *  CurveCurvatureByPoint
  */
 //=============================================================================
-void GEOMImpl_IMeasureOperations::GetTolerance
-                               (Handle(GEOM_Object) theShape,
-                                Standard_Real& FaceMin, Standard_Real& FaceMax,
-                                Standard_Real& EdgeMin, Standard_Real& EdgeMax,
-                                Standard_Real& VertMin, Standard_Real& VertMax)
+Standard_Real GEOMImpl_IMeasureOperations::CurveCurvatureByPoint
+                   (Handle(GEOM_Object) theCurve, Handle(GEOM_Object) thePoint)
 {
   SetErrorCode(KO);
+  Standard_Real aRes = -1.0;
 
-  if (theShape.IsNull()) return;
+  if( theCurve.IsNull() || thePoint.IsNull() ) return aRes;
 
-  Handle(GEOM_Function) aRefShape = theShape->GetLastFunction();
-  if (aRefShape.IsNull()) return;
+  Handle(GEOM_Function) aRefCurve = theCurve->GetLastFunction();
+  Handle(GEOM_Function) aRefPoint = thePoint->GetLastFunction();
+  if( aRefCurve.IsNull() || aRefPoint.IsNull() ) return aRes;
 
-  TopoDS_Shape aShape = aRefShape->GetValue();
-  if (aShape.IsNull()) {
-    SetErrorCode("The Objects has NULL Shape");
-    return;
+  TopoDS_Edge anEdge = TopoDS::Edge(aRefCurve->GetValue());
+  TopoDS_Vertex aPnt = TopoDS::Vertex(aRefPoint->GetValue());
+  if( anEdge.IsNull() || aPnt.IsNull() ) {
+    SetErrorCode("One of Objects has NULL Shape");
+    return aRes;
   }
 
-  //Compute the parameters
-  Standard_Real T;
-  FaceMin = EdgeMin = VertMin = RealLast();
-  FaceMax = EdgeMax = VertMax = -RealLast();
+  Standard_Real aFP, aLP;
+  Handle(Geom_Curve) aCurve = BRep_Tool::Curve(anEdge, aFP, aLP);
+  if(aCurve.IsNull()) return aRes;
+  gp_Pnt aPoint = BRep_Tool::Pnt(aPnt);
 
+  //Compute curvature
   try {
-    for (TopExp_Explorer ExF (aShape, TopAbs_FACE); ExF.More(); ExF.Next()) {
-      TopoDS_Face Face = TopoDS::Face(ExF.Current());
-      T = BRep_Tool::Tolerance(Face);
-      if (T > FaceMax)
-       FaceMax = T;
-      if (T < FaceMin)
-       FaceMin = T;
-    }
-    for (TopExp_Explorer ExE (aShape, TopAbs_EDGE); ExE.More(); ExE.Next()) {
-      TopoDS_Edge Edge = TopoDS::Edge(ExE.Current());
-      T = BRep_Tool::Tolerance(Edge);
-      if (T > EdgeMax)
-       EdgeMax = T;
-      if (T < EdgeMin)
-       EdgeMin = T;
-    }
-    for (TopExp_Explorer ExV (aShape, TopAbs_VERTEX); ExV.More(); ExV.Next()) {
-      TopoDS_Vertex Vertex = TopoDS::Vertex(ExV.Current());
-      T = BRep_Tool::Tolerance(Vertex);
-      if (T > VertMax)
-       VertMax = T;
-      if (T < VertMin)
-       VertMin = T;
+#if OCC_VERSION_LARGE > 0x06010000
+    OCC_CATCH_SIGNALS;
+#endif
+    GeomAPI_ProjectPointOnCurve PPCurve(aPoint, aCurve, aFP, aLP);
+    if(PPCurve.NbPoints()>0) {
+      GeomLProp_CLProps Prop = GeomLProp_CLProps
+        (aCurve, PPCurve.LowerDistanceParameter(), 2, Precision::Confusion());
+      aRes = fabs(Prop.Curvature());
+      SetErrorCode(OK);
     }
   }
   catch (Standard_Failure) {
     Handle(Standard_Failure) aFail = Standard_Failure::Caught();
     SetErrorCode(aFail->GetMessageString());
-    return;
+    return aRes;
   }
 
-  SetErrorCode(OK);
+  if( aRes > Precision::Confusion() )
+    aRes = 1/aRes;
+  else
+    aRes = RealLast();
+
+  return aRes;
 }
 
+
 //=============================================================================
 /*!
- *  CheckShape
+ *  getSurfaceCurvatures
  */
 //=============================================================================
-bool GEOMImpl_IMeasureOperations::CheckShape (Handle(GEOM_Object)      theShape,
-                                              TCollection_AsciiString& theDump)
+Standard_Real GEOMImpl_IMeasureOperations::getSurfaceCurvatures
+                                          (const Handle(Geom_Surface)& aSurf,
+                                           Standard_Real theUParam,
+                                           Standard_Real theVParam,
+                                           Standard_Boolean theNeedMaxCurv)
 {
   SetErrorCode(KO);
+  Standard_Real aRes = 1.0;
 
-  if (theShape.IsNull()) return false;
-
-  Handle(GEOM_Function) aRefShape = theShape->GetLastFunction();
-  if (aRefShape.IsNull()) return false;
-
-  TopoDS_Shape aShape = aRefShape->GetValue();
-  if (aShape.IsNull()) {
-    SetErrorCode("The Objects has NULL Shape");
-    return false;
-  }
+  if (aSurf.IsNull()) return aRes;
 
-  //Compute the parameters
-  bool isValid = false;
   try {
-    BRepCheck_Analyzer ana (aShape, false);
-    if (ana.IsValid()) {
-      theDump.Clear();
-      isValid = true;
-    } else {
-      StructuralDump(ana, aShape, theDump);
+#if OCC_VERSION_LARGE > 0x06010000
+    OCC_CATCH_SIGNALS;
+#endif
+    GeomLProp_SLProps Prop = GeomLProp_SLProps
+      (aSurf, theUParam, theVParam, 2, Precision::Confusion());
+    if(Prop.IsCurvatureDefined()) {
+      if(Prop.IsUmbilic()) {
+        //cout<<"is umbilic"<<endl;
+        aRes = fabs(Prop.MeanCurvature());
+      }
+      else {
+        //cout<<"is not umbilic"<<endl;
+        double c1 = fabs(Prop.MaxCurvature());
+        double c2 = fabs(Prop.MinCurvature());
+        if(theNeedMaxCurv)
+          aRes = Max(c1,c2);
+        else
+          aRes = Min(c1,c2);
+      }
+      SetErrorCode(OK);
     }
   }
   catch (Standard_Failure) {
     Handle(Standard_Failure) aFail = Standard_Failure::Caught();
     SetErrorCode(aFail->GetMessageString());
-    return false;
+    return aRes;
   }
 
-  SetErrorCode(OK);
-  return isValid;
+  if( fabs(aRes) > Precision::Confusion() )
+    aRes = 1/aRes;
+  else
+    aRes = RealLast();
+
+  return aRes;
 }
 
+
 //=============================================================================
 /*!
- *  WhatIs
+ *  MaxSurfaceCurvatureByParam
  */
 //=============================================================================
-TCollection_AsciiString GEOMImpl_IMeasureOperations::WhatIs (Handle(GEOM_Object) theShape)
+Standard_Real GEOMImpl_IMeasureOperations::MaxSurfaceCurvatureByParam
+                                                  (Handle(GEOM_Object) theSurf,
+                                                   Standard_Real& theUParam,
+                                                   Standard_Real& theVParam)
 {
   SetErrorCode(KO);
+  Standard_Real aRes = -1.0;
 
-  TCollection_AsciiString Astr;
-
-  if (theShape.IsNull()) return Astr;
+  if (theSurf.IsNull()) return aRes;
 
-  Handle(GEOM_Function) aRefShape = theShape->GetLastFunction();
-  if (aRefShape.IsNull()) return Astr;
+  Handle(GEOM_Function) aRefShape = theSurf->GetLastFunction();
+  if(aRefShape.IsNull()) return aRes;
 
   TopoDS_Shape aShape = aRefShape->GetValue();
-  if (aShape.IsNull()) {
-    SetErrorCode("The Objects has NULL Shape");
-    return Astr;
+  if(aShape.IsNull()) {
+    SetErrorCode("One of Objects has NULL Shape");
+    return aRes;
   }
 
+  TopoDS_Face F = TopoDS::Face(aShape);
+  Handle(Geom_Surface) aSurf = BRep_Tool::Surface(F);
+
   //Compute the parameters
-  if (aShape.ShapeType() == TopAbs_EDGE) {
-    if (BRep_Tool::Degenerated(TopoDS::Edge(aShape))) {
-      Astr = Astr + " It is a degenerated edge \n";
-    }
-  }
+  Standard_Real U1,U2,V1,V2;
+  ShapeAnalysis::GetFaceUVBounds(F,U1,U2,V1,V2);
+  Standard_Real U = U1 + (U2-U1)*theUParam;
+  Standard_Real V = V1 + (V2-V1)*theVParam;
 
-  Astr = Astr + " Number of sub-shapes : \n";
+  return getSurfaceCurvatures(aSurf, U, V, true);
+}
 
-  try {
-    int iType, nbTypes [TopAbs_SHAPE];
-    for (iType = 0; iType < TopAbs_SHAPE; ++iType)
-      nbTypes[iType] = 0;
-    nbTypes[aShape.ShapeType()]++;
 
-    TopTools_MapOfShape aMapOfShape;
-    aMapOfShape.Add(aShape);
-    TopTools_ListOfShape aListOfShape;
-    aListOfShape.Append(aShape);
+//=============================================================================
+/*!
+ *  MaxSurfaceCurvatureByPoint
+ */
+//=============================================================================
+Standard_Real GEOMImpl_IMeasureOperations::MaxSurfaceCurvatureByPoint
+                    (Handle(GEOM_Object) theSurf, Handle(GEOM_Object) thePoint)
+{
+  SetErrorCode(KO);
+  Standard_Real aRes = -1.0;
 
-    TopTools_ListIteratorOfListOfShape itL (aListOfShape);
-    for (; itL.More(); itL.Next()) {
-      TopoDS_Iterator it (itL.Value());
-      for (; it.More(); it.Next()) {
-        TopoDS_Shape s = it.Value();
-        if (aMapOfShape.Add(s)) {
-          aListOfShape.Append(s);
-          nbTypes[s.ShapeType()]++;
-        }
-      }
-    }
+  if( theSurf.IsNull() || thePoint.IsNull() ) return aRes;
 
-    Astr = Astr + " VERTEX : " + TCollection_AsciiString(nbTypes[TopAbs_VERTEX]) + "\n";
-    Astr = Astr + " EDGE : " + TCollection_AsciiString(nbTypes[TopAbs_EDGE]) + "\n";
-    Astr = Astr + " WIRE : " + TCollection_AsciiString(nbTypes[TopAbs_WIRE]) + "\n";
-    Astr = Astr + " FACE : " + TCollection_AsciiString(nbTypes[TopAbs_FACE]) + "\n";
-    Astr = Astr + " SHELL : " + TCollection_AsciiString(nbTypes[TopAbs_SHELL]) + "\n";
-    Astr = Astr + " SOLID : " + TCollection_AsciiString(nbTypes[TopAbs_SOLID]) + "\n";
-    Astr = Astr + " COMPSOLID : " + TCollection_AsciiString(nbTypes[TopAbs_COMPSOLID]) + "\n";
-    Astr = Astr + " COMPOUND : " + TCollection_AsciiString(nbTypes[TopAbs_COMPOUND]) + "\n";
-    Astr = Astr + " SHAPE : " + TCollection_AsciiString(aMapOfShape.Extent());
-  }
-  catch (Standard_Failure) {
-    Handle(Standard_Failure) aFail = Standard_Failure::Caught();
-    SetErrorCode(aFail->GetMessageString());
-    return Astr;
+  Handle(GEOM_Function) aRefShape = theSurf->GetLastFunction();
+  Handle(GEOM_Function) aRefPoint = thePoint->GetLastFunction();
+  if( aRefShape.IsNull() || aRefPoint.IsNull() ) return aRes;
+
+  TopoDS_Face aFace = TopoDS::Face(aRefShape->GetValue());
+  TopoDS_Vertex aPnt = TopoDS::Vertex(aRefPoint->GetValue());
+  if( aFace.IsNull() || aPnt.IsNull() ) {
+    SetErrorCode("One of Objects has NULL Shape");
+    return 0;
   }
 
-  SetErrorCode(OK);
-  return Astr;
+  Handle(Geom_Surface) aSurf = BRep_Tool::Surface(aFace);
+  if(aSurf.IsNull()) return aRes;
+  gp_Pnt aPoint = BRep_Tool::Pnt(aPnt);
+
+  //Compute the parameters
+  ShapeAnalysis_Surface sas(aSurf);
+  gp_Pnt2d UV = sas.ValueOfUV(aPoint,Precision::Confusion());
+
+  return getSurfaceCurvatures(aSurf, UV.X(), UV.Y(), true);
 }
 
+
 //=============================================================================
 /*!
- *  GetMinDistance
+ *  MinSurfaceCurvatureByParam
  */
 //=============================================================================
-Standard_Real GEOMImpl_IMeasureOperations::GetMinDistance
-  (Handle(GEOM_Object) theShape1, Handle(GEOM_Object) theShape2,
-   Standard_Real& X1, Standard_Real& Y1, Standard_Real& Z1,
-   Standard_Real& X2, Standard_Real& Y2, Standard_Real& Z2)
+Standard_Real GEOMImpl_IMeasureOperations::MinSurfaceCurvatureByParam
+                                                  (Handle(GEOM_Object) theSurf,
+                                                   Standard_Real& theUParam,
+                                                   Standard_Real& theVParam)
 {
   SetErrorCode(KO);
-  Standard_Real MinDist = 1.e9;
+  Standard_Real aRes = -1.0;
 
-  if (theShape1.IsNull() || theShape2.IsNull()) return MinDist;
+  if (theSurf.IsNull()) return aRes;
 
-  Handle(GEOM_Function) aRefShape1 = theShape1->GetLastFunction();
-  Handle(GEOM_Function) aRefShape2 = theShape2->GetLastFunction();
-  if (aRefShape1.IsNull() || aRefShape2.IsNull()) return MinDist;
+  Handle(GEOM_Function) aRefShape = theSurf->GetLastFunction();
+  if(aRefShape.IsNull()) return aRes;
 
-  TopoDS_Shape aShape1 = aRefShape1->GetValue();
-  TopoDS_Shape aShape2 = aRefShape2->GetValue();
-  if (aShape1.IsNull() || aShape2.IsNull()) {
+  TopoDS_Shape aShape = aRefShape->GetValue();
+  if(aShape.IsNull()) {
     SetErrorCode("One of Objects has NULL Shape");
-    return MinDist;
+    return aRes;
   }
 
-  //Compute the parameters
-  try {
-    BRepExtrema_DistShapeShape dst (aShape1, aShape2);
-    if (dst.IsDone()) {
-      gp_Pnt PMin1, PMin2, P1, P2;
-
-      for (int i = 1; i <= dst.NbSolution(); i++) {
-       P1 = dst.PointOnShape1(i);
-       P2 = dst.PointOnShape2(i);
-
-       Standard_Real Dist = P1.Distance(P2);
-       if (MinDist > Dist) {
-         MinDist = Dist;
-          PMin1 = P1;
-          PMin2 = P2;
-        }
-      }
+  TopoDS_Face F = TopoDS::Face(aShape);
+  Handle(Geom_Surface) aSurf = BRep_Tool::Surface(F);
 
-      PMin1.Coord(X1, Y1, Z1);
-      PMin2.Coord(X2, Y2, Z2);
-    }
-  }
-  catch (Standard_Failure) {
-    Handle(Standard_Failure) aFail = Standard_Failure::Caught();
-    SetErrorCode(aFail->GetMessageString());
-    return MinDist;
-  }
+  //Compute the parameters
+  Standard_Real U1,U2,V1,V2;
+  ShapeAnalysis::GetFaceUVBounds(F,U1,U2,V1,V2);
+  Standard_Real U = U1 + (U2-U1)*theUParam;
+  Standard_Real V = V1 + (V2-V1)*theVParam;
 
-  SetErrorCode(OK);
-  return MinDist;
+  return getSurfaceCurvatures(aSurf, U, V, false);
 }
 
-//=======================================================================
-//function : PointCoordinates
-//purpose  : Get coordinates of point
-//=======================================================================
-void GEOMImpl_IMeasureOperations::PointCoordinates( Handle(GEOM_Object) theShape,
-                        Standard_Real& theX, Standard_Real& theY, Standard_Real& theZ )
+
+//=============================================================================
+/*!
+ *  MinSurfaceCurvatureByPoint
+ */
+//=============================================================================
+Standard_Real GEOMImpl_IMeasureOperations::MinSurfaceCurvatureByPoint
+                    (Handle(GEOM_Object) theSurf, Handle(GEOM_Object) thePoint)
 {
-  SetErrorCode( KO );
+  SetErrorCode(KO);
+  Standard_Real aRes = -1.0;
 
-  if ( theShape.IsNull() )
-    return;
+  if( theSurf.IsNull() || thePoint.IsNull() ) return aRes;
 
-  Handle(GEOM_Function) aRefShape = theShape->GetLastFunction();
-  if ( aRefShape.IsNull() )
-    return;
+  Handle(GEOM_Function) aRefShape = theSurf->GetLastFunction();
+  Handle(GEOM_Function) aRefPoint = thePoint->GetLastFunction();
+  if( aRefShape.IsNull() || aRefPoint.IsNull() ) return aRes;
 
-  TopoDS_Shape aShape = aRefShape->GetValue();
-  if ( aShape.IsNull() || aShape.ShapeType() != TopAbs_VERTEX )
-  {
-    SetErrorCode( "Shape must be a vertex" );
-    return;
+  TopoDS_Face aFace = TopoDS::Face(aRefShape->GetValue());
+  TopoDS_Vertex aPnt = TopoDS::Vertex(aRefPoint->GetValue());
+  if( aFace.IsNull() || aPnt.IsNull() ) {
+    SetErrorCode("One of Objects has NULL Shape");
+    return 0;
   }
 
-  try
-  {
-    gp_Pnt aPnt = BRep_Tool::Pnt( TopoDS::Vertex( aShape ) );
-    theX = aPnt.X();
-    theY = aPnt.Y();
-    theZ = aPnt.Z();
-    SetErrorCode( OK );
-  }
-  catch ( Standard_Failure )
-  {
-    Handle(Standard_Failure) aFail = Standard_Failure::Caught();
-    SetErrorCode( aFail->GetMessageString() );
-  }
+  Handle(Geom_Surface) aSurf = BRep_Tool::Surface(aFace);
+  if(aSurf.IsNull()) return aRes;
+  gp_Pnt aPoint = BRep_Tool::Pnt(aPnt);
+
+  //Compute the parameters
+  ShapeAnalysis_Surface sas(aSurf);
+  gp_Pnt2d UV = sas.ValueOfUV(aPoint,Precision::Confusion());
+
+  return getSurfaceCurvatures(aSurf, UV.X(), UV.Y(), false);
 }
 
+
 //=======================================================================
 //function : StructuralDump
 //purpose  : Structural (data exchange) style of output.
@@ -737,7 +2468,7 @@ void GEOMImpl_IMeasureOperations::StructuralDump (const BRepCheck_Analyzer& theA
   }
   count = NbProblems->Value((Standard_Integer)BRepCheck_SubshapeNotInShape);
   if (count > 0) {
-    theDump += "  Subshape not in Shape .................... ";
+    theDump += "  Sub-shape not in Shape .................... ";
     theDump += TCollection_AsciiString(count) + "\n";
   }
   count = NbProblems->Value((Standard_Integer)BRepCheck_BadOrientation);
@@ -747,7 +2478,7 @@ void GEOMImpl_IMeasureOperations::StructuralDump (const BRepCheck_Analyzer& theA
   }
   count = NbProblems->Value((Standard_Integer)BRepCheck_BadOrientationOfSubshape);
   if (count > 0) {
-    theDump += "  Bad Orientation of Subshape .............. ";
+    theDump += "  Bad Orientation of Sub-shape .............. ";
     theDump += TCollection_AsciiString(count) + "\n";
   }
   count = NbProblems->Value((Standard_Integer)BRepCheck_CheckFail);
@@ -809,6 +2540,7 @@ void GEOMImpl_IMeasureOperations::StructuralDump (const BRepCheck_Analyzer& theA
   }
 }
 
+
 //=======================================================================
 //function : GetProblemShapes
 // purpose : for StructuralDump
@@ -892,14 +2624,14 @@ void GEOMImpl_IMeasureOperations::GetProblemSub (const BRepCheck_Analyzer&
 
     const Handle(BRepCheck_Result)& res = theAna.Result(sub);
     for (res->InitContextIterator();
-        res->MoreShapeInContext();
-        res->NextShapeInContext()) {
+         res->MoreShapeInContext();
+         res->NextShapeInContext()) {
       if (res->ContextualShape().IsSame(theShape) && !Contains(theMap(sub), theShape)) {
-       theMap(sub).Append(theShape);
-       itl.Initialize(res->StatusOnShape());
+        theMap(sub).Append(theShape);
+        itl.Initialize(res->StatusOnShape());
 
-       if (itl.Value() != BRepCheck_NoError) {
-         Standard_Integer ii = 0;
+        if (itl.Value() != BRepCheck_NoError) {
+          Standard_Integer ii = 0;
 
           for (ii = 1; ii <= sl->Length(); ii++)
             if (sl->Value(ii).IsSame(sub)) break;
@@ -918,8 +2650,8 @@ void GEOMImpl_IMeasureOperations::GetProblemSub (const BRepCheck_Analyzer&
             NbProblems->SetValue((Standard_Integer)stat,
                                  NbProblems->Value((Standard_Integer)stat) + 1);
           }
-       }
-       break;
+        }
+        break;
       }
     }
   }