0021672: [CEA 565] Dump Study from script

[modules/geom.git] / src / GEOMAlgo / GEOMAlgo_Builder_3.cxx

diff --git a/src/GEOMAlgo/GEOMAlgo_Builder_3.cxx b/src/GEOMAlgo/GEOMAlgo_Builder_3.cxx
index 79b42d1df3c1dc901ea90fd0c92c698ff99b46d7..066cc9c7d6cc23a520c50abf174afd46e995e323 100755 (executable)
--- a/src/GEOMAlgo/GEOMAlgo_Builder_3.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_Builder_3.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,24 +18,13 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
+//
 //  File    : GEOMAlgo_Builder_3.cxx
+//  Created :
 //  Author  : Peter KURNEV
 
 #include <GEOMAlgo_Builder.hxx>
 
-#include <Basics_OCCTVersion.hxx>
-
-#include <GEOMAlgo_Tools3D.hxx>
-#include <GEOMAlgo_BuilderSolid.hxx>
-#include <GEOMAlgo_ShapeSet.hxx>
-#include <GEOMAlgo_DataMapOfShapeShapeSet.hxx>
-#include <GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx>
-
-#include <NMTTools_PaveFiller.hxx>
-
-#include <NMTDS_ShapesDataStructure.hxx>
-
 #include <TopAbs_State.hxx>
 
 #include <TopoDS.hxx>
@@ -68,6 +57,16 @@
 
 #include <IntTools_Context.hxx>
 
+#include <NMTDS_ShapesDataStructure.hxx>
+#include <NMTTools_PaveFiller.hxx>
+
+#include <GEOMAlgo_Tools3D.hxx>
+#include <GEOMAlgo_BuilderSolid.hxx>
+#include <GEOMAlgo_ShapeSet.hxx>
+#include <GEOMAlgo_DataMapOfShapeShapeSet.hxx>
+#include <GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx>
+
+
 
 static
   void OwnInternalShapes(const TopoDS_Shape& ,
@@ -96,11 +95,7 @@ void GEOMAlgo_Builder::BuildDraftSolid (const TopoDS_Shape& theSolid,
   myErrorStatus=0;
   //
   NMTTools_PaveFiller* pPF=myPaveFiller;
-#if OCC_VERSION_LARGE > 0x06050200
-  const Handle(IntTools_Context)& aCtx=pPF->Context();
-#else
-  IntTools_Context& aCtx=pPF->ChangeContext();
-#endif
+  const Handle(IntTools_Context)& aCtx= pPF->Context();
   //
   Standard_Boolean bToReverse;
   Standard_Integer  iFlag;
@@ -193,11 +188,7 @@ void GEOMAlgo_Builder::BuildDraftSolid (const TopoDS_Shape& theSolid,
   //
   const NMTDS_ShapesDataStructure& aDS=*myPaveFiller->DS();
   NMTTools_PaveFiller* pPF=myPaveFiller;
-#if OCC_VERSION_LARGE > 0x06050200
-  const Handle(IntTools_Context)& aCtx=pPF->Context();
-#else
-  IntTools_Context& aCtx=pPF->ChangeContext();
-#endif
+  const Handle(IntTools_Context)& aCtx= pPF->Context();
   //
   Standard_Boolean bIsIN, bHasImage;
   Standard_Integer aNbS, aNbSolids, i, j, aNbFaces, aNbFP, aNbFPx, aNbFIN, aNbLIF;
@@ -430,11 +421,7 @@ void GEOMAlgo_Builder::BuildDraftSolid (const TopoDS_Shape& theSolid,
   //
   const NMTDS_ShapesDataStructure& aDS=*myPaveFiller->DS();
   NMTTools_PaveFiller* pPF=myPaveFiller;
-#if OCC_VERSION_LARGE > 0x06050200
-  const Handle(IntTools_Context)& aCtx=pPF->Context();
-#else
-  IntTools_Context& aCtx=pPF->ChangeContext();
-#endif
+  const Handle(IntTools_Context)& aCtx= pPF->Context();
   //
   Standard_Integer i, aNbS, iErr;
   TopExp_Explorer aExp;
@@ -533,9 +520,7 @@ void GEOMAlgo_Builder::BuildDraftSolid (const TopoDS_Shape& theSolid,
     //modified by NIZNHY-PKV Wed Oct 27 09:53:18 2010t
     //
     // 1.3 Build new solids
-#if OCC_VERSION_LARGE > 0x06050200
     aSB.SetContext(aCtx);
-#endif
     aSB.SetShapes(aSFS1);
     aSB.Perform();
     iErr=aSB.ErrorStatus();
@@ -579,11 +564,7 @@ void GEOMAlgo_Builder::BuildDraftSolid (const TopoDS_Shape& theSolid,
   //
   const NMTDS_ShapesDataStructure& aDS=*myPaveFiller->DS();
   NMTTools_PaveFiller* pPF=myPaveFiller;
-#if OCC_VERSION_LARGE > 0x06050200
   const Handle(IntTools_Context)& aCtx= pPF->Context();
-#else
-  IntTools_Context& aCtx= pPF->ChangeContext();
-#endif
   //
   //Standard_Boolean bHasImage;
   Standard_Integer i, j, jT, aNbS, aNbSI, aNbSx, aNbSd;