mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-05 18:16:23 +03:00
0023903: Invalid result of pipe operation on closed path
Add test case for this fix
This commit is contained in:
skv
parent
244587f413
commit
cf3327f417
@ -849,13 +849,7 @@ TopoDS_Shape BRepFill_Pipe::ShareFaces
|
|||||||
anExp.Init(myFaces->Value(ii, jj), TopAbs_EDGE);
|
anExp.Init(myFaces->Value(ii, jj), TopAbs_EDGE);
|
||||||
|
|
||||||
for (; anExp.More(); anExp.Next()) {
|
for (; anExp.More(); anExp.Next()) {
|
||||||
if (aMapBndEdgeIndex.IsBound(anExp.Current())) {
|
aMapBndEdgeIndex.Bind(anExp.Current(), ii);
|
||||||
// This is not boundary edge. Remove it.
|
|
||||||
aMapBndEdgeIndex.UnBind(anExp.Current());
|
|
||||||
} else {
|
|
||||||
// Add boundary edge.
|
|
||||||
aMapBndEdgeIndex.Bind(anExp.Current(), ii);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -2065,143 +2065,141 @@ BRepFill_Sweep::BRepFill_Sweep(const Handle(BRepFill_SectionLaw)& Section,
|
|||||||
Standard_Boolean exuv, singu, singv;
|
Standard_Boolean exuv, singu, singv;
|
||||||
Handle(Geom_Surface) S;
|
Handle(Geom_Surface) S;
|
||||||
|
|
||||||
if (! vclose) {
|
// (2.0) return preexisting Edges and vertices
|
||||||
// (2.0) return preexisting Edges and vertices
|
TopoDS_Edge E;
|
||||||
TopoDS_Edge E;
|
if (! FirstShape.IsNull() && (IFirst==1)) {
|
||||||
if (! FirstShape.IsNull() && (IFirst==1)) {
|
mySec->Init(FirstShape);
|
||||||
mySec->Init(FirstShape);
|
for (isec=1; isec<=NbLaw; isec++) {
|
||||||
for (isec=1; isec<=NbLaw; isec++) {
|
E = mySec->CurrentEdge();
|
||||||
E = mySec->CurrentEdge();
|
VEdge(isec, 1) = E;
|
||||||
VEdge(isec, 1) = E;
|
if (E.Orientation() == TopAbs_REVERSED)
|
||||||
if (E.Orientation() == TopAbs_REVERSED)
|
Vertex(isec+1, 1) = TopExp::FirstVertex(E);
|
||||||
Vertex(isec+1, 1) = TopExp::FirstVertex(E);
|
else
|
||||||
else
|
Vertex(isec+1, 1) = TopExp::LastVertex(E);
|
||||||
Vertex(isec+1, 1) = TopExp::LastVertex(E);
|
UpdateVertex(IFirst-1, isec+1,
|
||||||
UpdateVertex(IFirst-1, isec+1,
|
TabErr(isec, 1), Vi(1), Vertex(isec+1, 1));
|
||||||
TabErr(isec, 1), Vi(1), Vertex(isec+1, 1));
|
|
||||||
}
|
|
||||||
if (VEdge(1, 1).Orientation() == TopAbs_REVERSED)
|
|
||||||
Vertex(1, 1) = TopExp::LastVertex(TopoDS::Edge(VEdge(1, 1)));
|
|
||||||
else
|
|
||||||
Vertex(1, 1) = TopExp::FirstVertex(TopoDS::Edge(VEdge(1, 1)));
|
|
||||||
UpdateVertex(IFirst-1, 1,
|
|
||||||
TabErr(1, 1), Vi(1), Vertex(1, 1));
|
|
||||||
}
|
}
|
||||||
else { // Otherwise construct vertices
|
if (VEdge(1, 1).Orientation() == TopAbs_REVERSED)
|
||||||
Standard_Real u, v, aux;
|
Vertex(1, 1) = TopExp::LastVertex(TopoDS::Edge(VEdge(1, 1)));
|
||||||
Standard_Boolean ureverse;
|
else
|
||||||
for (isec=1; isec<=NbLaw+1; isec++) {
|
Vertex(1, 1) = TopExp::FirstVertex(TopoDS::Edge(VEdge(1, 1)));
|
||||||
// Return data
|
UpdateVertex(IFirst-1, 1,
|
||||||
if (isec >NbLaw) {
|
TabErr(1, 1), Vi(1), Vertex(1, 1));
|
||||||
S = TabS(NbLaw, 1);
|
}
|
||||||
ureverse = UReverse(NbLaw, 1);
|
else { // Otherwise construct vertices
|
||||||
exuv = ExchUV(NbLaw, 1);
|
Standard_Real u, v, aux;
|
||||||
}
|
Standard_Boolean ureverse;
|
||||||
else {
|
for (isec=1; isec<=NbLaw+1; isec++) {
|
||||||
S = TabS(isec, 1);
|
// Return data
|
||||||
ureverse = UReverse(isec, 1);
|
if (isec >NbLaw) {
|
||||||
exuv = ExchUV(isec, 1);
|
S = TabS(NbLaw, 1);
|
||||||
}
|
ureverse = UReverse(NbLaw, 1);
|
||||||
S->Bounds(UFirst, ULast, VFirst, VLast);
|
exuv = ExchUV(NbLaw, 1);
|
||||||
|
|
||||||
// Choice of parameters
|
|
||||||
if (ureverse) {
|
|
||||||
if (exuv) {
|
|
||||||
aux = VFirst; VFirst = VLast; VLast = aux;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
aux = UFirst; UFirst = ULast; ULast = aux;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (isec!= NbLaw+1) {
|
|
||||||
u = UFirst;
|
|
||||||
v = VFirst;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if (exuv) {
|
|
||||||
u = UFirst;
|
|
||||||
v = VLast;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
u = ULast;
|
|
||||||
v = VFirst;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// construction of vertices
|
|
||||||
B.MakeVertex(TopoDS::Vertex(Vertex(isec, 1)),
|
|
||||||
S->Value(u,v),
|
|
||||||
mySec->VertexTol(isec-1,Vi(1)));
|
|
||||||
}
|
}
|
||||||
}
|
else {
|
||||||
|
S = TabS(isec, 1);
|
||||||
if (! LastShape.IsNull() && (ILast==myLoc->NbLaw()+1) ) {
|
ureverse = UReverse(isec, 1);
|
||||||
mySec->Init(LastShape);
|
exuv = ExchUV(isec, 1);
|
||||||
for (isec=1; isec<=NbLaw; isec++) {
|
|
||||||
E = mySec->CurrentEdge();
|
|
||||||
VEdge(isec, NbPath+1) = E;
|
|
||||||
if (E.Orientation() == TopAbs_REVERSED)
|
|
||||||
Vertex(isec+1, NbPath+1) = TopExp::FirstVertex(E);
|
|
||||||
else
|
|
||||||
Vertex(isec+1, NbPath+1) = TopExp::LastVertex(E);
|
|
||||||
UpdateVertex(ILast-1, isec+1, TabErr(isec, NbPath),
|
|
||||||
Vi(NbPath+1), Vertex(isec+1, NbPath+1));
|
|
||||||
}
|
}
|
||||||
if (VEdge(1, NbPath+1).Orientation() == TopAbs_REVERSED)
|
S->Bounds(UFirst, ULast, VFirst, VLast);
|
||||||
Vertex(1, NbPath+1) =
|
|
||||||
TopExp::LastVertex(TopoDS::Edge(VEdge(1, NbPath+1)));
|
|
||||||
else
|
|
||||||
Vertex(1, NbPath+1) =
|
|
||||||
TopExp::FirstVertex(TopoDS::Edge(VEdge(1, NbPath+1)));
|
|
||||||
UpdateVertex(ILast-1, 1,
|
|
||||||
TabErr(1, NbPath), Vi(NbPath+1), Vertex(1, NbPath+1 ));
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
Standard_Real u, v, aux;
|
|
||||||
Standard_Boolean ureverse;
|
|
||||||
for (isec=1; isec<=NbLaw+1; isec++) {
|
|
||||||
// Return data
|
|
||||||
if (isec >NbLaw) {
|
|
||||||
S = TabS(NbLaw, NbPath);
|
|
||||||
ureverse = UReverse(NbLaw, NbPath);
|
|
||||||
exuv = ExchUV(NbLaw, NbPath);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
S = TabS(isec, NbPath);
|
|
||||||
ureverse = UReverse(isec, NbPath);
|
|
||||||
exuv = ExchUV(isec, NbPath);
|
|
||||||
}
|
|
||||||
S->Bounds(UFirst, ULast, VFirst, VLast);
|
|
||||||
|
|
||||||
// Choice of parametres
|
// Choice of parameters
|
||||||
if (ureverse) {
|
if (ureverse) {
|
||||||
if (exuv) {
|
if (exuv) {
|
||||||
aux = VFirst; VFirst = VLast; VLast = aux;
|
aux = VFirst; VFirst = VLast; VLast = aux;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
aux = UFirst; UFirst = ULast; ULast = aux;
|
aux = UFirst; UFirst = ULast; ULast = aux;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
if (isec == NbLaw+1) {
|
|
||||||
u = ULast;
|
|
||||||
v = VLast;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if (exuv) {
|
|
||||||
u = ULast;
|
|
||||||
v = VFirst;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
u = UFirst;
|
|
||||||
v = VLast;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// construction of vertex
|
|
||||||
B.MakeVertex(TopoDS::Vertex(Vertex(isec, NbPath+1)),
|
|
||||||
S->Value(u,v),
|
|
||||||
mySec->VertexTol(isec-1, Vi(NbPath+1)));
|
|
||||||
}
|
}
|
||||||
|
if (isec!= NbLaw+1) {
|
||||||
|
u = UFirst;
|
||||||
|
v = VFirst;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
if (exuv) {
|
||||||
|
u = UFirst;
|
||||||
|
v = VLast;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
u = ULast;
|
||||||
|
v = VFirst;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// construction of vertices
|
||||||
|
B.MakeVertex(TopoDS::Vertex(Vertex(isec, 1)),
|
||||||
|
S->Value(u,v),
|
||||||
|
mySec->VertexTol(isec-1,Vi(1)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! LastShape.IsNull() && (ILast==myLoc->NbLaw()+1) ) {
|
||||||
|
mySec->Init(LastShape);
|
||||||
|
for (isec=1; isec<=NbLaw; isec++) {
|
||||||
|
E = mySec->CurrentEdge();
|
||||||
|
VEdge(isec, NbPath+1) = E;
|
||||||
|
if (E.Orientation() == TopAbs_REVERSED)
|
||||||
|
Vertex(isec+1, NbPath+1) = TopExp::FirstVertex(E);
|
||||||
|
else
|
||||||
|
Vertex(isec+1, NbPath+1) = TopExp::LastVertex(E);
|
||||||
|
UpdateVertex(ILast-1, isec+1, TabErr(isec, NbPath),
|
||||||
|
Vi(NbPath+1), Vertex(isec+1, NbPath+1));
|
||||||
|
}
|
||||||
|
if (VEdge(1, NbPath+1).Orientation() == TopAbs_REVERSED)
|
||||||
|
Vertex(1, NbPath+1) =
|
||||||
|
TopExp::LastVertex(TopoDS::Edge(VEdge(1, NbPath+1)));
|
||||||
|
else
|
||||||
|
Vertex(1, NbPath+1) =
|
||||||
|
TopExp::FirstVertex(TopoDS::Edge(VEdge(1, NbPath+1)));
|
||||||
|
UpdateVertex(ILast-1, 1,
|
||||||
|
TabErr(1, NbPath), Vi(NbPath+1), Vertex(1, NbPath+1 ));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
Standard_Real u, v, aux;
|
||||||
|
Standard_Boolean ureverse;
|
||||||
|
for (isec=1; isec<=NbLaw+1; isec++) {
|
||||||
|
// Return data
|
||||||
|
if (isec >NbLaw) {
|
||||||
|
S = TabS(NbLaw, NbPath);
|
||||||
|
ureverse = UReverse(NbLaw, NbPath);
|
||||||
|
exuv = ExchUV(NbLaw, NbPath);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
S = TabS(isec, NbPath);
|
||||||
|
ureverse = UReverse(isec, NbPath);
|
||||||
|
exuv = ExchUV(isec, NbPath);
|
||||||
|
}
|
||||||
|
S->Bounds(UFirst, ULast, VFirst, VLast);
|
||||||
|
|
||||||
|
// Choice of parametres
|
||||||
|
if (ureverse) {
|
||||||
|
if (exuv) {
|
||||||
|
aux = VFirst; VFirst = VLast; VLast = aux;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
aux = UFirst; UFirst = ULast; ULast = aux;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (isec == NbLaw+1) {
|
||||||
|
u = ULast;
|
||||||
|
v = VLast;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
if (exuv) {
|
||||||
|
u = ULast;
|
||||||
|
v = VFirst;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
u = UFirst;
|
||||||
|
v = VLast;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// construction of vertex
|
||||||
|
B.MakeVertex(TopoDS::Vertex(Vertex(isec, NbPath+1)),
|
||||||
|
S->Value(u,v),
|
||||||
|
mySec->VertexTol(isec-1, Vi(NbPath+1)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
24
tests/bugs/modalg_5/bug23903
Executable file
24
tests/bugs/modalg_5/bug23903
Executable file
@ -0,0 +1,24 @@
|
|||||||
|
puts "============"
|
||||||
|
puts "OCC23903"
|
||||||
|
puts "============"
|
||||||
|
puts ""
|
||||||
|
#######################################################################
|
||||||
|
# Invalid result of pipe operation on closed path
|
||||||
|
#######################################################################
|
||||||
|
|
||||||
|
restore [locate_data_file bug23903_base.brep] sh
|
||||||
|
restore [locate_data_file bug23903_path.brep] w
|
||||||
|
|
||||||
|
pipe result w sh
|
||||||
|
|
||||||
|
set nb_v_good 2
|
||||||
|
set nb_e_good 5
|
||||||
|
set nb_w_good 3
|
||||||
|
set nb_f_good 3
|
||||||
|
set nb_sh_good 2
|
||||||
|
set nb_sol_good 2
|
||||||
|
set nb_compsol_good 0
|
||||||
|
set nb_compound_good 1
|
||||||
|
set nb_shape_good 18
|
||||||
|
|
||||||
|
set 2dviewer 1
|
||||||
Loading…
x
Reference in New Issue
Block a user