X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=blobdiff_plain;f=src%2FXSAlgo%2FXSAlgo_AlgoContainer.cxx;h=7b3c0f201d625fc4a125a9e1d961c5061ad7c8d6;hb=7e785937b3e65df86f35364e1036e446d6339cec;hpb=99289bed0a3c89d0fe9d2025d3452c0f66c7c9e1 diff --git a/src/XSAlgo/XSAlgo_AlgoContainer.cxx b/src/XSAlgo/XSAlgo_AlgoContainer.cxx index 20d1702650..7b3c0f201d 100644 --- a/src/XSAlgo/XSAlgo_AlgoContainer.cxx +++ b/src/XSAlgo/XSAlgo_AlgoContainer.cxx @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -97,7 +96,7 @@ TopoDS_Shape XSAlgo_AlgoContainer::ProcessShape (const TopoDS_Shape& shape, const Standard_CString prscfile, const Standard_CString pseq, Handle(Standard_Transient)& info, - const Handle(Message_ProgressIndicator)& progress, + const Message_ProgressRange& theProgress, const Standard_Boolean NonManifold) const { if ( shape.IsNull() ) return shape; @@ -110,8 +109,6 @@ TopoDS_Shape XSAlgo_AlgoContainer::ProcessShape (const TopoDS_Shape& shape, rscfile = prscfile; context = new ShapeProcess_ShapeContext(shape, rscfile); context->SetDetalisation(TopAbs_EDGE); - if ( !progress.IsNull() ) - context->SetProgress(progress); } context->SetNonManifold(NonManifold); info = context; @@ -146,7 +143,7 @@ TopoDS_Shape XSAlgo_AlgoContainer::ProcessShape (const TopoDS_Shape& shape, sfs->SetMaxTolerance ( maxTol ); sfs->FixFaceTool()->FixWireTool()->FixSameParameterMode() = Standard_False; sfs->FixSolidTool()->CreateOpenSolidMode() = Standard_False; - sfs->Perform(progress); + sfs->Perform(theProgress); TopoDS_Shape S = sfs->Shape(); if ( ! S.IsNull() && S != shape ) { @@ -173,7 +170,7 @@ TopoDS_Shape XSAlgo_AlgoContainer::ProcessShape (const TopoDS_Shape& shape, rsc->SetResource ( "Runtime.Tolerance", Prec ); rsc->SetResource ( "Runtime.MaxTolerance", maxTol ); - if ( !ShapeProcess::Perform(context, seq) ) + if ( !ShapeProcess::Perform(context, seq, theProgress) ) return shape; // return original shape return context->Result();