Correct diagnostic of result of coarse proximity

diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
index 3b9652146685f3f8b1342ac7e37c1829305d338f..cb2b40a3793c588c7a1f2e3ef511713bb5820e88 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
@@ -3105,31 +3105,46 @@ Standard_Real GEOMImpl_IMeasureOperations::GetPreciseProximity(Handle(GEOM_Objec
   if (aShape1.IsNull() || aShape2.IsNull())
     return NULL;
   gp_Pnt aProxPnt1, aProxPnt2;
+  BRepExtrema_ProximityDistTool::ProxPnt_Status aStatus1, aStatus2;
+  Standard_Integer intStatus1, intStatus2;
   aCoarseProximity.GetProximityPoints(aProxPnt1, aProxPnt2);
+  aCoarseProximity.GetStatusOfPoints(intStatus1, intStatus2);
+  aStatus1 = (BRepExtrema_ProximityDistTool::ProxPnt_Status)intStatus1;
+  aStatus2 = (BRepExtrema_ProximityDistTool::ProxPnt_Status)intStatus2;
 
-  GEOMImpl_IProximity aFineProximity(aProximityFuncFine);
-  aFineProximity.SetShapes(aShape1, aShape2);
-  aFineProximity.SetProximityPoints(aProxPnt1, aProxPnt2);
+  Standard_Real aResultValue = aCoarseProximity.GetValue();
 
-  // Perform
-  try
+  // call precise calculator only if at least one point is in the middle of the shape
+  if (aStatus1 != BRepExtrema_ProximityDistTool::ProxPnt_Status_BORDER &&
+      aStatus2 != BRepExtrema_ProximityDistTool::ProxPnt_Status_BORDER)
   {
-    OCC_CATCH_SIGNALS;
-    if (!GetSolver()->ComputeFunction(aProximityFuncFine))
+    GEOMImpl_IProximity aFineProximity(aProximityFuncFine);
+    aFineProximity.SetShapes(aShape1, aShape2);
+    aFineProximity.SetProximityPoints(aProxPnt1, aProxPnt2);
+    aFineProximity.SetStatusOfPoints(intStatus1, intStatus2);
+    
+    // Perform
+    try
     {
-      SetErrorCode("shape proximity driver failed");
+      OCC_CATCH_SIGNALS;
+      if (!GetSolver()->ComputeFunction(aProximityFuncFine))
+      {
+        SetErrorCode("shape proximity driver failed");
+        return NULL;
+      }
+    }
+    catch (Standard_Failure& aFail)
+    {
+      SetErrorCode(aFail.GetMessageString());
       return NULL;
     }
-  }
-  catch (Standard_Failure& aFail)
-  {
-    SetErrorCode(aFail.GetMessageString());
-    return NULL;
+
+    aResultValue = aFineProximity.GetValue();
   }
 
   //Make a Python command
   GEOM::TPythonDump(aProximityFuncCoarse) << "value = p.preciseProximity()";
 
   SetErrorCode(OK);
-  return aFineProximity.GetValue();
+  return aResultValue;
 }

diff --git a/src/GEOMImpl/GEOMImpl_ShapeProximityDriver.cxx b/src/GEOMImpl/GEOMImpl_ShapeProximityDriver.cxx
index 99a7431087dee482d5bb421f131feea9555d2327..1c67aa44e9ff36df146f5c714950dc9e3b9ab081 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_ShapeProximityDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_ShapeProximityDriver.cxx
@@ -328,7 +328,6 @@ Standard_Integer GEOMImpl_ShapeProximityDriver::Execute(Handle(TFunction_Logbook
     aStatus1 = (BRepExtrema_ProximityDistTool::ProxPnt_Status)intStatus1;
     aStatus2 = (BRepExtrema_ProximityDistTool::ProxPnt_Status)intStatus2;
 
-    Standard_Real anExactValue = -1;
     if (aType1 == TopAbs_EDGE)
     {
       if (aType2 == TopAbs_EDGE)
@@ -336,17 +335,17 @@ Standard_Integer GEOMImpl_ShapeProximityDriver::Execute(Handle(TFunction_Logbook
         if (aStatus1 == BRepExtrema_ProximityDistTool::ProxPnt_Status_MIDDLE &&
             aStatus2 == BRepExtrema_ProximityDistTool::ProxPnt_Status_MIDDLE)
         {
-          anExactValue = extremaEE(TopoDS::Edge(aShape1), TopoDS::Edge(aShape2), aPnt1, aPnt2);
+          aValue = extremaEE(TopoDS::Edge(aShape1), TopoDS::Edge(aShape2), aPnt1, aPnt2);
         }
         else if (aStatus1 == BRepExtrema_ProximityDistTool::ProxPnt_Status_BORDER &&
                  aStatus2 == BRepExtrema_ProximityDistTool::ProxPnt_Status_MIDDLE)
         {
-          anExactValue = extremaPE(aPnt1, TopoDS::Edge(aShape2), aPnt2);
+          aValue = extremaPE(aPnt1, TopoDS::Edge(aShape2), aPnt2);
         }
         else if (aStatus1 == BRepExtrema_ProximityDistTool::ProxPnt_Status_MIDDLE &&
                  aStatus2 == BRepExtrema_ProximityDistTool::ProxPnt_Status_BORDER)
         {
-          anExactValue = extremaPE(aPnt2, TopoDS::Edge(aShape1), aPnt1);
+          aValue = extremaPE(aPnt2, TopoDS::Edge(aShape1), aPnt1);
         }
       }
       else if (aType2 == TopAbs_FACE)
@@ -354,17 +353,17 @@ Standard_Integer GEOMImpl_ShapeProximityDriver::Execute(Handle(TFunction_Logbook
         if (aStatus1 == BRepExtrema_ProximityDistTool::ProxPnt_Status_MIDDLE &&
             aStatus2 == BRepExtrema_ProximityDistTool::ProxPnt_Status_MIDDLE)
         {
-          anExactValue = extremaEF(TopoDS::Edge(aShape1), TopoDS::Face(aShape2), aPnt1, aPnt2);
+          aValue = extremaEF(TopoDS::Edge(aShape1), TopoDS::Face(aShape2), aPnt1, aPnt2);
         }
         else if (aStatus1 == BRepExtrema_ProximityDistTool::ProxPnt_Status_BORDER &&
                  aStatus2 == BRepExtrema_ProximityDistTool::ProxPnt_Status_MIDDLE)
         {
-          anExactValue = extremaPF(aPnt1, TopoDS::Face(aShape2), aPnt2);
+          aValue = extremaPF(aPnt1, TopoDS::Face(aShape2), aPnt2);
         }
         else if (aStatus1 == BRepExtrema_ProximityDistTool::ProxPnt_Status_MIDDLE &&
                  aStatus2 == BRepExtrema_ProximityDistTool::ProxPnt_Status_BORDER)
         {
-          anExactValue = extremaPE(aPnt2, TopoDS::Edge(aShape1), aPnt1);
+          aValue = extremaPE(aPnt2, TopoDS::Edge(aShape1), aPnt1);
         }
       }
     }
@@ -375,17 +374,17 @@ Standard_Integer GEOMImpl_ShapeProximityDriver::Execute(Handle(TFunction_Logbook
         if (aStatus1 == BRepExtrema_ProximityDistTool::ProxPnt_Status_MIDDLE &&
             aStatus2 == BRepExtrema_ProximityDistTool::ProxPnt_Status_MIDDLE)
         {
-          anExactValue = extremaEF(TopoDS::Edge(aShape2), TopoDS::Face(aShape1), aPnt2, aPnt1);
+          aValue = extremaEF(TopoDS::Edge(aShape2), TopoDS::Face(aShape1), aPnt2, aPnt1);
         }
         else if (aStatus1 == BRepExtrema_ProximityDistTool::ProxPnt_Status_BORDER &&
                  aStatus2 == BRepExtrema_ProximityDistTool::ProxPnt_Status_MIDDLE)
         {
-          anExactValue = extremaPE(aPnt1, TopoDS::Edge(aShape2), aPnt2);
+          aValue = extremaPE(aPnt1, TopoDS::Edge(aShape2), aPnt2);
         }
         else if (aStatus1 == BRepExtrema_ProximityDistTool::ProxPnt_Status_MIDDLE &&
                  aStatus2 == BRepExtrema_ProximityDistTool::ProxPnt_Status_BORDER)
         {
-          anExactValue = extremaPF(aPnt2, TopoDS::Face(aShape1), aPnt1);
+          aValue = extremaPF(aPnt2, TopoDS::Face(aShape1), aPnt1);
         }
       }
       else if (aType2 == TopAbs_FACE)
@@ -393,24 +392,21 @@ Standard_Integer GEOMImpl_ShapeProximityDriver::Execute(Handle(TFunction_Logbook
         if (aStatus1 == BRepExtrema_ProximityDistTool::ProxPnt_Status_MIDDLE &&
             aStatus2 == BRepExtrema_ProximityDistTool::ProxPnt_Status_MIDDLE)
         {
-          anExactValue = extremaFF(TopoDS::Face(aShape1), TopoDS::Face(aShape2), aPnt1, aPnt2);
+          aValue = extremaFF(TopoDS::Face(aShape1), TopoDS::Face(aShape2), aPnt1, aPnt2);
         }
         else if (aStatus1 == BRepExtrema_ProximityDistTool::ProxPnt_Status_BORDER &&
                  aStatus2 == BRepExtrema_ProximityDistTool::ProxPnt_Status_MIDDLE)
         {
-          anExactValue = extremaPF(aPnt1, TopoDS::Face(aShape2), aPnt2);
+          aValue = extremaPF(aPnt1, TopoDS::Face(aShape2), aPnt2);
         }
         else if (aStatus1 == BRepExtrema_ProximityDistTool::ProxPnt_Status_MIDDLE &&
                  aStatus2 == BRepExtrema_ProximityDistTool::ProxPnt_Status_BORDER)
         {
-          anExactValue = extremaPF(aPnt2, TopoDS::Face(aShape1), aPnt1);
+          aValue = extremaPF(aPnt2, TopoDS::Face(aShape1), aPnt1);
         }
       }
     }
 
-    if (anExactValue != -1)
-      aValue = anExactValue;
-
     if (aValue >= 0)
       aProximity.SetProximityPoints(aPnt1, aPnt2);
     else