0024002: Overall code and build procedure refactoring -- automatic

[occt.git] / src / BRepLib / BRepLib_MakeWire_1.cxx

diff --git a/src/BRepLib/BRepLib_MakeWire_1.cxx b/src/BRepLib/BRepLib_MakeWire_1.cxx
old mode 100755 (executable)
new mode 100644 (file)
index 114a515..8a065f5
--- a/src/BRepLib/BRepLib_MakeWire_1.cxx
+++ b/src/BRepLib/BRepLib_MakeWire_1.cxx
@@ -1,35 +1,46 @@
-// File:       BRepLib_MakeWire_1.cxx
-// Created:    Wed May 20 07:30:03 1998
-// Author:     Didier PIFFAULT
-//             <dpf@motox.paris1.matra-dtv.fr>
+// Created on: 1998-05-20
+// Created by: Didier PIFFAULT
+// Copyright (c) 1998-1999 Matra Datavision
+// Copyright (c) 1999-2014 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
 
 
-#include <BRepLib_MakeWire.ixx>
-#include <BRepLib.hxx>
-#include <TopTools_MapOfShape.hxx>
-#include <TopTools_MapOfOrientedShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfOrientedShape.hxx>
-#include <TopTools_DataMapOfShapeShape.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <BRep_Builder.hxx>
+#include <BRep_Tool.hxx>
+#include <BRepLib.hxx>
+#include <BRepLib_MakeWire.hxx>
+#include <gp_Pnt.hxx>
+#include <StdFail_NotDone.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopoDS_Edge.hxx>
 #include <TopoDS_Compound.hxx>
-#include <BRep_Tool.hxx>
-#include <gp_Pnt.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS_Vertex.hxx>
+#include <TopoDS_Wire.hxx>
+#include <TopTools_DataMapOfShapeShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-
+#include <TopTools_ListIteratorOfListOfShape.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <TopTools_MapIteratorOfMapOfOrientedShape.hxx>
+#include <TopTools_MapIteratorOfMapOfShape.hxx>
+#include <TopTools_MapOfOrientedShape.hxx>
+#include <TopTools_MapOfShape.hxx>
 
 //=======================================================================
 //function : Add
 //purpose  : Add the list of edges to the current wire
 //=======================================================================
-
 void  BRepLib_MakeWire::Add(const TopTools_ListOfShape& L)
 {
   myError = BRepLib_WireDone;
@@ -64,11 +75,7 @@ void  BRepLib_MakeWire::Add(const TopTools_ListOfShape& L)
          rlist.Prepend(edVer);
          nlist.Prepend(edVer);
          if (!mapLocale.Contains(edVer)) {
-#ifndef DEB
            Standard_Boolean notYetFound = Standard_True;
-#else
-           Standard_Boolean notYetFound;
-#endif
            Standard_Real gap=BRep_Tool::Tolerance(edVer);
            gp_Pnt pVer=BRep_Tool::Pnt(edVer);
            for (itMS.Initialize(mapLocale); itMS.More(); itMS.Next()) {
@@ -91,7 +98,6 @@ void  BRepLib_MakeWire::Add(const TopTools_ListOfShape& L)
          TopoDS_Edge newEd=TopoDS::Edge(aLocalShape);
 //       TopoDS_Edge newEd=TopoDS::Edge(curEd.EmptyCopied());
          BB.Transfert(curEd, newEd);
-         newEd.Closed(curEd.Closed());
          TopTools_ListIteratorOfListOfShape itV(nlist);
          for (; itV.More(); itV.Next()) {
            BB.Add(newEd, itV.Value());
@@ -119,11 +125,7 @@ void  BRepLib_MakeWire::Add(const TopTools_ListOfShape& L)
       TopoDS_Vertex vf, vl;
       TopoDS_Shape theKey;
       Standard_Boolean usedVertex;
-#ifndef DEB
       Standard_Boolean closedEdge = Standard_False;
-#else
-      Standard_Boolean closedEdge;
-#endif
       Standard_Integer vvInd, lastInd;
       do {
        if (!VL.IsNull() && lesMeres.Contains(VL)) {