ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-02-11 07:53:08 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix of regressions on pipe

Browse Source
This commit is contained in:
skv 2013-02-14 13:24:00 +00:00
parent 9e669d1bbb
commit bf84006866
1 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/GEOMImpl/GEOMImpl_PipeDriver.cxx
View File

@ -97,12 +97,6 @@
#include "utilities.h" #include "utilities.h"
//////////////////////////////////////////////////////////////////////////
// Uncomment below macro to perform gluing in the end of MakePipe operation
// as fix of issue 0020207.
//////////////////////////////////////////////////////////////////////////
//#define GLUE_0020207
//======================================================================= //=======================================================================
//function : GetID //function : GetID
@ -2483,9 +2477,8 @@ Standard_Integer GEOMImpl_PipeDriver::Execute (TFunction_Logbook& log) const
Standard_ConstructionError::Raise("Algorithm have produced an invalid shape result"); Standard_ConstructionError::Raise("Algorithm have produced an invalid shape result");
} }
// Glue (for bug 0020207) if (aType != PIPE_BASE_PATH &&
// No gluing is needed as the bug 0020207 is fixed in OCCT. aType != PIPE_SHELLS_WITHOUT_PATH) {
#ifdef GLUE_0020207
TopExp_Explorer anExpV (aShape, TopAbs_VERTEX); TopExp_Explorer anExpV (aShape, TopAbs_VERTEX);
if (anExpV.More()) { if (anExpV.More()) {
Standard_Real aVertMaxTol = -RealLast(); Standard_Real aVertMaxTol = -RealLast();
@ -2499,7 +2492,7 @@ Standard_Integer GEOMImpl_PipeDriver::Execute (TFunction_Logbook& log) const
aShape = GEOMImpl_GlueDriver::GlueFaces(aShape, aVertMaxTol, Standard_True); aShape = GEOMImpl_GlueDriver::GlueFaces(aShape, aVertMaxTol, Standard_True);
//aShape = GEOMImpl_GlueDriver::GlueFaces(aShape, Precision::Confusion(), Standard_True); //aShape = GEOMImpl_GlueDriver::GlueFaces(aShape, Precision::Confusion(), Standard_True);
} }
#endif }
TopoDS_Shape aRes = GEOMUtils::CompsolidToCompound(aShape); TopoDS_Shape aRes = GEOMUtils::CompsolidToCompound(aShape);
aFunction->SetValue(aRes); aFunction->SetValue(aRes);