From b608f6a564aa3d68b24a7984df66610be8315c81 Mon Sep 17 00:00:00 2001 From: nbv Date: Mon, 24 Apr 2017 13:48:28 +0300 Subject: [PATCH] 0028677: Avoid change of wire orientation in BRepLib_MakeFace if the wire is open Method BRepLib_MakeFace::CheckInside() is not called for open wire. So, if the input wire is open its orientation is not changed in the result face. --- dox/dev_guides/upgrade/upgrade.md | 11 +++++++++++ src/BRepFill/BRepFill_OffsetWire.hxx | 15 ++++++++++++--- src/BRepLib/BRepLib_MakeFace.cxx | 15 ++++++++------- tests/bugs/modalg_5/bug25298_01 | 2 +- tests/bugs/modalg_5/bug25298_02 | 2 +- tests/bugs/modalg_5/bug25334_10 | 2 +- tests/bugs/modalg_5/bug25334_3 | 2 +- tests/bugs/modalg_5/bug25334_4 | 2 +- tests/bugs/modalg_5/bug25334_9 | 2 +- tests/bugs/modalg_6/bug26296_5 | 2 +- tests/bugs/modalg_6/bug26481 | 2 +- tests/bugs/modalg_6/bug6768 | 2 +- tests/offset/wire_unclosed_outside_0_005/B6 | 5 +++-- tests/offset/wire_unclosed_outside_0_025/B6 | 2 ++ tests/offset/wire_unclosed_outside_0_075/A1 | 3 +++ tests/offset/wire_unclosed_outside_0_075/B6 | 2 ++ 16 files changed, 50 insertions(+), 21 deletions(-) diff --git a/dox/dev_guides/upgrade/upgrade.md b/dox/dev_guides/upgrade/upgrade.md index cbe32b0cc0..060f3801d3 100644 --- a/dox/dev_guides/upgrade/upgrade.md +++ b/dox/dev_guides/upgrade/upgrade.md @@ -1360,3 +1360,14 @@ if (anError != Storage_VSOk) // Error processing } ~~~~ + +@subsection upgrade_720_Change_In_BRepLib_MakeFace_Algo Change in BRepLib_MakeFace algorithm + + Previously, BRepLib_MakeFace algorithm changed orientation of the source wire in order to avoid creation of face as a hole (i.e. it is impossible to create single face as hole; hole can be created in context of another face only). New algorithm does not reverse the wire if it is open. Material of the face for open wire will be located on the left side from the source wire. + +@subsection upgrade_720_Change_In_BRepFill_OffsetWire Change in BRepFill_OffsetWire algorithm + + Now, offset direction will always be to outer region in case of positive offset value and to inner region in case of negative offset value. + Inner/Outer region for open wire is defined by the following rule: + when we go along the wire (taking into account edges orientation) then outer region will be on the right side, inner region will be on the left side. + In case of closed wire, inner region will always be inside the wire (at that, edges orientation is not taken into account). \ No newline at end of file diff --git a/src/BRepFill/BRepFill_OffsetWire.hxx b/src/BRepFill/BRepFill_OffsetWire.hxx index 88542ce2ce..f10987dafa 100644 --- a/src/BRepFill/BRepFill_OffsetWire.hxx +++ b/src/BRepFill/BRepFill_OffsetWire.hxx @@ -44,9 +44,18 @@ class Bisector_Bisec; class BRepFill_TrimEdgeTool; -//! Constructs a Offset Wire to a spine (wire or face) -//! on the left of spine. -//! The Wire or the Face must be planar. +//! Constructs a Offset Wire to a spine (wire or face). +//! Offset direction will be to outer region in case of +//! positive offset value and to inner region in case of +//! negative offset value. +//! Inner/Outer region for open wire is defined by the +//! following rule: when we go along the wire (taking into +//! account of edges orientation) then outer region will be +//! on the right side, inner region will be on the left side. +//! In case of closed wire, inner region will always be +//! inside the wire (at that, edges orientation is not taken +//! into account). +//! The Wire or the Face must be planar and oriented correctly. class BRepFill_OffsetWire { public: diff --git a/src/BRepLib/BRepLib_MakeFace.cxx b/src/BRepLib/BRepLib_MakeFace.cxx index 39663dbaf0..8046062ce5 100644 --- a/src/BRepLib/BRepLib_MakeFace.cxx +++ b/src/BRepLib/BRepLib_MakeFace.cxx @@ -270,7 +270,8 @@ BRepLib_MakeFace::BRepLib_MakeFace(const TopoDS_Wire& W, // BRepLib::SameParameter(myShape, tol, Standard_True); // - CheckInside(); + if (BRep_Tool::IsClosed(W)) + CheckInside(); } @@ -286,7 +287,7 @@ BRepLib_MakeFace::BRepLib_MakeFace(const gp_Pln& P, Handle(Geom_Plane) Pl = new Geom_Plane(P); Init(Pl, Standard_False, Precision::Confusion()); Add(W); - if (Inside) CheckInside(); + if (Inside && BRep_Tool::IsClosed(W)) CheckInside(); } @@ -302,7 +303,7 @@ BRepLib_MakeFace::BRepLib_MakeFace(const gp_Cylinder& C, Handle(Geom_CylindricalSurface) GC = new Geom_CylindricalSurface(C); Init(GC, Standard_False, Precision::Confusion()); Add(W); - if (Inside) CheckInside(); + if (Inside && BRep_Tool::IsClosed(W)) CheckInside(); } @@ -318,7 +319,7 @@ BRepLib_MakeFace::BRepLib_MakeFace(const gp_Cone& C, Handle(Geom_ConicalSurface) GC = new Geom_ConicalSurface(C); Init(GC, Standard_False, Precision::Confusion()); Add(W); - if (Inside) CheckInside(); + if (Inside && BRep_Tool::IsClosed(W)) CheckInside(); } @@ -334,7 +335,7 @@ BRepLib_MakeFace::BRepLib_MakeFace(const gp_Sphere& S, Handle(Geom_SphericalSurface) GS = new Geom_SphericalSurface(S); Init(GS, Standard_False, Precision::Confusion()); Add(W); - if (Inside) CheckInside(); + if (Inside && BRep_Tool::IsClosed(W)) CheckInside(); } @@ -350,7 +351,7 @@ BRepLib_MakeFace::BRepLib_MakeFace(const gp_Torus& T, Handle(Geom_ToroidalSurface) GT = new Geom_ToroidalSurface(T); Init(GT, Standard_False, Precision::Confusion()); Add(W); - if (Inside) CheckInside(); + if (Inside && BRep_Tool::IsClosed(W)) CheckInside(); } @@ -365,7 +366,7 @@ BRepLib_MakeFace::BRepLib_MakeFace(const Handle(Geom_Surface)& S, { Init(S, Standard_False, Precision::Confusion()); Add(W); - if (Inside) CheckInside(); + if (Inside && BRep_Tool::IsClosed(W)) CheckInside(); } diff --git a/tests/bugs/modalg_5/bug25298_01 b/tests/bugs/modalg_5/bug25298_01 index 6ca8f28154..ccb40b06cc 100755 --- a/tests/bugs/modalg_5/bug25298_01 +++ b/tests/bugs/modalg_5/bug25298_01 @@ -12,7 +12,7 @@ smallview display a fit -if [catch { openoffset resoffset a 1 10 i } ] { +if [catch { openoffset resoffset a 1 -10 i } ] { puts "Error : mkoffset is wrong" } else { renamevar resoffset_1 result diff --git a/tests/bugs/modalg_5/bug25298_02 b/tests/bugs/modalg_5/bug25298_02 index ed3c90e9d6..21e1d1ea3c 100755 --- a/tests/bugs/modalg_5/bug25298_02 +++ b/tests/bugs/modalg_5/bug25298_02 @@ -12,7 +12,7 @@ smallview display a fit -if [catch { openoffset resoffset a 1 -10 i } ] { +if [catch { openoffset resoffset a 1 10 i } ] { puts "Error : mkoffset is wrong" } else { renamevar resoffset_1 result diff --git a/tests/bugs/modalg_5/bug25334_10 b/tests/bugs/modalg_5/bug25334_10 index 4381638f00..671cf6aa07 100644 --- a/tests/bugs/modalg_5/bug25334_10 +++ b/tests/bugs/modalg_5/bug25334_10 @@ -15,7 +15,7 @@ wire ww a_3 a_4 donly ww -openoffset res ww 1 -10 +openoffset res ww 1 10 renamevar res_1 result fit diff --git a/tests/bugs/modalg_5/bug25334_3 b/tests/bugs/modalg_5/bug25334_3 index b83950fa44..5291afb78a 100644 --- a/tests/bugs/modalg_5/bug25334_3 +++ b/tests/bugs/modalg_5/bug25334_3 @@ -15,7 +15,7 @@ wire ww a_3 donly ww -openoffset res ww 1 10 +openoffset res ww 1 -10 renamevar res_1 result fit diff --git a/tests/bugs/modalg_5/bug25334_4 b/tests/bugs/modalg_5/bug25334_4 index d0bbf9011e..4e16e92a05 100644 --- a/tests/bugs/modalg_5/bug25334_4 +++ b/tests/bugs/modalg_5/bug25334_4 @@ -15,7 +15,7 @@ wire ww a_3 donly ww -openoffset res ww 1 -10 +openoffset res ww 1 10 renamevar res_1 result fit diff --git a/tests/bugs/modalg_5/bug25334_9 b/tests/bugs/modalg_5/bug25334_9 index 66cb9962d0..c301fc61e6 100644 --- a/tests/bugs/modalg_5/bug25334_9 +++ b/tests/bugs/modalg_5/bug25334_9 @@ -15,7 +15,7 @@ wire ww a_3 a_4 donly ww -openoffset res ww 1 10 +openoffset res ww 1 -10 renamevar res_1 result fit diff --git a/tests/bugs/modalg_6/bug26296_5 b/tests/bugs/modalg_6/bug26296_5 index e089e75244..d9189e1c79 100755 --- a/tests/bugs/modalg_6/bug26296_5 +++ b/tests/bugs/modalg_6/bug26296_5 @@ -12,7 +12,7 @@ smallview display a fit -if [catch { openoffset resoffset a 1 6. i } ] { +if [catch { openoffset resoffset a 1 -6. i } ] { puts "Error : openoffset is wrong" } else { renamevar resoffset_1 result diff --git a/tests/bugs/modalg_6/bug26481 b/tests/bugs/modalg_6/bug26481 index 2269cf8150..f69939fb6d 100644 --- a/tests/bugs/modalg_6/bug26481 +++ b/tests/bugs/modalg_6/bug26481 @@ -10,7 +10,7 @@ smallview restore [locate_data_file bug26296_linesarc.brep] a fit -openoffset r a 4 10. +openoffset r a 4 -10. fit checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug6768 b/tests/bugs/modalg_6/bug6768 index 381d16f948..75d7712669 100644 --- a/tests/bugs/modalg_6/bug6768 +++ b/tests/bugs/modalg_6/bug6768 @@ -11,7 +11,7 @@ explode co foreach s {co_1 co_2 co_3 co_4} { puts "\n*** make offset of wire r$s\n" -mkoffset r${s} ${s} 1 1 +mkoffset r${s} ${s} 1 -1 regexp {nb alone Vertices : ([-0-9.+eE]+)} [checksection r${s}_1] full nbv diff --git a/tests/offset/wire_unclosed_outside_0_005/B6 b/tests/offset/wire_unclosed_outside_0_005/B6 index 0011e4ea69..3ebf6145cf 100644 --- a/tests/offset/wire_unclosed_outside_0_005/B6 +++ b/tests/offset/wire_unclosed_outside_0_005/B6 @@ -1,7 +1,8 @@ restore [locate_data_file offset_wire_058.brep] s +set off_param -$off_param + set length 3316.27 set nbsh_v 62 set nbsh_e 62 -set nbsh_w 1 - +set nbsh_w 1 \ No newline at end of file diff --git a/tests/offset/wire_unclosed_outside_0_025/B6 b/tests/offset/wire_unclosed_outside_0_025/B6 index ecbabe56ca..25bb0c2f38 100644 --- a/tests/offset/wire_unclosed_outside_0_025/B6 +++ b/tests/offset/wire_unclosed_outside_0_025/B6 @@ -1,5 +1,7 @@ restore [locate_data_file offset_wire_058.brep] s +set off_param -$off_param + set length 2582.56 set nbsh_v 47 set nbsh_e 47 diff --git a/tests/offset/wire_unclosed_outside_0_075/A1 b/tests/offset/wire_unclosed_outside_0_075/A1 index 0c6f6ffc62..ba1098ee70 100644 --- a/tests/offset/wire_unclosed_outside_0_075/A1 +++ b/tests/offset/wire_unclosed_outside_0_075/A1 @@ -5,6 +5,9 @@ puts "TODO OCC24156 MacOS: Error : The length of result shape is" puts "TODO OCC24156 MacOS: Error : The resulting shape is WRONG" restore [locate_data_file offset_wire_001.brep] s + +set off_param -$off_param + set length 11.6898 set nbsh_v 23 set nbsh_e 23 diff --git a/tests/offset/wire_unclosed_outside_0_075/B6 b/tests/offset/wire_unclosed_outside_0_075/B6 index 1736ba2df9..f03ff598dc 100644 --- a/tests/offset/wire_unclosed_outside_0_075/B6 +++ b/tests/offset/wire_unclosed_outside_0_075/B6 @@ -1,5 +1,7 @@ restore [locate_data_file offset_wire_058.brep] s +set off_param -$off_param + set length 3127.75 set nbsh_v 39 set nbsh_e 39