0024002: Overall code and build procedure refactoring -- automatic

[occt.git] / src / BRepFeat / BRepFeat_Builder.cxx

diff --git a/src/BRepFeat/BRepFeat_Builder.cxx b/src/BRepFeat/BRepFeat_Builder.cxx
index 7fa83fb..280d8ca 100644 (file)
--- a/src/BRepFeat/BRepFeat_Builder.cxx
+++ b/src/BRepFeat/BRepFeat_Builder.cxx
@@ -4,8 +4,8 @@
 //
 // 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 version 2.1 as published
+// 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.
@@ -13,44 +13,33 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <BRepFeat_Builder.ixx>
-
-#include <Precision.hxx>
-
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Edge.hxx>
-
-#include <TopExp_Explorer.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-
-#include <Geom_Curve.hxx>
-
-#include <BRep_Tool.hxx>
-#include <BRep_Builder.hxx>
-
-#include <BRepBndLib.hxx>
-
-#include <IntTools_Tools.hxx>
 
+#include <BOPAlgo_BuilderFace.hxx>
+#include <BOPCol_DataMapOfShapeListOfShape.hxx>
 #include <BOPDS_DS.hxx>
-#include <BOPDS_ShapeInfo.hxx>
 #include <BOPDS_FaceInfo.hxx>
-#include <BOPDS_Pave.hxx>
 #include <BOPDS_ListOfPave.hxx>
 #include <BOPDS_ListOfPaveBlock.hxx>
 #include <BOPDS_MapOfPaveBlock.hxx>
-
-#include <BOPAlgo_BuilderFace.hxx>
-
+#include <BOPDS_Pave.hxx>
+#include <BOPDS_ShapeInfo.hxx>
 #include <BOPTools.hxx>
 #include <BOPTools_AlgoTools.hxx>
 #include <BOPTools_AlgoTools2D.hxx>
 #include <BOPTools_AlgoTools3D.hxx>
-#include <BOPTools_AlgoTools3D.hxx>
 #include <BOPTools_MapOfSet.hxx>
-
-#include <BOPCol_DataMapOfShapeListOfShape.hxx>
+#include <BRep_Builder.hxx>
+#include <BRep_Tool.hxx>
+#include <BRepBndLib.hxx>
+#include <BRepFeat_Builder.hxx>
+#include <Geom_Curve.hxx>
+#include <IntTools_Tools.hxx>
+#include <Precision.hxx>
+#include <TopExp_Explorer.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS_Face.hxx>
+#include <TopoDS_Shape.hxx>
+#include <TopTools_ListIteratorOfListOfShape.hxx>
 
 //=======================================================================
 //function : 
@@ -198,19 +187,23 @@
   void BRepFeat_Builder::FillRemoved()
 {
   TopExp_Explorer aExp;
-  aExp.Init(myArgs[0], TopAbs_SOLID);
+  //
+  const TopoDS_Shape& aArgs0=myArguments.First();
+  const TopoDS_Shape& aArgs1=myTools.First();
+  //
+  aExp.Init(aArgs0, TopAbs_SOLID);
   for (; aExp.More(); aExp.Next()) {
     const TopoDS_Shape& aS = aExp.Current();
     myImages.UnBind(aS);
   }
   //
-  if (!myImages.IsBound(myArgs[1])) {
+  if (!myImages.IsBound(aArgs1)) {
     return;
   }
   //
   BOPCol_ListIteratorOfListOfShape aItIm;
   //
-  BOPCol_ListOfShape& aLS = myImages.ChangeFind(myArgs[1]);
+  BOPCol_ListOfShape& aLS = myImages.ChangeFind(aArgs1);
   aItIm.Initialize(aLS);
   for (; aItIm.More(); aItIm.Next()) {
     const TopoDS_Shape& aS = aItIm.Value();
@@ -675,8 +668,11 @@
   BOPCol_ListIteratorOfListOfShape aIt;
   TopExp_Explorer aExp, aExpF;
   Standard_Boolean bFlagSD;
+  // 
+  const TopoDS_Shape& aArgs0=myArguments.First();
+  const TopoDS_Shape& aArgs1=myTools.First();
   //
-  const BOPCol_ListOfShape& aLSIm = myImages.Find(myArgs[1]);
+  const BOPCol_ListOfShape& aLSIm = myImages.Find(aArgs1);
   aIt.Initialize(aLSIm);
   for(;aIt.More();aIt.Next()) {
     const TopoDS_Shape& aSolIm = aIt.Value();
@@ -686,7 +682,7 @@
     aMST.Add(aST);
   }
   //
-  aExp.Init(myArgs[0], TopAbs_SOLID);
+  aExp.Init(aArgs0, TopAbs_SOLID);
   for(; aExp.More(); aExp.Next()) {
     const TopoDS_Shape& aSolid = aExp.Current();
     if (myImages.IsBound(aSolid)) {