diff --git a/src/ChFi3d/ChFi3d_Builder.cxx b/src/ChFi3d/ChFi3d_Builder.cxx index 473c9cb928..5b8fe07f60 100755 --- a/src/ChFi3d/ChFi3d_Builder.cxx +++ b/src/ChFi3d/ChFi3d_Builder.cxx @@ -64,7 +64,9 @@ #include #include - +#include +#include +#include #ifdef DRAW #include @@ -73,6 +75,8 @@ #ifdef DEB #include + + // variables for performances @@ -557,6 +561,27 @@ void ChFi3d_Builder::Compute() cout<<"-temps ChFi3d_sameparameter "<NbSurfaces(); + + for (iF=1; iF<=aNbSurfaces; ++iF) { + const TopTools_ListOfShape& aLF=myCoup->NewFaces(iF); + aIt.Initialize(aLF); + for (; aIt.More(); aIt.Next()) { + const TopoDS_Shape& aF=aIt.Value(); + BRepLib::SameParameter(aF, SameParTol, Standard_True); + ShapeFix::SameParameter(aF, Standard_False, SameParTol); + } + } + } } //======================================================================= diff --git a/src/ProjLib/ProjLib_ProjectedCurve.cxx b/src/ProjLib/ProjLib_ProjectedCurve.cxx index 5acd16d4ea..5c94aefcec 100755 --- a/src/ProjLib/ProjLib_ProjectedCurve.cxx +++ b/src/ProjLib/ProjLib_ProjectedCurve.cxx @@ -558,7 +558,7 @@ static void Project(ProjLib_Projector& P, Handle(Adaptor3d_HCurve)& C) ProjLib_ProjectedCurve::ProjLib_ProjectedCurve() { - myTolerance = Precision::PApproximation(); + myTolerance = Precision::Confusion(); } @@ -570,7 +570,7 @@ ProjLib_ProjectedCurve::ProjLib_ProjectedCurve() ProjLib_ProjectedCurve::ProjLib_ProjectedCurve (const Handle(Adaptor3d_HSurface)& S) { - myTolerance = Precision::PApproximation(); + myTolerance = Precision::Confusion(); Load(S); } @@ -584,7 +584,7 @@ ProjLib_ProjectedCurve::ProjLib_ProjectedCurve (const Handle(Adaptor3d_HSurface)& S, const Handle(Adaptor3d_HCurve)& C) { - myTolerance = Precision::PApproximation(); + myTolerance = Precision::Confusion(); Load(S); Load(C); } @@ -600,7 +600,7 @@ ProjLib_ProjectedCurve::ProjLib_ProjectedCurve const Handle(Adaptor3d_HCurve)& C, const Standard_Real Tol) { - myTolerance = Max(Tol, Precision::PApproximation()); + myTolerance = Max(Tol, Precision::Confusion()); Load(S); Load(C); } @@ -624,7 +624,7 @@ void ProjLib_ProjectedCurve::Load(const Handle(Adaptor3d_HSurface)& S) void ProjLib_ProjectedCurve::Load(const Handle(Adaptor3d_HCurve)& C) { - myTolerance = Max(myTolerance,Precision::PApproximation()); + myTolerance = Max(myTolerance, Precision::Confusion()); myCurve = C; Standard_Real FirstPar = C->FirstParameter(); Standard_Real LastPar = C->LastParameter(); diff --git a/src/TKFillet/EXTERNLIB b/src/TKFillet/EXTERNLIB index f7902e7eb2..576994dd3c 100755 --- a/src/TKFillet/EXTERNLIB +++ b/src/TKFillet/EXTERNLIB @@ -7,3 +7,4 @@ TKG2d TKTopAlgo TKG3d TKBool +TKShHealing diff --git a/tests/blend/complex/F6 b/tests/blend/complex/F6 index 8d0663c18b..5226fefb3c 100644 --- a/tests/blend/complex/F6 +++ b/tests/blend/complex/F6 @@ -3,7 +3,7 @@ ## Test : K7 ## Comment : from cts21020 ## ==================================== -puts "TODO OCC22817 All:Faulty shapes in variables faulty_1 to faulty_14" +puts "TODO OCC22817 All:Faulty shapes in variables faulty_1 to faulty_" restore [locate_data_file CFI_cts21020.rle] a explode a e diff --git a/tests/chamfer/data/complex/B6 b/tests/chamfer/data/complex/B6 index 2a0847c618..f70f1c735c 100644 --- a/tests/chamfer/data/complex/B6 +++ b/tests/chamfer/data/complex/B6 @@ -13,6 +13,6 @@ if { [string compare $command chamf] == 0 } { set os $env(os_type) } if {[string compare $group dist_angle] == 0} { - puts "TODO OCC22909 All:Faulty shapes in variables faulty_1 to faulty_12" + puts "TODO OCC22909 All:Faulty shapes in variables faulty_1 to faulty_" } }