Fix pb in non-regression scripts, caused by previous integration

[modules/geom.git] / src / GEOMImpl / GEOMImpl_ProjectionDriver.cxx

diff --git a/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx b/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx
index eeb87d09f5e696b517b40a4a4af2c8d1dd43b875..3e025ccd04f992b1c35728dd465824964e3d5cd9 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
@@ -183,12 +183,26 @@ Standard_Integer GEOMImpl_ProjectionDriver::Execute(TFunction_Logbook& log) cons
       BRepOffsetAPI_NormalProjection OrtProj (aFaceShape);
       OrtProj.Add(anOriginal);
 
-      //Standard_Real tol = 1.e-4;        
-      //Standard_Real tol2d = Pow(tol, 2./3);
-      //GeomAbs_Shape Continuity = GeomAbs_C2;  
-      //Standard_Integer MaxDeg = 14;           
-      //Standard_Integer MaxSeg = 16;           
-      //OrtProj.SetParams(tol, tol2d, Continuity, MaxDeg, MaxSeg);
+      // Compute maximal tolerance of projection.
+      TopExp_Explorer anExp(anOriginal,TopAbs_VERTEX);
+      Standard_Real   aMaxTol = Precision::Confusion();
+
+      for(; anExp.More(); anExp.Next()) { 
+        const TopoDS_Vertex aVtx    = TopoDS::Vertex(anExp.Current());
+        const Standard_Real aCurTol = BRep_Tool::Tolerance(aVtx);
+
+        if (aMaxTol < aCurTol) {
+          aMaxTol = aCurTol;
+        }
+      }
+
+      Standard_Real tol2d = Pow(aMaxTol, 2./3);
+      GeomAbs_Shape Continuity = GeomAbs_C2;
+      Standard_Integer MaxDeg = 14;
+      Standard_Integer MaxSeg = 16;
+
+      OrtProj.SetParams(aMaxTol, tol2d, Continuity, MaxDeg, MaxSeg);
+
       try {
         OrtProj.Build();
       } catch (Standard_Failure) {
@@ -344,14 +358,36 @@ Standard_Integer GEOMImpl_ProjectionDriver::Execute(TFunction_Logbook& log) cons
 
         // Store the valid solution.
         hasValidSolution = Standard_True;
+
+        // Normalize parameter.
+        TopoDS_Edge aSupportEdge = TopoDS::Edge(aSupportShape);
+        Standard_Real aF, aL;
+
+        BRep_Tool::Range(aSupportEdge, aF, aL);
+
+        if (Abs(aL - aF) <= aTolConf) {
+          Standard_ConstructionError::Raise
+            ("Projection aborted : degenerated projection edge");
+        }
+
+        aParam = (aParam - aF)/(aL - aF);
         aProj.SetU(aParam);
 
         // Compute edge index.
-        TopTools_IndexedMapOfShape anIndices;
-        TopExp::MapShapes(aShape, anIndices);
-        const int anIndex = anIndices.FindIndex(aSupportShape);
+        TopExp_Explorer anExp(aShape, TopAbs_EDGE);
+        int anIndex = 0;
+
+        for (; anExp.More(); anExp.Next(), anIndex++) {
+          if (aSupportShape.IsSame(anExp.Current())) {
+            aProj.SetIndex(anIndex);
+            break;
+          }
+        }
 
-        aProj.SetIndex(anIndex);
+        if (!anExp.More()) {
+          Standard_ConstructionError::Raise
+            ("Projection aborted : Can't define edge index");
+        }
 
         // Construct a projection vertex.
         const gp_Pnt &aPntProj = aDistShSh.PointOnShape2(i);
@@ -382,16 +418,28 @@ GetCreationInformation(std::string&             theOperationName,
   if (Label().IsNull()) return 0;
   Handle(GEOM_Function) function = GEOM_Function::GetFunction(Label());
 
-  GEOMImpl_IMirror aCI( function );
   Standard_Integer aType = function->GetType();
 
   theOperationName = "PROJECTION";
 
   switch ( aType ) {
   case PROJECTION_COPY:
-    AddParam( theParams, "Source object", aCI.GetOriginal() );
-    AddParam( theParams, "Target face", aCI.GetPlane() );
-    break;
+    {
+      GEOMImpl_IMirror aCI( function );
+
+      AddParam( theParams, "Source object", aCI.GetOriginal() );
+      AddParam( theParams, "Target face", aCI.GetPlane() );
+      break;
+    }
+  case PROJECTION_ON_WIRE:
+    {
+      GEOMImpl_IProjection aProj (function);
+
+      AddParam(theParams, "Point", aProj.GetPoint());
+      AddParam(theParams, "Shape", aProj.GetShape());
+
+      break;
+    }
   default:
     return false;
   }