From 9222f174385ee5ce6abf08b6e39fddd952dcbdba Mon Sep 17 00:00:00 2001 From: jfa Date: Fri, 7 Mar 2008 11:05:50 +0000 Subject: [PATCH] Join delta from tag V4_1_1 till tag mergeto_V4_1_0_maintainance_07Mar2008. --- doc/salome/gui/GEOM/input/creating_filling.doc | 4 +--- src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/doc/salome/gui/GEOM/input/creating_filling.doc b/doc/salome/gui/GEOM/input/creating_filling.doc index 82d446f2c..4600408d5 100644 --- a/doc/salome/gui/GEOM/input/creating_filling.doc +++ b/doc/salome/gui/GEOM/input/creating_filling.doc @@ -12,9 +12,7 @@ and Approximation. \n TUI Command: geompy.MakeFilling(Edges, MinDegree, MaxDegree, Tol2D, Tol3D, NbIter, isApprox) -\n Arguments: Name + 1 List of edges + 6 Parameters -(Min. degree, Max. degree, Number of iterations, 2D tolerance, 3D -tolerance, Number of iterations, Approximation). +\n Arguments: 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 6f9f6a0b4..329303c10 100644 --- 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 ebc34e718..8647d47bf 100644 --- 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);