Join delta from tag V4_1_1 till tag mergeto_V4_1_0_maintainance_07Mar2008.

diff --git a/doc/salome/gui/GEOM/input/creating_filling.doc b/doc/salome/gui/GEOM/input/creating_filling.doc
index 82d446f2c31c8812b6cc41190c4b47280dca4939..4600408d5152791f42c59c8b3d9558b372b2158c 100644 (file)
--- a/doc/salome/gui/GEOM/input/creating_filling.doc
+++ b/doc/salome/gui/GEOM/input/creating_filling.doc
@@ -12,9 +12,7 @@ and <b>Approximation</b>.
 
 \n <b>TUI Command:</b> <em>geompy.MakeFilling(Edges, MinDegree,
 MaxDegree, Tol2D, Tol3D, NbIter, isApprox)</em>
-\n <b>Arguments:</b> Name + 1 List of edges + 6 Parameters
-(Min. degree, Max. degree, Number of iterations, 2D tolerance, 3D
-tolerance, Number of iterations, Approximation).
+\n <b>Arguments:</b> Name + 1 Compound of edges + 2 Values (min. and max degree of result BSpline surface) + 2 Values (2D and 3D precision to reach) + 1 Value (number of iterations of approximaion algorithm) + 1 Flag (to select one of algorithms).
 
 \image html filling.png
 

diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cxx
index 6f9f6a0b45277d8fb301c663d30d7db19a375557..329303c107717ff2e99418da5ce4ec5adb7ff367 100644 (file)
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cxx
@@ -545,7 +545,7 @@ void GEOMAlgo_FinderShapeOn1::InnerPoints(const TopoDS_Face& aF,
   aTRF=BRep_Tool::Triangulation(aF, aLoc);
   if (aTRF.IsNull()) {
     if (!GEOMAlgo_FinderShapeOn::BuildTriangulation(aF)) {
-      myErrorStatus=20; // no triangulation found
+      myWarningStatus=20; // no triangulation found
       return;
     }
     aTRF=BRep_Tool::Triangulation(aF, aLoc);

diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx
index ebc34e718699979dff1a592ba4c0fc66760ad69b..8647d47bf52bdc75ee0ff4500c3cb9f74ea1eebc 100644 (file)
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx
@@ -605,7 +605,7 @@
   aTRF=BRep_Tool::Triangulation(aF, aLoc);
   if (aTRF.IsNull()) {
     if (!GEOMAlgo_FinderShapeOn::BuildTriangulation(aF)) {
-      myErrorStatus=20; // no triangulation found
+      myWarningStatus=20; // no triangulation found
       return;
     }
     aTRF=BRep_Tool::Triangulation(aF, aLoc);