To implement issue 0019962: MakePipeBiNormalAlongAxis implementation.

[modules/geom.git] / src / NMTTools / NMTTools_PaveFiller_3.cxx

diff --git a/src/NMTTools/NMTTools_PaveFiller_3.cxx b/src/NMTTools/NMTTools_PaveFiller_3.cxx
index 7869f87d03432b566e38c77e2b68173b91c04658..ca458c3292f7e8918ef25abad89ede80a32b0f91 100644 (file)
--- a/src/NMTTools/NMTTools_PaveFiller_3.cxx
+++ b/src/NMTTools/NMTTools_PaveFiller_3.cxx
@@ -1,18 +1,18 @@
 // Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
+// License as published by the Free Software Foundation; either 
 // version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// 
+// This library is distributed in the hope that it will be useful 
+// but WITHOUT ANY WARRANTY; without even the implied warranty of 
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
 // Lesser General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
+// You should have received a copy of the GNU Lesser General Public  
+// License along with this library; if not, write to the Free Software 
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
@@ -30,11 +30,15 @@
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Face.hxx>
 
+#include <TopExp_Explorer.hxx>
+
 #include <BOPTools_VSInterference.hxx>
 #include <BOPTools_CArray1OfVSInterference.hxx>
 
+#include <NMTDS_Iterator.hxx>
 #include <NMTDS_ShapesDataStructure.hxx>
-#include <TopExp_Explorer.hxx>
+#include <NMTDS_InterfPool.hxx>
+
 
 // Modified  Thu Sep 14 14:35:18 2006 
 // Contribution of Samtech www.samcef.com BEGIN
@@ -50,71 +54,76 @@ static
 {
   myIsDone=Standard_False;
   //
-  Standard_Boolean aJustAddInterference;
+  Standard_Boolean aJustAdd;
   Standard_Integer n1, n2, anIndexIn, aFlag, aWhat, aWith, aNbVSs, aBlockLength, iSDV;
   Standard_Real aU, aV;
   TopoDS_Vertex aV1;
   TopoDS_Face aF2;
   //
-  BOPTools_CArray1OfVSInterference& aVSs=myIntrPool->VSInterferences();
+  BOPTools_CArray1OfVSInterference& aVSs=myIP->VSInterferences();
   //
   // V/E Interferences 
-  myDSIt.Initialize(TopAbs_VERTEX, TopAbs_FACE);
+  myDSIt->Initialize(TopAbs_VERTEX, TopAbs_FACE);
   //
   // BlockLength correction
-  aNbVSs=ExpectedPoolLength();
+  aNbVSs=myDSIt->BlockLength();
   aBlockLength=aVSs.BlockLength();
   if (aNbVSs > aBlockLength) {
     aVSs.SetBlockLength(aNbVSs);
   }
   //
-  for (; myDSIt.More(); myDSIt.Next()) {
-    myDSIt.Current(n1, n2, aJustAddInterference);
-    //
-    if (! myIntrPool->IsComputed(n1, n2)) {
-      if (! IsSuccesstorsComputed(n1, n2)) {
-       anIndexIn=0;
-       aWhat=n1; // Vertex
-       aWith=n2; // Face
-       SortTypes(aWhat, aWith);
-       //
-       iSDV=FindSDVertex(aWhat);
-       //
-       if(aJustAddInterference) {
-         myIntrPool->AddInterference(aWhat, aWith, BooleanOperations_VertexSurface, anIndexIn);
-         continue;
-       }
-       //
-       aV1=TopoDS::Vertex(myDS->Shape(aWhat));
-       if (iSDV) {
-         aV1=TopoDS::Vertex(myDS->Shape(iSDV));
-       }
+  for (; myDSIt->More(); myDSIt->Next()) {
+    myDSIt->Current(n1, n2, aJustAdd);
+    if (! IsSuccessorsComputed(n1, n2)) {
+      anIndexIn=0;
+      aWhat=n1; // Vertex
+      aWith=n2; // Face
+      if (myDS->GetShapeType(n1)==TopAbs_FACE) {
+       aWhat=n2;
+       aWith=n1;
+      }
+      //
+      iSDV=FindSDVertex(aWhat);
        //
-       aF2=TopoDS::Face(myDS->Shape(aWith));
+      if(aJustAdd) {
+       //myIntrPool->AddInterference(aWhat, aWith, BooleanOperations_VertexSurface, anIndexIn);
+       continue;
+      }
+      //
+      aV1=TopoDS::Vertex(myDS->Shape(aWhat));
+      if (iSDV) {
+       aV1=TopoDS::Vertex(myDS->Shape(iSDV));
+      }
        //
-       // Modified  Thu Sep 14 14:35:18 2006 
-       // Contribution of Samtech www.samcef.com BEGIN
-       if (Contains(aF2, aV1)) {
-         continue;
-       }
-       // Contribution of Samtech www.samcef.com END
+      aF2=TopoDS::Face(myDS->Shape(aWith));
+      //
+      // Modified  Thu Sep 14 14:35:18 2006 
+      // Contribution of Samtech www.samcef.com BEGIN
+      if (Contains(aF2, aV1)) {
+       continue;
+      }
+      // Contribution of Samtech www.samcef.com END
+      //
+      aFlag=myContext.ComputeVS (aV1, aF2, aU, aV);
+      //
+      if (!aFlag) {
        //
-       aFlag=myContext.ComputeVS (aV1, aF2, aU, aV);
+       // Add Interference to the Pool
+       BOPTools_VSInterference anInterf (aWhat, aWith, aU, aV);
+       anIndexIn=aVSs.Append(anInterf);
        //
-       if (!aFlag) {
-         //
-         // Add Interference to the Pool
-         BOPTools_VSInterference anInterf (aWhat, aWith, aU, aV);
-         anIndexIn=aVSs.Append(anInterf);
-         //
-         // SetState for Vertex in DS;
-         myDS->SetState (aWhat, BooleanOperations_ON);
-         // Insert Vertex in Interference Object
-         BOPTools_VSInterference& aVS=aVSs(anIndexIn);
-         aVS.SetNewShape(aWhat);
+       // SetState for Vertex in DS;
+       myDS->SetState (aWhat, BooleanOperations_ON);
+       // Insert Vertex in Interference Object
+       BOPTools_VSInterference& aVS=aVSs(anIndexIn);
+       aVS.SetNewShape(aWhat);
+       // qqf
+       {
+         myIP->Add(aWhat, aWith, Standard_True, NMTDS_TI_VF);
        }
-       myIntrPool->AddInterference(aWhat, aWith, BooleanOperations_VertexSurface, anIndexIn);
+       // qqt
       }
+      //myIntrPool->AddInterference(aWhat, aWith, BooleanOperations_VertexSurface, anIndexIn);
     }
   }
   myIsDone=Standard_True;