0052840: Fuse fails if "Remove extra edges" is ON

This commit is contained in:
skv 2016-02-04 16:29:39 +03:00
parent 78b2a5e0da
commit e087bbd063

View File

@ -180,6 +180,8 @@ static GeomFill_Trihedron EvaluateBestSweepMode(const TopoDS_Shape& Spine)
//======================================================================= //=======================================================================
static Standard_Boolean BuildPipeShell(BRepOffsetAPI_MakePipeShell &theBuilder) static Standard_Boolean BuildPipeShell(BRepOffsetAPI_MakePipeShell &theBuilder)
{ {
theBuilder.SetForceApproxC1(Standard_True);
theBuilder.Build(); theBuilder.Build();
Standard_Boolean isDone = theBuilder.IsDone(); Standard_Boolean isDone = theBuilder.IsDone();
@ -3125,7 +3127,8 @@ Standard_Integer GEOMImpl_PipeDriver::Execute (TFunction_Logbook& log) const
else else
{ {
GeomFill_Trihedron theBestMode = EvaluateBestSweepMode(aWirePath); GeomFill_Trihedron theBestMode = EvaluateBestSweepMode(aWirePath);
BRepOffsetAPI_MakePipe aMkPipe(aWirePath, aShapeBase, theBestMode); BRepOffsetAPI_MakePipe aMkPipe
(aWirePath, aShapeBase, theBestMode, Standard_True);
if (aMkPipe.IsDone() && aMkPipe.ErrorOnSurface() <= TolPipeSurf) { if (aMkPipe.IsDone() && aMkPipe.ErrorOnSurface() <= TolPipeSurf) {
aShape = aMkPipe.Shape(); aShape = aMkPipe.Shape();
@ -3137,7 +3140,7 @@ Standard_Integer GEOMImpl_PipeDriver::Execute (TFunction_Logbook& log) const
} else if (theBestMode != GeomFill_IsDiscreteTrihedron) { } else if (theBestMode != GeomFill_IsDiscreteTrihedron) {
// Try to use Descrete Trihedron mode. // Try to use Descrete Trihedron mode.
BRepOffsetAPI_MakePipe aMkPipeDescrete BRepOffsetAPI_MakePipe aMkPipeDescrete
(aWirePath, aShapeBase, GeomFill_IsDiscreteTrihedron); (aWirePath, aShapeBase, GeomFill_IsDiscreteTrihedron, Standard_True);
if (aMkPipeDescrete.IsDone()) { if (aMkPipeDescrete.IsDone()) {
aShape = aMkPipeDescrete.Shape(); aShape = aMkPipeDescrete.Shape();