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

0033736: Shape Healing - Recursively update ShapeBuild_ReShape in ShapeCustom::ApplyModifier

Browse Source 
Passed ShapeBuild_ReShape to recursive call to retrieve complete change history
This commit is contained in:
FtpSantos 2024-08-06 11:28:42 +01:00 committed by oan
parent f0620a8d65
commit f830959be3
1 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/ShapeCustom/ShapeCustom.cxx
View File

@ -36,6 +36,41 @@
#include <Message_ProgressScope.hxx> #include <Message_ProgressScope.hxx>
namespace
{
//=======================================================================
//function : UpdateShapeBuild
//purpose : Recursively updates ShapeBuild_ReShape to add information of all sub-shapes
//=======================================================================
void UpdateShapeBuild (const TopoDS_Shape& theShape,
const BRepTools_Modifier& theModifier,
const Handle(ShapeBuild_ReShape)& theReShape)
{
for (TopoDS_Iterator anIterator (theShape, Standard_False); anIterator.More(); anIterator.Next())
{
const TopoDS_Shape& aCurrent = anIterator.Value();
TopoDS_Shape aResult;
try
{
OCC_CATCH_SIGNALS
aResult = theModifier.ModifiedShape (aCurrent);
}
catch (Standard_NoSuchObject const &)
{
// the sub shape isn't in the map
aResult.Nullify();
}
if (!aResult.IsNull() && !aCurrent.IsSame (aResult))
{
theReShape->Replace (aCurrent, aResult);
UpdateShapeBuild (aCurrent, theModifier, theReShape);
}
}
}
}
//======================================================================= //=======================================================================
//function : ApplyModifier //function : ApplyModifier
//purpose : static //purpose : static
@ -69,7 +104,7 @@ TopoDS_Shape ShapeCustom::ApplyModifier (const TopoDS_Shape &S,
if ( context.IsBound ( shape ) ) if ( context.IsBound ( shape ) )
res = context.Find ( shape ).Oriented ( shape.Orientation() ); res = context.Find ( shape ).Oriented ( shape.Orientation() );
else else
res = ApplyModifier ( shape, M, context ,MD, aRange); res = ApplyModifier ( shape, M, context ,MD, aRange, aReShape );
if ( ! res.IsSame ( shape ) ) { if ( ! res.IsSame ( shape ) ) {
context.Bind ( shape, res ); context.Bind ( shape, res );
@ -98,26 +133,7 @@ TopoDS_Shape ShapeCustom::ApplyModifier (const TopoDS_Shape &S,
if ( !aPS.More() || !MD.IsDone() ) return S; if ( !aPS.More() || !MD.IsDone() ) return S;
if ( !aReShape.IsNull() ) if ( !aReShape.IsNull() )
{ {
for(TopoDS_Iterator theIterator(SF,Standard_False);theIterator.More();theIterator.Next()) UpdateShapeBuild (SF, MD, aReShape);
{
const TopoDS_Shape & current = theIterator.Value();
TopoDS_Shape result;
try
{
OCC_CATCH_SIGNALS
result = MD.ModifiedShape( current );
}
catch (Standard_NoSuchObject const&)
{
// the sub shape isn't in the map
result.Nullify();
}
if (!result.IsNull() && !current.IsSame(result))
{
aReShape->Replace(current, result);
}
}
} }
return MD.ModifiedShape(SF).Oriented(S.Orientation()); return MD.ModifiedShape(SF).Oriented(S.Orientation());