diff --git a/src/BRepMesh/BRepMesh_DefaultRangeSplitter.cxx b/src/BRepMesh/BRepMesh_DefaultRangeSplitter.cxx index a3307f36e5..a72cdfec2d 100644 --- a/src/BRepMesh/BRepMesh_DefaultRangeSplitter.cxx +++ b/src/BRepMesh/BRepMesh_DefaultRangeSplitter.cxx @@ -126,8 +126,8 @@ void BRepMesh_DefaultRangeSplitter::computeTolerance( const Standard_Real aDiffV = myRangeV.second - myRangeV.first; const Standard_Real aDeflectionUV = 1.e-05; - myTolerance.first = Max(aDeflectionUV, Precision::Confusion() * aDiffU); - myTolerance.second = Max(aDeflectionUV, Precision::Confusion() * aDiffV); + myTolerance.first = Max(Min(aDeflectionUV, 0.1 * aDiffU), 1e-7 * aDiffU); + myTolerance.second = Max(Min(aDeflectionUV, 0.1 * aDiffV), 1e-7 * aDiffV); } //======================================================================= diff --git a/src/BRepMesh/BRepMesh_ModelHealer.cxx b/src/BRepMesh/BRepMesh_ModelHealer.cxx index 76e6f7f9f0..6ad9b83f56 100644 --- a/src/BRepMesh/BRepMesh_ModelHealer.cxx +++ b/src/BRepMesh/BRepMesh_ModelHealer.cxx @@ -245,6 +245,30 @@ void BRepMesh_ModelHealer::process(const IMeshData::IFaceHandle& theDFace) const #endif aIntersections = aChecker.GetIntersectingEdges(); } + else + { + if (theDFace->WiresNb () == 1) + { + const IMeshData::IWireHandle& aDWire = theDFace->GetWire (0); + + if (aDWire->EdgesNb () == 2) + { + const IMeshData::IEdgePtr& aDEdge0 = aDWire->GetEdge (0); + const IMeshData::IEdgePtr& aDEdge1 = aDWire->GetEdge (1); + + const IMeshData::IPCurveHandle& aPCurve0 = aDEdge0->GetPCurve (theDFace.get (), aDWire->GetEdgeOrientation (0)); + const IMeshData::IPCurveHandle& aPCurve1 = aDEdge1->GetPCurve (theDFace.get (), aDWire->GetEdgeOrientation (1)); + + if (aPCurve0->ParametersNb () == 2 && aPCurve1->ParametersNb () == 2) + { + aIntersections = new IMeshData::MapOfIEdgePtr; + // a kind of degenerated face - 1 wire, 2 edges and both edges are very small + aIntersections->Add (aDEdge0); + aIntersections->Add (aDEdge1); + } + } + } + } } } catch (Standard_Failure const&) diff --git a/tests/bugs/mesh/bug25044_1 b/tests/bugs/mesh/bug25044_1 new file mode 100644 index 0000000000..c210473dc4 --- /dev/null +++ b/tests/bugs/mesh/bug25044_1 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face1.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_10 b/tests/bugs/mesh/bug25044_10 new file mode 100644 index 0000000000..a61cf0838a --- /dev/null +++ b/tests/bugs/mesh/bug25044_10 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face10.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_11 b/tests/bugs/mesh/bug25044_11 new file mode 100644 index 0000000000..9cb738fb35 --- /dev/null +++ b/tests/bugs/mesh/bug25044_11 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face11.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_12 b/tests/bugs/mesh/bug25044_12 new file mode 100644 index 0000000000..1ddf82927d --- /dev/null +++ b/tests/bugs/mesh/bug25044_12 @@ -0,0 +1,21 @@ +puts "TODO 25044 ALL: SelfIntersectingWire" +puts "TODO 25044 ALL: Number of triangles is equal to 0" + +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face12.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_13 b/tests/bugs/mesh/bug25044_13 new file mode 100644 index 0000000000..f02bc31f58 --- /dev/null +++ b/tests/bugs/mesh/bug25044_13 @@ -0,0 +1,21 @@ +puts "TODO 25044 ALL: SelfIntersectingWire" +puts "TODO 25044 ALL: Number of triangles is equal to 0" + +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face13.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_14 b/tests/bugs/mesh/bug25044_14 new file mode 100644 index 0000000000..8c6cf6fc86 --- /dev/null +++ b/tests/bugs/mesh/bug25044_14 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face14.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_15 b/tests/bugs/mesh/bug25044_15 new file mode 100644 index 0000000000..d8537b8fac --- /dev/null +++ b/tests/bugs/mesh/bug25044_15 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face15.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_16 b/tests/bugs/mesh/bug25044_16 new file mode 100644 index 0000000000..2f98ecbb8a --- /dev/null +++ b/tests/bugs/mesh/bug25044_16 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face16.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_17 b/tests/bugs/mesh/bug25044_17 new file mode 100644 index 0000000000..beadefcda7 --- /dev/null +++ b/tests/bugs/mesh/bug25044_17 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face17.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_18 b/tests/bugs/mesh/bug25044_18 new file mode 100644 index 0000000000..2e94b500f0 --- /dev/null +++ b/tests/bugs/mesh/bug25044_18 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face18.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_19 b/tests/bugs/mesh/bug25044_19 new file mode 100644 index 0000000000..937076d937 --- /dev/null +++ b/tests/bugs/mesh/bug25044_19 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face19.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_2 b/tests/bugs/mesh/bug25044_2 new file mode 100644 index 0000000000..cb3495dd60 --- /dev/null +++ b/tests/bugs/mesh/bug25044_2 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face2.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_20 b/tests/bugs/mesh/bug25044_20 new file mode 100644 index 0000000000..fbdacfc9ec --- /dev/null +++ b/tests/bugs/mesh/bug25044_20 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face20.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_21 b/tests/bugs/mesh/bug25044_21 new file mode 100644 index 0000000000..eeba184da8 --- /dev/null +++ b/tests/bugs/mesh/bug25044_21 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face21.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_22 b/tests/bugs/mesh/bug25044_22 new file mode 100644 index 0000000000..44cef45c4c --- /dev/null +++ b/tests/bugs/mesh/bug25044_22 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face22.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_23 b/tests/bugs/mesh/bug25044_23 new file mode 100644 index 0000000000..b9ff8dfeca --- /dev/null +++ b/tests/bugs/mesh/bug25044_23 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face23.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_24 b/tests/bugs/mesh/bug25044_24 new file mode 100644 index 0000000000..89a80aac90 --- /dev/null +++ b/tests/bugs/mesh/bug25044_24 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face24.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_25 b/tests/bugs/mesh/bug25044_25 new file mode 100644 index 0000000000..be3d1944a2 --- /dev/null +++ b/tests/bugs/mesh/bug25044_25 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face25.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_26 b/tests/bugs/mesh/bug25044_26 new file mode 100644 index 0000000000..9d7c5b13ad --- /dev/null +++ b/tests/bugs/mesh/bug25044_26 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face26.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_27 b/tests/bugs/mesh/bug25044_27 new file mode 100644 index 0000000000..3534208995 --- /dev/null +++ b/tests/bugs/mesh/bug25044_27 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face27.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_28 b/tests/bugs/mesh/bug25044_28 new file mode 100644 index 0000000000..2b3ce00af5 --- /dev/null +++ b/tests/bugs/mesh/bug25044_28 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face28.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_29 b/tests/bugs/mesh/bug25044_29 new file mode 100644 index 0000000000..e05684c3c5 --- /dev/null +++ b/tests/bugs/mesh/bug25044_29 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face29.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_3 b/tests/bugs/mesh/bug25044_3 new file mode 100644 index 0000000000..a9b86335e6 --- /dev/null +++ b/tests/bugs/mesh/bug25044_3 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face3.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_30 b/tests/bugs/mesh/bug25044_30 new file mode 100644 index 0000000000..bdec7eeb7b --- /dev/null +++ b/tests/bugs/mesh/bug25044_30 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face30.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_31 b/tests/bugs/mesh/bug25044_31 new file mode 100644 index 0000000000..7f2c92ad49 --- /dev/null +++ b/tests/bugs/mesh/bug25044_31 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face31.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_32 b/tests/bugs/mesh/bug25044_32 new file mode 100644 index 0000000000..bf5058071e --- /dev/null +++ b/tests/bugs/mesh/bug25044_32 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face32.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_33 b/tests/bugs/mesh/bug25044_33 new file mode 100644 index 0000000000..68e8bbc0c8 --- /dev/null +++ b/tests/bugs/mesh/bug25044_33 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face33.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_34 b/tests/bugs/mesh/bug25044_34 new file mode 100644 index 0000000000..b71f5f7f61 --- /dev/null +++ b/tests/bugs/mesh/bug25044_34 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face34.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_35 b/tests/bugs/mesh/bug25044_35 new file mode 100644 index 0000000000..b2dc3d0919 --- /dev/null +++ b/tests/bugs/mesh/bug25044_35 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face35.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_36 b/tests/bugs/mesh/bug25044_36 new file mode 100644 index 0000000000..9fbe0e678b --- /dev/null +++ b/tests/bugs/mesh/bug25044_36 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face36.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_37 b/tests/bugs/mesh/bug25044_37 new file mode 100644 index 0000000000..d775262394 --- /dev/null +++ b/tests/bugs/mesh/bug25044_37 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face37.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_38 b/tests/bugs/mesh/bug25044_38 new file mode 100644 index 0000000000..4db20bc1e8 --- /dev/null +++ b/tests/bugs/mesh/bug25044_38 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face38.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_39 b/tests/bugs/mesh/bug25044_39 new file mode 100644 index 0000000000..161ffc8cce --- /dev/null +++ b/tests/bugs/mesh/bug25044_39 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face39.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_4 b/tests/bugs/mesh/bug25044_4 new file mode 100644 index 0000000000..1940518d88 --- /dev/null +++ b/tests/bugs/mesh/bug25044_4 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face4.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_40 b/tests/bugs/mesh/bug25044_40 new file mode 100644 index 0000000000..20d55a1b72 --- /dev/null +++ b/tests/bugs/mesh/bug25044_40 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face40.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_41 b/tests/bugs/mesh/bug25044_41 new file mode 100644 index 0000000000..3d463e14da --- /dev/null +++ b/tests/bugs/mesh/bug25044_41 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face41.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_42 b/tests/bugs/mesh/bug25044_42 new file mode 100644 index 0000000000..0c4837f69b --- /dev/null +++ b/tests/bugs/mesh/bug25044_42 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face42.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_43 b/tests/bugs/mesh/bug25044_43 new file mode 100644 index 0000000000..77d3616d5a --- /dev/null +++ b/tests/bugs/mesh/bug25044_43 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face43.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_44 b/tests/bugs/mesh/bug25044_44 new file mode 100644 index 0000000000..addf5c663c --- /dev/null +++ b/tests/bugs/mesh/bug25044_44 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face44.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_45 b/tests/bugs/mesh/bug25044_45 new file mode 100644 index 0000000000..e0ab2e9dc8 --- /dev/null +++ b/tests/bugs/mesh/bug25044_45 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face45.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_46 b/tests/bugs/mesh/bug25044_46 new file mode 100644 index 0000000000..afaa4aaa2d --- /dev/null +++ b/tests/bugs/mesh/bug25044_46 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face46.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_47 b/tests/bugs/mesh/bug25044_47 new file mode 100644 index 0000000000..95c073a129 --- /dev/null +++ b/tests/bugs/mesh/bug25044_47 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face47.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_48 b/tests/bugs/mesh/bug25044_48 new file mode 100644 index 0000000000..7cedc96670 --- /dev/null +++ b/tests/bugs/mesh/bug25044_48 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face48.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_49 b/tests/bugs/mesh/bug25044_49 new file mode 100644 index 0000000000..4bf31c0498 --- /dev/null +++ b/tests/bugs/mesh/bug25044_49 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face49.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_5 b/tests/bugs/mesh/bug25044_5 new file mode 100644 index 0000000000..b64d336cba --- /dev/null +++ b/tests/bugs/mesh/bug25044_5 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face5.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_50 b/tests/bugs/mesh/bug25044_50 new file mode 100644 index 0000000000..f422e2e469 --- /dev/null +++ b/tests/bugs/mesh/bug25044_50 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face50.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_51 b/tests/bugs/mesh/bug25044_51 new file mode 100644 index 0000000000..7e14214747 --- /dev/null +++ b/tests/bugs/mesh/bug25044_51 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face51.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_52 b/tests/bugs/mesh/bug25044_52 new file mode 100644 index 0000000000..65bcabc044 --- /dev/null +++ b/tests/bugs/mesh/bug25044_52 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face52.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_53 b/tests/bugs/mesh/bug25044_53 new file mode 100644 index 0000000000..1995ed82f1 --- /dev/null +++ b/tests/bugs/mesh/bug25044_53 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face53.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_54 b/tests/bugs/mesh/bug25044_54 new file mode 100644 index 0000000000..e5e2a531d0 --- /dev/null +++ b/tests/bugs/mesh/bug25044_54 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face54.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_55 b/tests/bugs/mesh/bug25044_55 new file mode 100644 index 0000000000..7d3f0b028d --- /dev/null +++ b/tests/bugs/mesh/bug25044_55 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face55.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_56 b/tests/bugs/mesh/bug25044_56 new file mode 100644 index 0000000000..e4a3f68f8d --- /dev/null +++ b/tests/bugs/mesh/bug25044_56 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face56.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_57 b/tests/bugs/mesh/bug25044_57 new file mode 100644 index 0000000000..0387b27441 --- /dev/null +++ b/tests/bugs/mesh/bug25044_57 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face57.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_58 b/tests/bugs/mesh/bug25044_58 new file mode 100644 index 0000000000..648f5a3796 --- /dev/null +++ b/tests/bugs/mesh/bug25044_58 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face58.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_59 b/tests/bugs/mesh/bug25044_59 new file mode 100644 index 0000000000..c7a258093a --- /dev/null +++ b/tests/bugs/mesh/bug25044_59 @@ -0,0 +1,22 @@ +puts "TODO 25044 ALL: Not connected mesh inside face 147" + +puts "=======" +puts "0025588: BRepMesh_ShapeTool::FindUV check for 2d points to be the same is inconsistent with ShapeAnalysis_Wire::CheckLacking" +puts "=======" +puts "" + +pload XDE + +stepread [locate_data_file Checking_Fixture_Clamping.STEP] a * +renamevar a_1 result +tclean result + +vinit +vsetdispmode 1 +vdisplay result +vfit + +tricheck result + +checktrinfo result -tri +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_6 b/tests/bugs/mesh/bug25044_6 new file mode 100644 index 0000000000..1f16d0d499 --- /dev/null +++ b/tests/bugs/mesh/bug25044_6 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face6.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_60 b/tests/bugs/mesh/bug25044_60 new file mode 100644 index 0000000000..78ae386109 --- /dev/null +++ b/tests/bugs/mesh/bug25044_60 @@ -0,0 +1,20 @@ +puts "=======" +puts "0025588: BRepMesh_ShapeTool::FindUV check for 2d points to be the same is inconsistent with ShapeAnalysis_Wire::CheckLacking" +puts "=======" +puts "" + +pload XDE + +stepread [locate_data_file Median_cx-fs01_bicycle.stp] a * +renamevar a_1 result +tclean result + +vinit +vsetdispmode 1 +vdisplay result +vfit + +tricheck result + +checktrinfo result -tri +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_7 b/tests/bugs/mesh/bug25044_7 new file mode 100644 index 0000000000..3fb496b446 --- /dev/null +++ b/tests/bugs/mesh/bug25044_7 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face7.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_8 b/tests/bugs/mesh/bug25044_8 new file mode 100644 index 0000000000..7d2beb43ef --- /dev/null +++ b/tests/bugs/mesh/bug25044_8 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face8.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug25044_9 b/tests/bugs/mesh/bug25044_9 new file mode 100644 index 0000000000..fd8db393ab --- /dev/null +++ b/tests/bugs/mesh/bug25044_9 @@ -0,0 +1,18 @@ +puts "=======" +puts "0025044: BRepMesh tweaks" +puts "=======" +puts "" + +restore [locate_data_file bug25044_face9.brep] result +tclean result + +incmesh result 0.1 -a 5 + +checktrinfo result -tri + +vinit +vsetdispmode 1 +vdefaults -autoTriang 0 +vdisplay result +vfit +checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/mesh/bug28500 b/tests/bugs/mesh/bug28500 index a9a4f9582a..3bab0b6875 100644 --- a/tests/bugs/mesh/bug28500 +++ b/tests/bugs/mesh/bug28500 @@ -4,7 +4,7 @@ puts "=======" puts "" puts "TODO CR28500 ALL: Artifact in shaded view of the shape" -puts "TODO CR30056 ALL: Meshing statuses: Failure Reused" +puts "TODO CR30056 ALL: Meshing statuses: SelfIntersectingWire Failure Reused" restore [locate_data_file bug28500_shape_mesh_artifact.brep] a diff --git a/tests/bugs/vis/bug22849 b/tests/bugs/vis/bug22849 index 6fe5d8c4fb..5d53da5353 100755 --- a/tests/bugs/vis/bug22849 +++ b/tests/bugs/vis/bug22849 @@ -1,4 +1,4 @@ -puts "TODO CR30056 ALL: Meshing statuses: Failure" +puts "TODO CR30056 ALL: Meshing statuses: SelfIntersectingWire Failure" puts "============" puts "OCC22849" diff --git a/tests/hlr/poly_hlr/bug23625_1 b/tests/hlr/poly_hlr/bug23625_1 index 8f6ac38245..79d0e80de2 100644 --- a/tests/hlr/poly_hlr/bug23625_1 +++ b/tests/hlr/poly_hlr/bug23625_1 @@ -4,7 +4,7 @@ puts "============" puts "" set viewname "vfront" -set length 28094.3 +set length 28096.2 restore [locate_data_file bug23625_a1.brep] a COMPUTE_HLR $viewname $algotype diff --git a/tests/hlr/poly_hlr/bug23625_2 b/tests/hlr/poly_hlr/bug23625_2 index c72fbd5b41..bf6139d390 100644 --- a/tests/hlr/poly_hlr/bug23625_2 +++ b/tests/hlr/poly_hlr/bug23625_2 @@ -4,7 +4,7 @@ puts "============" puts "" set viewname "vfront" -set length 28988.5 +set length 28990.3 restore [locate_data_file bug23625_a2.brep] a COMPUTE_HLR $viewname $algotype diff --git a/tests/mesh/data/advanced/A7 b/tests/mesh/data/advanced/A7 index 0f5b4b5b5f..96c7120adf 100755 --- a/tests/mesh/data/advanced/A7 +++ b/tests/mesh/data/advanced/A7 @@ -4,5 +4,4 @@ set max_rel_tol_diff 0.1 if { [string compare $command "shading"] == 0 } { set bug_area "OCC22687" set bug_withouttri "OCC22687" - set nbwithouttri(ALL) 74 } diff --git a/tests/mesh/data/standard/O5 b/tests/mesh/data/standard/O5 index 615220393f..a79431b08c 100755 --- a/tests/mesh/data/standard/O5 +++ b/tests/mesh/data/standard/O5 @@ -1,13 +1,6 @@ set TheFileName shading_131.brep -set bug_area "OCC22687" -set bug_withouttri "OCC22687" -set nbwithouttri(ALL) 1 if { [string compare $command "shading"] == 0 } { set rel_tol 0.13 - set nbwithouttri(ALL) 1 } else { set rel_tol 0.21 } -if { [string compare $command "incmesh"] == 0 } { - puts "TODO OCC22687 ALL: Meshing statuses: Failure" -} \ No newline at end of file