ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-14 09:38:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'origin/V7_dev' into V8_0_0_BR

Browse Source
This commit is contained in:
vsr 2016-02-05 17:24:15 +03:00
commit f7d9823966
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/GEOM/GEOM_Engine.cxx
View File

@ -1278,6 +1278,8 @@ void FillMapOfRef(const Handle(GEOM_Function) &theFunction,
const int aRefTag = GetTag(anObjEntry); const int aRefTag = GetTag(anObjEntry);
if (anObjTag != aRefTag) {
// Avoid making references for operations without copy.
theRefMap[anObjTag].push_back(aRefTag); theRefMap[anObjTag].push_back(aRefTag);
} }
} }
@ -1285,6 +1287,7 @@ void FillMapOfRef(const Handle(GEOM_Function) &theFunction,
} }
} }
} }
}
//============================================================================= //=============================================================================
/*! /*!

7
src/GEOMImpl/GEOMImpl_PipeDriver.cxx
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();