Salome HOME
#18319 [CEA 18318] Display of a field with negative value
[modules/geom.git] / src / GEOM_I / GEOM_IMeasureOperations_i.cc
index 9035dc9cad3c0784f7d34fb36caec76cab6fe8b5..cc32f3410eaca1b3d35d33709c1839a17135007d 100644 (file)
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  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
 #include "GEOM_Engine.hxx"
 #include "GEOM_Object.hxx"
 
+/**
+ * This function converts shape errors from theErrorsFrom to theErrorsTo.
+ * Note that theErrorsTo is not cleared at first.
+ *
+ * \param theErrorsFrom errors to be converted.
+ * \param theErrorsTo result errors.
+ */
+static void ConvertShapeError
+    (const GEOM::GEOM_IMeasureOperations::ShapeErrors         &theErrorsFrom,
+           std::list<GEOMImpl_IMeasureOperations::ShapeError> &theErrorsTo)
+{
+  int aNbErr = theErrorsFrom.length();
+  int i = 0;
+
+  for (; i < aNbErr; i++) {
+    const GEOM::GEOM_IMeasureOperations::ShapeError anErr = theErrorsFrom[i];
+    const GEOM::GEOM_IMeasureOperations::ShapeErrorType aType = anErr.error;
+    const GEOM::ListOfLong anIncrims = anErr.incriminated;
+    GEOMImpl_IMeasureOperations::ShapeError anErrStruct;
+
+    switch (aType) {
+    case GEOM::GEOM_IMeasureOperations::InvalidPointOnCurve:
+      anErrStruct.error = BRepCheck_InvalidPointOnCurve;
+      break;
+    case GEOM::GEOM_IMeasureOperations::InvalidPointOnCurveOnSurface:
+      anErrStruct.error = BRepCheck_InvalidPointOnCurveOnSurface;
+      break;
+    case GEOM::GEOM_IMeasureOperations::InvalidPointOnSurface:
+      anErrStruct.error = BRepCheck_InvalidPointOnSurface;
+      break;
+    case GEOM::GEOM_IMeasureOperations::No3DCurve:
+      anErrStruct.error = BRepCheck_No3DCurve;
+      break;
+    case GEOM::GEOM_IMeasureOperations::Multiple3DCurve:
+      anErrStruct.error = BRepCheck_Multiple3DCurve;
+      break;
+    case GEOM::GEOM_IMeasureOperations::Invalid3DCurve:
+      anErrStruct.error = BRepCheck_Invalid3DCurve;
+      break;
+    case GEOM::GEOM_IMeasureOperations::NoCurveOnSurface:
+      anErrStruct.error = BRepCheck_NoCurveOnSurface;
+      break;
+    case GEOM::GEOM_IMeasureOperations::InvalidCurveOnSurface:
+      anErrStruct.error = BRepCheck_InvalidCurveOnSurface;
+      break;
+    case GEOM::GEOM_IMeasureOperations::InvalidCurveOnClosedSurface:
+      anErrStruct.error = BRepCheck_InvalidCurveOnClosedSurface;
+      break;
+    case GEOM::GEOM_IMeasureOperations::InvalidSameRangeFlag:
+      anErrStruct.error = BRepCheck_InvalidSameRangeFlag;
+      break;
+    case GEOM::GEOM_IMeasureOperations::InvalidSameParameterFlag:
+      anErrStruct.error = BRepCheck_InvalidSameParameterFlag;
+      break;
+    case GEOM::GEOM_IMeasureOperations::InvalidDegeneratedFlag:
+      anErrStruct.error = BRepCheck_InvalidDegeneratedFlag;
+      break;
+    case GEOM::GEOM_IMeasureOperations::FreeEdge:
+      anErrStruct.error = BRepCheck_FreeEdge;
+      break;
+    case GEOM::GEOM_IMeasureOperations::InvalidMultiConnexity:
+      anErrStruct.error = BRepCheck_InvalidMultiConnexity;
+      break;
+    case GEOM::GEOM_IMeasureOperations::InvalidRange:
+      anErrStruct.error = BRepCheck_InvalidRange;
+      break;
+    case GEOM::GEOM_IMeasureOperations::EmptyWire:
+      anErrStruct.error = BRepCheck_EmptyWire;
+      break;
+    case GEOM::GEOM_IMeasureOperations::RedundantEdge:
+      anErrStruct.error = BRepCheck_RedundantEdge;
+      break;
+    case GEOM::GEOM_IMeasureOperations::SelfIntersectingWire:
+      anErrStruct.error = BRepCheck_SelfIntersectingWire;
+      break;
+    case GEOM::GEOM_IMeasureOperations::NoSurface:
+      anErrStruct.error = BRepCheck_NoSurface;
+      break;
+    case GEOM::GEOM_IMeasureOperations::InvalidWire:
+      anErrStruct.error = BRepCheck_InvalidWire;
+      break;
+    case GEOM::GEOM_IMeasureOperations::RedundantWire:
+      anErrStruct.error = BRepCheck_RedundantWire;
+      break;
+    case GEOM::GEOM_IMeasureOperations::IntersectingWires:
+      anErrStruct.error = BRepCheck_IntersectingWires;
+      break;
+    case GEOM::GEOM_IMeasureOperations::InvalidImbricationOfWires:
+      anErrStruct.error = BRepCheck_InvalidImbricationOfWires;
+      break;
+    case GEOM::GEOM_IMeasureOperations::EmptyShell:
+      anErrStruct.error = BRepCheck_EmptyShell;
+      break;
+    case GEOM::GEOM_IMeasureOperations::RedundantFace:
+      anErrStruct.error = BRepCheck_RedundantFace;
+      break;
+    case GEOM::GEOM_IMeasureOperations::UnorientableShape:
+      anErrStruct.error = BRepCheck_UnorientableShape;
+      break;
+    case GEOM::GEOM_IMeasureOperations::NotClosed:
+      anErrStruct.error = BRepCheck_NotClosed;
+      break;
+    case GEOM::GEOM_IMeasureOperations::NotConnected:
+      anErrStruct.error = BRepCheck_NotConnected;
+      break;
+    case GEOM::GEOM_IMeasureOperations::SubshapeNotInShape:
+      anErrStruct.error = BRepCheck_SubshapeNotInShape;
+      break;
+    case GEOM::GEOM_IMeasureOperations::BadOrientation:
+      anErrStruct.error = BRepCheck_BadOrientation;
+      break;
+    case GEOM::GEOM_IMeasureOperations::BadOrientationOfSubshape:
+      anErrStruct.error = BRepCheck_BadOrientationOfSubshape;
+      break;
+    case GEOM::GEOM_IMeasureOperations::InvalidToleranceValue:
+      anErrStruct.error = BRepCheck_InvalidToleranceValue;
+      break;
+    case GEOM::GEOM_IMeasureOperations::CheckFail:
+      anErrStruct.error = BRepCheck_CheckFail;
+      break;
+    default:
+      break;
+    }
+
+    int ii = 0;
+    int aLen = anIncrims.length();
+
+    for (; ii < aLen; ii++) {
+      anErrStruct.incriminated.push_back(anIncrims[ii]);
+    }
+
+    theErrorsTo.push_back(anErrStruct);
+  }
+}
+
+/**
+ * This function converts shape errors from theErrorsFrom to theErrorsTo.
+ * Note that theErrorsTo is not cleared at first.
+ *
+ * \param theErrorsFrom errors to be converted.
+ * \param theErrorsTo result errors.
+ */
+static void ConvertShapeError
+    (const std::list<GEOMImpl_IMeasureOperations::ShapeError> &theErrorsFrom,
+           GEOM::GEOM_IMeasureOperations::ShapeErrors_out     &theErrorsTo)
+{
+  const int aNbErr = theErrorsFrom.size();
+  GEOM::GEOM_IMeasureOperations::ShapeErrors_var anErrArray =
+    new GEOM::GEOM_IMeasureOperations::ShapeErrors;
+
+  anErrArray->length(aNbErr);
+
+  // fill the local CORBA array with values from lists
+  std::list<GEOMImpl_IMeasureOperations::ShapeError>::const_iterator
+    anIt = theErrorsFrom.begin();
+  int i = 0;
+
+  for (; anIt != theErrorsFrom.end(); i++, anIt++) {
+    GEOM::GEOM_IMeasureOperations::ShapeError_var anErrStruct =
+      new GEOM::GEOM_IMeasureOperations::ShapeError;
+
+    switch (anIt->error) {
+    case BRepCheck_InvalidPointOnCurve:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::InvalidPointOnCurve;
+      break;
+    case BRepCheck_InvalidPointOnCurveOnSurface:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::InvalidPointOnCurveOnSurface;
+      break;
+    case BRepCheck_InvalidPointOnSurface:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::InvalidPointOnSurface;
+      break;
+    case BRepCheck_No3DCurve:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::No3DCurve;
+      break;
+    case BRepCheck_Multiple3DCurve:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::Multiple3DCurve;
+      break;
+    case BRepCheck_Invalid3DCurve:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::Invalid3DCurve;
+      break;
+    case BRepCheck_NoCurveOnSurface:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::NoCurveOnSurface;
+      break;
+    case BRepCheck_InvalidCurveOnSurface:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::InvalidCurveOnSurface;
+      break;
+    case BRepCheck_InvalidCurveOnClosedSurface:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::InvalidCurveOnClosedSurface;
+      break;
+    case BRepCheck_InvalidSameRangeFlag:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::InvalidSameRangeFlag;
+      break;
+    case BRepCheck_InvalidSameParameterFlag:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::InvalidSameParameterFlag;
+      break;
+    case BRepCheck_InvalidDegeneratedFlag:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::InvalidDegeneratedFlag;
+      break;
+    case BRepCheck_FreeEdge:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::FreeEdge;
+      break;
+    case BRepCheck_InvalidMultiConnexity:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::InvalidMultiConnexity;
+      break;
+    case BRepCheck_InvalidRange:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::InvalidRange;
+      break;
+    case BRepCheck_EmptyWire:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::EmptyWire;
+      break;
+    case BRepCheck_RedundantEdge:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::RedundantEdge;
+      break;
+    case BRepCheck_SelfIntersectingWire:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::SelfIntersectingWire;
+      break;
+    case BRepCheck_NoSurface:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::NoSurface;
+      break;
+    case BRepCheck_InvalidWire:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::InvalidWire;
+      break;
+    case BRepCheck_RedundantWire:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::RedundantWire;
+      break;
+    case BRepCheck_IntersectingWires:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::IntersectingWires;
+      break;
+    case BRepCheck_InvalidImbricationOfWires:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::InvalidImbricationOfWires;
+      break;
+    case BRepCheck_EmptyShell:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::EmptyShell;
+      break;
+    case BRepCheck_RedundantFace:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::RedundantFace;
+      break;
+    case BRepCheck_UnorientableShape:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::UnorientableShape;
+      break;
+    case BRepCheck_NotClosed:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::NotClosed;
+      break;
+    case BRepCheck_NotConnected:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::NotConnected;
+      break;
+    case BRepCheck_SubshapeNotInShape:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::SubshapeNotInShape;
+      break;
+    case BRepCheck_BadOrientation:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::BadOrientation;
+      break;
+    case BRepCheck_BadOrientationOfSubshape:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::BadOrientationOfSubshape;
+      break;
+    case BRepCheck_InvalidToleranceValue:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::InvalidToleranceValue;
+      break;
+    case BRepCheck_CheckFail:
+      anErrStruct->error = GEOM::GEOM_IMeasureOperations::CheckFail;
+      break;
+    default:
+      break;
+    }
+
+    std::list<int> aIndList = anIt->incriminated;
+    GEOM::ListOfLong_var anIncrims = new GEOM::ListOfLong();
+    anIncrims->length(aIndList.size());
+
+    std::list<int>::iterator anIndIt = aIndList.begin();
+    int jj = 0;
+
+    for (; anIndIt != aIndList.end(); jj++, anIndIt++) {
+      anIncrims[jj] = *anIndIt;
+    }
+
+    anErrStruct->incriminated = anIncrims;
+
+    anErrArray[i] = anErrStruct;
+  }
+
+  // initialize out-parameter with local array
+  theErrorsTo = anErrArray._retn();
+}
+
 //=============================================================================
 /*!
  *   constructor:
@@ -70,7 +355,7 @@ GEOM::GEOM_IKindOfShape::shape_kind GEOM_IMeasureOperations_i::KindOfShape
   GEOM::ListOfDouble_var aDoublesArray = new GEOM::ListOfDouble();
 
   //Get the reference shape
-  Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+  Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
 
   if (!aShape.IsNull()) {
     Handle(TColStd_HSequenceOfInteger) anIntegers = new TColStd_HSequenceOfInteger;
@@ -118,7 +403,7 @@ void GEOM_IMeasureOperations_i::GetPosition
   Zz = Xx = 1.;
 
   //Get the reference shape
-  Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+  Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
   if (aShape.IsNull()) return;
 
   // Get shape parameters
@@ -139,11 +424,11 @@ GEOM::GEOM_Object_ptr GEOM_IMeasureOperations_i::GetCentreOfMass
   GetOperations()->SetNotDone();
 
   //Get the reference shape
-  Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+  Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
   if (aShape.IsNull()) return aGEOMObject._retn();
 
   // Make Point - centre of mass of theShape
-  Handle(GEOM_Object) anObject = GetOperations()->GetCentreOfMass(aShape);
+  Handle(::GEOM_Object) anObject = GetOperations()->GetCentreOfMass(aShape);
   if (!GetOperations()->IsDone() || anObject.IsNull())
     return aGEOMObject._retn();
 
@@ -164,11 +449,11 @@ GEOM::GEOM_Object_ptr GEOM_IMeasureOperations_i::GetVertexByIndex
   GetOperations()->SetNotDone();
 
   //Get the reference shape
-  Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+  Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
   if ( aShape.IsNull() ) return aGEOMObject._retn();
 
   // Get vertex by index
-  Handle(GEOM_Object) anObject = GetOperations()->GetVertexByIndex(aShape, theIndex);
+  Handle(::GEOM_Object) anObject = GetOperations()->GetVertexByIndex(aShape, theIndex);
   if (!GetOperations()->IsDone() || anObject.IsNull())
     return aGEOMObject._retn();
 
@@ -190,14 +475,14 @@ GEOM::GEOM_Object_ptr GEOM_IMeasureOperations_i::GetNormal
   GetOperations()->SetNotDone();
 
   //Get the reference shape
-  Handle(GEOM_Object) aFace = GetObjectImpl(theFace);
+  Handle(::GEOM_Object) aFace = GetObjectImpl(theFace);
   if (aFace.IsNull()) return aGEOMObject._retn();
 
   // Get the OptionalPoint (can be not defined)
-  Handle(GEOM_Object) anOptionalPoint = GetObjectImpl(theOptionalPoint);
+  Handle(::GEOM_Object) anOptionalPoint = GetObjectImpl(theOptionalPoint);
 
   // Make Vector - normal to theFace (in point theOptionalPoint if the face is not planar)
-  Handle(GEOM_Object) anObject = GetOperations()->GetNormal(aFace, anOptionalPoint);
+  Handle(::GEOM_Object) anObject = GetOperations()->GetNormal(aFace, anOptionalPoint);
   if (!GetOperations()->IsDone() || anObject.IsNull())
     return aGEOMObject._retn();
 
@@ -210,6 +495,7 @@ GEOM::GEOM_Object_ptr GEOM_IMeasureOperations_i::GetNormal
  */
 //=============================================================================
 void GEOM_IMeasureOperations_i::GetBasicProperties (GEOM::GEOM_Object_ptr theShape,
+                                                    CORBA::Double  theTolerance,
                                                     CORBA::Double& theLength,
                                                     CORBA::Double& theSurfArea,
                                                     CORBA::Double& theVolume)
@@ -218,11 +504,12 @@ void GEOM_IMeasureOperations_i::GetBasicProperties (GEOM::GEOM_Object_ptr theSha
   GetOperations()->SetNotDone();
 
   //Get the reference shape
-  Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+  Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
   if (aShape.IsNull()) return;
 
   // Get shape parameters
-  GetOperations()->GetBasicProperties(aShape, theLength, theSurfArea, theVolume);
+  GetOperations()->GetBasicProperties(aShape, theTolerance, theLength,
+                                      theSurfArea, theVolume);
 }
 
 //=============================================================================
@@ -241,7 +528,7 @@ void GEOM_IMeasureOperations_i::GetInertia
   GetOperations()->SetNotDone();
 
   //Get the reference shape
-  Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+  Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
   if (aShape.IsNull()) return;
 
   // Get shape parameters
@@ -258,6 +545,7 @@ void GEOM_IMeasureOperations_i::GetInertia
  */
 //=============================================================================
 void GEOM_IMeasureOperations_i::GetBoundingBox (GEOM::GEOM_Object_ptr theShape,
+                                                CORBA::Boolean precise,
                                                 CORBA::Double& Xmin, CORBA::Double& Xmax,
                                                 CORBA::Double& Ymin, CORBA::Double& Ymax,
                                                 CORBA::Double& Zmin, CORBA::Double& Zmax)
@@ -266,11 +554,12 @@ void GEOM_IMeasureOperations_i::GetBoundingBox (GEOM::GEOM_Object_ptr theShape,
   GetOperations()->SetNotDone();
 
   //Get the reference shape
-  Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+  Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
   if (aShape.IsNull()) return;
 
   // Get shape parameters
-  GetOperations()->GetBoundingBox(aShape, Xmin, Xmax, Ymin, Ymax, Zmin, Zmax);
+  GetOperations()->GetBoundingBox
+    (aShape, precise, Xmin, Xmax, Ymin, Ymax, Zmin, Zmax);
 }
 
 //=============================================================================
@@ -279,7 +568,8 @@ void GEOM_IMeasureOperations_i::GetBoundingBox (GEOM::GEOM_Object_ptr theShape,
  */
 //=============================================================================
 GEOM::GEOM_Object_ptr GEOM_IMeasureOperations_i::MakeBoundingBox
-                                              (GEOM::GEOM_Object_ptr theShape)
+                                              (GEOM::GEOM_Object_ptr theShape,
+                                               CORBA::Boolean precise)
 {
   GEOM::GEOM_Object_var aGEOMObject;
 
@@ -287,11 +577,12 @@ GEOM::GEOM_Object_ptr GEOM_IMeasureOperations_i::MakeBoundingBox
   GetOperations()->SetNotDone();
 
   //Get the reference shape
-  Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+  Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
   if (aShape.IsNull()) return aGEOMObject._retn();
 
   // Make Box - bounding box of theShape
-  Handle(GEOM_Object) anObject = GetOperations()->GetBoundingBox(aShape);
+  Handle(::GEOM_Object) anObject =
+    GetOperations()->GetBoundingBox(aShape, precise);
   if (!GetOperations()->IsDone() || anObject.IsNull())
     return aGEOMObject._retn();
 
@@ -313,7 +604,7 @@ void GEOM_IMeasureOperations_i::GetTolerance
   GetOperations()->SetNotDone();
 
   //Get the reference shape
-  Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+  Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
   if (aShape.IsNull()) return;
 
   // Get shape parameters
@@ -328,68 +619,87 @@ void GEOM_IMeasureOperations_i::GetTolerance
  *  CheckShape
  */
 //=============================================================================
-CORBA::Boolean GEOM_IMeasureOperations_i::CheckShape (GEOM::GEOM_Object_ptr theShape,
-                                                      CORBA::String_out     theDescription)
+CORBA::Boolean GEOM_IMeasureOperations_i::CheckShape
+             (GEOM::GEOM_Object_ptr                          theShape,
+              GEOM::GEOM_IMeasureOperations::ShapeErrors_out theErrors)
 {
   //Set a not done flag
   GetOperations()->SetNotDone();
 
   if (CORBA::is_nil(theShape))
   {
-    theDescription = CORBA::string_dup("null");
     return 0;
   }
 
   //Get the reference shape
-  Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+  Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
 
   if (aShape.IsNull())
   {
-    theDescription = CORBA::string_dup("null2");
     return 0;
   }
 
-  // Get shape parameters
-  TCollection_AsciiString aDump;
-  if (GetOperations()->CheckShape(aShape, /*check_geom = */false, aDump))
-  {
-    theDescription = CORBA::string_dup("OK");
-    return 1;
-  }
-  theDescription = CORBA::string_dup(aDump.ToCString());
-  return 0;
+  std::list<GEOMImpl_IMeasureOperations::ShapeError> anErrList;
+  bool isOk = GetOperations()->CheckShape(aShape, false, anErrList);
+
+  ConvertShapeError(anErrList, theErrors);
+
+  return isOk;
 }
 
-CORBA::Boolean GEOM_IMeasureOperations_i::CheckShapeWithGeometry (GEOM::GEOM_Object_ptr theShape,
-                                                                  CORBA::String_out     theDescription)
+CORBA::Boolean GEOM_IMeasureOperations_i::CheckShapeWithGeometry
+             (GEOM::GEOM_Object_ptr                          theShape,
+              GEOM::GEOM_IMeasureOperations::ShapeErrors_out theErrors)
 {
   //Set a not done flag
   GetOperations()->SetNotDone();
 
   if (CORBA::is_nil(theShape))
   {
-    theDescription = CORBA::string_dup("null");
     return 0;
   }
 
   //Get the reference shape
-  Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+  Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
 
   if (aShape.IsNull())
   {
-    theDescription = CORBA::string_dup("null2");
     return 0;
   }
 
-  // Get shape parameters
-  TCollection_AsciiString aDump;
-  if (GetOperations()->CheckShape(aShape, /*check_geom = */true, aDump))
-  {
-    theDescription = CORBA::string_dup("OK");
-    return 1;
+  std::list<GEOMImpl_IMeasureOperations::ShapeError> anErrList;
+  bool isOk = GetOperations()->CheckShape(aShape, true, anErrList);
+
+  ConvertShapeError(anErrList, theErrors);
+
+  return isOk;
+}
+
+//=============================================================================
+/*!
+ *  PrintShapeErrors
+ */
+//=============================================================================
+char* GEOM_IMeasureOperations_i::PrintShapeErrors
+             (      GEOM::GEOM_Object_ptr                       theShape,
+              const GEOM::GEOM_IMeasureOperations::ShapeErrors &theErrors)
+{
+  //Get the reference shape
+  Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
+
+  if (aShape.IsNull()) {
+    return NULL;
   }
-  theDescription = CORBA::string_dup(aDump.ToCString());
-  return 0;
+
+  // Convert the errors sequence
+  std::list<GEOMImpl_IMeasureOperations::ShapeError> anErrList;
+
+  ConvertShapeError(theErrors, anErrList);
+
+  TCollection_AsciiString aDescr =
+    GetOperations()->PrintShapeErrors(aShape, anErrList);
+
+  return CORBA::string_dup(aDescr.ToCString());
 }
 
 //=============================================================================
@@ -398,6 +708,7 @@ CORBA::Boolean GEOM_IMeasureOperations_i::CheckShapeWithGeometry (GEOM::GEOM_Obj
  */
 //=============================================================================
 CORBA::Boolean GEOM_IMeasureOperations_i::CheckSelfIntersections (GEOM::GEOM_Object_ptr theShape,
+                                                                  CORBA::Long           theCheckLevel,
                                                                   GEOM::ListOfLong_out  theIntersections)
 {
   // Set a not done flag
@@ -409,13 +720,38 @@ CORBA::Boolean GEOM_IMeasureOperations_i::CheckSelfIntersections (GEOM::GEOM_Obj
   GEOM::ListOfLong_var anIntegersArray = new GEOM::ListOfLong();
 
   // Get the reference shape
-  Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+  Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
 
   if (!aShape.IsNull()) {
+    GEOMImpl_IMeasureOperations::SICheckLevel aCheckLevel;
+
+    switch(theCheckLevel) {
+    case GEOM::SI_V_V:
+      aCheckLevel = GEOMImpl_IMeasureOperations::SI_V_V;
+      break;
+    case GEOM::SI_V_E:
+      aCheckLevel = GEOMImpl_IMeasureOperations::SI_V_E;
+      break;
+    case GEOM::SI_E_E:
+      aCheckLevel = GEOMImpl_IMeasureOperations::SI_E_E;
+      break;
+    case GEOM::SI_V_F:
+      aCheckLevel = GEOMImpl_IMeasureOperations::SI_V_F;
+      break;
+    case GEOM::SI_E_F:
+      aCheckLevel = GEOMImpl_IMeasureOperations::SI_E_F;
+      break;
+    case GEOM::SI_ALL:
+    default:
+      aCheckLevel = GEOMImpl_IMeasureOperations::SI_ALL;
+      break;
+    }
+
     Handle(TColStd_HSequenceOfInteger) anIntegers = new TColStd_HSequenceOfInteger;
 
     // Detect self-intersections
-    isGood = GetOperations()->CheckSelfIntersections(aShape, anIntegers);
+    isGood = GetOperations()->CheckSelfIntersections
+      (aShape, aCheckLevel, anIntegers);
 
     int nbInts = anIntegers->Length();
 
@@ -431,6 +767,125 @@ CORBA::Boolean GEOM_IMeasureOperations_i::CheckSelfIntersections (GEOM::GEOM_Obj
   return isGood;
 }
 
+//=============================================================================
+/*!
+ *  CheckSelfIntersectionsFast
+ */
+//=============================================================================
+CORBA::Boolean GEOM_IMeasureOperations_i::CheckSelfIntersectionsFast 
+  (GEOM::GEOM_Object_ptr theShape,
+   CORBA::Float          theDeflection,
+   CORBA::Double         theTolerance,
+   GEOM::ListOfLong_out  theIntersections)
+{
+  // Set a not done flag
+  GetOperations()->SetNotDone();
+
+  bool isGood = false;
+
+  // Allocate the CORBA arrays
+  GEOM::ListOfLong_var anIntegersArray = new GEOM::ListOfLong();
+
+  // Get the reference shape
+  Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
+
+  if (!aShape.IsNull()) {
+    Handle(TColStd_HSequenceOfInteger) anIntegers = new TColStd_HSequenceOfInteger;
+
+    // Detect self-intersections
+    isGood = GetOperations()->CheckSelfIntersectionsFast
+      (aShape, theDeflection, theTolerance, anIntegers);
+
+    int nbInts = anIntegers->Length();
+
+    anIntegersArray->length(nbInts);
+
+    for (int ii = 0; ii < nbInts; ii++) {
+      anIntegersArray[ii] = anIntegers->Value(ii + 1);
+    }
+  }
+
+  // Initialize out-parameters with local arrays
+  theIntersections = anIntegersArray._retn();
+  return isGood;
+}
+
+//=============================================================================
+/*!
+ *  CheckBOPArguments
+ */
+//=============================================================================
+CORBA::Boolean GEOM_IMeasureOperations_i::CheckBOPArguments
+                                      (GEOM::GEOM_Object_ptr theShape)
+{
+  // Set a not done flag
+  GetOperations()->SetNotDone();
+
+  // Get the reference shape
+  Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
+  bool isGood = false;
+
+  if (!aShape.IsNull()) {
+    // Check BOP arguments
+    isGood = GetOperations()->CheckBOPArguments(aShape);
+  }
+
+  return isGood;
+}
+
+//=============================================================================
+/*!
+ *  FastIntersect
+ */
+//=============================================================================
+CORBA::Boolean GEOM_IMeasureOperations_i::FastIntersect (GEOM::GEOM_Object_ptr theShape1,
+                                                         GEOM::GEOM_Object_ptr theShape2,
+                                                         CORBA::Double         theTolerance,
+                                                         CORBA::Float          theDeflection,
+                                                         GEOM::ListOfLong_out  theIntersections1,
+                                                         GEOM::ListOfLong_out  theIntersections2)
+{
+  // Set a not done flag
+  GetOperations()->SetNotDone();
+
+  bool isGood = false;
+
+  // Allocate the CORBA arrays
+  GEOM::ListOfLong_var anIntegersArray1 = new GEOM::ListOfLong();
+  GEOM::ListOfLong_var anIntegersArray2 = new GEOM::ListOfLong();
+
+  // Get the reference shape
+  Handle(::GEOM_Object) aShape1 = GetObjectImpl(theShape1);
+  Handle(::GEOM_Object) aShape2 = GetObjectImpl(theShape2);
+  
+  if (!aShape1.IsNull() && !aShape2.IsNull()) {
+    Handle(TColStd_HSequenceOfInteger) anIntegers1 = new TColStd_HSequenceOfInteger;
+    Handle(TColStd_HSequenceOfInteger) anIntegers2 = new TColStd_HSequenceOfInteger;
+
+    // Detect intersections
+    isGood = GetOperations()->FastIntersect
+      (aShape1, aShape2, theTolerance, theDeflection, anIntegers1, anIntegers2);
+
+    int nbInts1 = anIntegers1->Length();
+    int nbInts2 = anIntegers2->Length();
+
+    anIntegersArray1->length(nbInts1);
+    anIntegersArray2->length(nbInts2);
+
+    for (int ii = 0; ii < nbInts1; ii++) {
+      anIntegersArray1[ii] = anIntegers1->Value(ii + 1);
+    }
+    for (int ii = 0; ii < nbInts2; ii++) {
+      anIntegersArray2[ii] = anIntegers2->Value(ii + 1);
+    }
+  }
+
+  // Initialize out-parameters with local arrays
+  theIntersections1 = anIntegersArray1._retn();
+  theIntersections2 = anIntegersArray2._retn();
+  return isGood;
+}
+
 //=============================================================================
 /*!
  *  IsGoodForSolid
@@ -442,7 +897,7 @@ char* GEOM_IMeasureOperations_i::IsGoodForSolid (GEOM::GEOM_Object_ptr theShape)
   GetOperations()->SetNotDone();
 
   //Get the reference shape
-  Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+  Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
   if (aShape.IsNull()) return CORBA::string_dup("WRN_NULL_OBJECT_OR_SHAPE");
 
   // Get shape parameters
@@ -461,7 +916,7 @@ char* GEOM_IMeasureOperations_i::WhatIs (GEOM::GEOM_Object_ptr theShape)
   GetOperations()->SetNotDone();
 
   //Get the reference shape
-  Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+  Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
   if (aShape.IsNull()) return NULL;
 
   // Get shape parameters
@@ -481,19 +936,19 @@ GEOM::ListOfBool* GEOM_IMeasureOperations_i::AreCoordsInside (GEOM::GEOM_Object_
   //Set a not done flag
   GetOperations()->SetNotDone();
   
-  unsigned int nb_points = theCoords.length()/3;
+  int nb_points = theCoords.length()/3;
 
   GEOM::ListOfBool_var aResults = new GEOM::ListOfBool;
   aResults->length(nb_points);
   
-  Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+  Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
   
   std::vector<double> tmp(3*nb_points);
   for (int i = 0; i < 3*nb_points; i++)
     tmp[i] = theCoords[i];
   std::vector<bool> res = GetOperations()->AreCoordsInside(aShape, tmp, tolerance);
-  for (int i = 0; i < nb_points; i++)
-    aResults[i] = i < res.size() ? res[i] : false;
+  for (int i = 0, resSize = res.size();  i < nb_points; i++)
+    aResults[i] = i < resSize ? res[i] : false;
   return aResults._retn();
 }
 
@@ -511,8 +966,8 @@ CORBA::Double GEOM_IMeasureOperations_i::GetMinDistance
   GetOperations()->SetNotDone();
 
   //Get the reference shape
-  Handle(GEOM_Object) aShape1 = GetObjectImpl(theShape1);
-  Handle(GEOM_Object) aShape2 = GetObjectImpl(theShape2);
+  Handle(::GEOM_Object) aShape1 = GetObjectImpl(theShape1);
+  Handle(::GEOM_Object) aShape2 = GetObjectImpl(theShape2);
   if (aShape1.IsNull() || aShape2.IsNull()) return -1.0;
 
   // Get shape parameters
@@ -536,8 +991,8 @@ CORBA::Long GEOM_IMeasureOperations_i::ClosestPoints
   GEOM::ListOfDouble_var aDoublesArray = new GEOM::ListOfDouble();
 
   //Get the reference shape
-  Handle(GEOM_Object) aShape1 = GetObjectImpl(theShape1);
-  Handle(GEOM_Object) aShape2 = GetObjectImpl(theShape2);
+  Handle(::GEOM_Object) aShape1 = GetObjectImpl(theShape1);
+  Handle(::GEOM_Object) aShape2 = GetObjectImpl(theShape2);
 
   if (!aShape1.IsNull() && !aShape2.IsNull()) {
     Handle(TColStd_HSequenceOfReal) aDoubles = new TColStd_HSequenceOfReal;
@@ -567,7 +1022,7 @@ void GEOM_IMeasureOperations_i::PointCoordinates (GEOM::GEOM_Object_ptr theShape
   GetOperations()->SetNotDone();
 
   //Get the reference shape
-  Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+  Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
   if (aShape.IsNull())
     return;
 
@@ -587,8 +1042,8 @@ CORBA::Double GEOM_IMeasureOperations_i::GetAngle (GEOM::GEOM_Object_ptr theShap
   GetOperations()->SetNotDone();
 
   //Get the reference shapes
-  Handle(GEOM_Object) aShape1 = GetObjectImpl(theShape1);
-  Handle(GEOM_Object) aShape2 = GetObjectImpl(theShape2);
+  Handle(::GEOM_Object) aShape1 = GetObjectImpl(theShape1);
+  Handle(::GEOM_Object) aShape2 = GetObjectImpl(theShape2);
   if (aShape1.IsNull() || aShape2.IsNull()) return -1.0;
 
   // Get the angle
@@ -607,8 +1062,8 @@ CORBA::Double GEOM_IMeasureOperations_i::GetAngleBtwVectors (GEOM::GEOM_Object_p
   GetOperations()->SetNotDone();
 
   //Get the reference shapes
-  Handle(GEOM_Object) aShape1 = GetObjectImpl(theShape1);
-  Handle(GEOM_Object) aShape2 = GetObjectImpl(theShape2);
+  Handle(::GEOM_Object) aShape1 = GetObjectImpl(theShape1);
+  Handle(::GEOM_Object) aShape2 = GetObjectImpl(theShape2);
   if (aShape1.IsNull() || aShape2.IsNull()) return -1.0;
 
   // Get the angle
@@ -628,7 +1083,7 @@ CORBA::Double GEOM_IMeasureOperations_i::CurveCurvatureByParam
   GetOperations()->SetNotDone();
 
   //Get the reference shape
-  Handle(GEOM_Object) aShape = GetObjectImpl(theCurve);
+  Handle(::GEOM_Object) aShape = GetObjectImpl(theCurve);
   if(aShape.IsNull()) return -1.0;
 
   return GetOperations()->CurveCurvatureByParam(aShape,theParam);
@@ -646,8 +1101,8 @@ CORBA::Double GEOM_IMeasureOperations_i::CurveCurvatureByPoint
   GetOperations()->SetNotDone();
 
   //Get the reference shape
-  Handle(GEOM_Object) aShape = GetObjectImpl(theCurve);
-  Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint);
+  Handle(::GEOM_Object) aShape = GetObjectImpl(theCurve);
+  Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint);
   if( aShape.IsNull() || aPoint.IsNull() ) return -1.0;
 
   return GetOperations()->CurveCurvatureByPoint(aShape,aPoint);
@@ -668,7 +1123,7 @@ CORBA::Double GEOM_IMeasureOperations_i::MaxSurfaceCurvatureByParam
   GetOperations()->SetNotDone();
 
   //Get the reference shape
-  Handle(GEOM_Object) aShape = GetObjectImpl(theSurf);
+  Handle(::GEOM_Object) aShape = GetObjectImpl(theSurf);
   if(aShape.IsNull()) return -1.0;
 
   return GetOperations()->MaxSurfaceCurvatureByParam(aShape,theUParam,theVParam);
@@ -686,8 +1141,8 @@ CORBA::Double GEOM_IMeasureOperations_i::MaxSurfaceCurvatureByPoint
   GetOperations()->SetNotDone();
 
   //Get the reference shape
-  Handle(GEOM_Object) aShape = GetObjectImpl(theSurf);
-  Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint);
+  Handle(::GEOM_Object) aShape = GetObjectImpl(theSurf);
+  Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint);
   if( aShape.IsNull() || aPoint.IsNull() ) return -1.0;
 
   return GetOperations()->MaxSurfaceCurvatureByPoint(aShape,aPoint);
@@ -707,7 +1162,7 @@ CORBA::Double GEOM_IMeasureOperations_i::MinSurfaceCurvatureByParam
   GetOperations()->SetNotDone();
 
   //Get the reference shape
-  Handle(GEOM_Object) aShape = GetObjectImpl(theSurf);
+  Handle(::GEOM_Object) aShape = GetObjectImpl(theSurf);
   if (aShape.IsNull()) return -1.0;
 
   return GetOperations()->MinSurfaceCurvatureByParam(aShape,theUParam,theVParam);
@@ -725,8 +1180,8 @@ CORBA::Double GEOM_IMeasureOperations_i::MinSurfaceCurvatureByPoint
   GetOperations()->SetNotDone();
 
   //Get the reference shape
-  Handle(GEOM_Object) aShape = GetObjectImpl(theSurf);
-  Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint);
+  Handle(::GEOM_Object) aShape = GetObjectImpl(theSurf);
+  Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint);
   if (aShape.IsNull() || aPoint.IsNull()) return -1.0;
 
   return GetOperations()->MinSurfaceCurvatureByPoint(aShape,aPoint);