From: vsr <vsr@opencascade.com>
Date: Fri, 28 Dec 2012 05:25:50 +0000 (+0000)
Subject: Fix problem with invalid shape generation in MakePipe function: replace previous... 
X-Git-Tag: V6_main_FINAL~74
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=77a98edebe9a881d2e4ef9a5cf2670310d9c530c;p=modules%2Fgeom.git

Fix problem with invalid shape generation in MakePipe function: replace previous fix for bug 0020207 (gluing of faces in the end of pipe operation) but new one implemented in OCCT (OCC23606).
---

diff --git a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx
index 530d38012..9812da16a 100644
--- a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx
@@ -97,6 +97,13 @@
 
 #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
 //purpose  :
@@ -2477,6 +2484,8 @@ Standard_Integer GEOMImpl_PipeDriver::Execute (TFunction_Logbook& log) const
   }
 
   // Glue (for bug 0020207)
+  // No gluing is needed as the bug 0020207 is fixed in OCCT.
+#ifdef GLUE_0020207
   TopExp_Explorer anExpV (aShape, TopAbs_VERTEX);
   if (anExpV.More()) {
     Standard_Real aVertMaxTol = -RealLast();
@@ -2490,6 +2499,7 @@ Standard_Integer GEOMImpl_PipeDriver::Execute (TFunction_Logbook& log) const
     aShape = GEOMImpl_GlueDriver::GlueFaces(aShape, aVertMaxTol, Standard_True);
     //aShape = GEOMImpl_GlueDriver::GlueFaces(aShape, Precision::Confusion(), Standard_True);
   }
+#endif
 
   TopoDS_Shape aRes = GEOMUtils::CompsolidToCompound(aShape);
   aFunction->SetValue(aRes);