OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0030593: Modeling Algorithms - ShapeUpgrade_ShapeDivide::Perform() throws Standard_NoMoreObject

Browse Source 
Added missing TopExp_Explorer::More() checks to ShapeUpgrade_ShapeDivide::Perform() and BRepCheck_Analyzer::Perform().
This commit is contained in:
kgv 2019-03-19 11:24:21 +03:00 committed by apn
parent 85831628d6
commit 2328cae25d
2 changed files with 46 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/BRepCheck/BRepCheck_Analyzer.cxx
View File

@ -147,7 +147,6 @@ void BRepCheck_Analyzer::Perform(const TopoDS_Shape& S)
if ( ! aRes.IsNull() )
{
aRes->SetFailStatus(exp.Current());
aRes->SetFailStatus(S);
}
}

78
src/ShapeUpgrade/ShapeUpgrade_ShapeDivide.cxx
View File

@ -193,41 +193,55 @@ Standard_Boolean ShapeUpgrade_ShapeDivide::Perform(const Standard_Boolean newCon
}
Message_Msg doneMsg = GetFaceMsg();
for(TopExp_Explorer exp(myShape,TopAbs_FACE); exp.More(); exp.Next()) {
//smh#8
for (TopExp_Explorer exp (myShape,TopAbs_FACE); exp.More(); exp.Next())
{
TopoDS_Shape tmpF = exp.Current().Oriented ( TopAbs_FORWARD );
TopoDS_Face F = TopoDS::Face (tmpF); // protection against INTERNAL shapes: cts20105a.rle
TopoDS_Shape sh = myContext->Apply ( F, TopAbs_SHAPE );
for (TopExp_Explorer exp2(sh,TopAbs_FACE); exp2.More(); exp2.Next()) {
//szv: try-catch added
try {
OCC_CATCH_SIGNALS
for (; exp2.More(); exp2.Next()) {
TopoDS_Face face = TopoDS::Face ( exp2.Current() );
SplitFace->Init(face);
SplitFace->SetContext(myContext);
SplitFace->Perform();
if(SplitFace->Status(ShapeExtend_FAIL)) {
myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_FAIL2 );
}
if(SplitFace->Status(ShapeExtend_DONE)) {
myContext->Replace(face,SplitFace->Result());
SendMsg( face, doneMsg, Message_Info );
if(SplitFace->Status(ShapeExtend_DONE1))
myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_DONE1 );
if(SplitFace->Status(ShapeExtend_DONE2))
myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_DONE2 );
}
}
}
catch (Standard_Failure const& anException) {
#ifdef OCCT_DEBUG
cout << "\nError: Exception in ShapeUpgrade_FaceDivide::Perform(): ";
anException.Print(cout); cout << endl;
#endif
(void)anException;
myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_FAIL2 );
}
for (TopExp_Explorer exp2 (sh,TopAbs_FACE); exp2.More(); exp2.Next())
{
try
{
OCC_CATCH_SIGNALS
for (; exp2.More(); exp2.Next())
{
TopoDS_Face face = TopoDS::Face (exp2.Current());
SplitFace->Init(face);
SplitFace->SetContext(myContext);
SplitFace->Perform();
if (SplitFace->Status (ShapeExtend_FAIL))
{
myStatus |= ShapeExtend::EncodeStatus (ShapeExtend_FAIL2);
}
if (SplitFace->Status (ShapeExtend_DONE))
{
myContext->Replace (face, SplitFace->Result());
SendMsg (face, doneMsg, Message_Info);
if (SplitFace->Status (ShapeExtend_DONE1))
{
myStatus |= ShapeExtend::EncodeStatus (ShapeExtend_DONE1);
}
if (SplitFace->Status (ShapeExtend_DONE2))
{
myStatus |= ShapeExtend::EncodeStatus (ShapeExtend_DONE2);
}
}
}
}
catch (Standard_Failure const& anException)
{
#ifdef OCCT_DEBUG
std::cout << "\nError: Exception in ShapeUpgrade_FaceDivide::Perform(): ";
anException.Print (std::cout); std::cout << std::endl;
#endif
(void )anException;
myStatus |= ShapeExtend::EncodeStatus (ShapeExtend_FAIL2);
}
if (!exp2.More())
{
break;
}
}
}
}