Merge branch 'master' into CR28720

1 link update for each new segment

src/HLRAlgo/HLRAlgo_PolyInternalData.cxx

@@ -20,7 +20,7 @@
 #include <Standard_Stream.hxx>
 #include <Standard_Type.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(HLRAlgo_PolyInternalData,Standard_Transient)
+IMPLEMENT_STANDARD_RTTIEXT(HLRAlgo_PolyInternalData, Standard_Transient)
 
 #ifdef OCCT_DEBUG
 static Standard_Integer HLRAlgo_PolyInternalData_TRACE = Standard_False;
@@ -44,9 +44,9 @@ HLRAlgo_PolyInternalData::HLRAlgo_PolyInternalData
 {
   Standard_Integer i;
   myMxPISeg = 2 + (3 * nbTri + nbNod) / 2;
-  myTData = new HLRAlgo_HArray1OfTData(0,myMxTData);
-  myPISeg = new HLRAlgo_HArray1OfPISeg(0,myMxPISeg);
-  myPINod = new HLRAlgo_HArray1OfPINod(0,myMxPINod);
+  myTData = new HLRAlgo_HArray1OfTData(0, myMxTData);
+  myPISeg = new HLRAlgo_HArray1OfPISeg(0, myMxPISeg);
+  myPINod = new HLRAlgo_HArray1OfPINod(0, myMxPINod);
 
   HLRAlgo_Array1OfPINod& PINod = myPINod->ChangeArray1();
   Handle(HLRAlgo_PolyInternalNode)* NN = &(PINod.ChangeValue(1));
@@ -61,24 +61,26 @@ HLRAlgo_PolyInternalData::HLRAlgo_PolyInternalData
 //function : UpdateLinks
 //purpose  :
 //=======================================================================
-void HLRAlgo_PolyInternalData::UpdateLinks (HLRAlgo_Array1OfTData& theTData,
+void HLRAlgo_PolyInternalData::UpdateLinks(HLRAlgo_Array1OfTData& theTData,
   HLRAlgo_Array1OfPISeg& thePISeg,
   HLRAlgo_Array1OfPINod& thePINod)
 {
-  Standard_Integer n1,n2;
-  Standard_Integer find,iiii,icsv = 0;
+  Standard_Integer n1, n2;
+  Standard_Integer find, iiii, icsv = 0;
   HLRAlgo_PolyInternalSegment* aSegIndices = NULL;
 
   Standard_Boolean newSeg = Standard_False;
   for (Standard_Integer i = 1; i <= myNbTData; i++)
   {
-    HLRAlgo_TriangleData* TD = &theTData.ChangeValue (i);
+    HLRAlgo_TriangleData* TD = &theTData.ChangeValue(i);
 
     HLRAlgo_PolyInternalNode::NodeIndices& A1 = thePINod.ChangeValue(TD->Node1)->Indices();
     HLRAlgo_PolyInternalNode::NodeIndices& A2 = thePINod.ChangeValue(TD->Node2)->Indices();
     HLRAlgo_PolyInternalNode::NodeIndices& A3 = thePINod.ChangeValue(TD->Node3)->Indices();
 
     bool notFound = true;
+
+    if (notFound)
     {
       n1 = TD->Node1;
       n2 = TD->Node2;
@@ -96,7 +98,7 @@ void HLRAlgo_PolyInternalData::UpdateLinks (HLRAlgo_Array1OfTData& theTData,
           find = 0;
 
           while (iiii != 0 && find == 0) {
-	  aSegIndices = &thePISeg.ChangeValue (iiii);
+            aSegIndices = &thePISeg.ChangeValue(iiii);
             if (aSegIndices->LstSg1 == n1) {
               if (aSegIndices->LstSg2 == n2) find = iiii;
               else                  iiii = aSegIndices->NxtSg1;
@@ -128,7 +130,7 @@ void HLRAlgo_PolyInternalData::UpdateLinks (HLRAlgo_Array1OfTData& theTData,
           if (iiii != 0) {
 
             while (iiii != 0) {
-	    aSegIndices = &thePISeg.ChangeValue (iiii);
+              aSegIndices = &thePISeg.ChangeValue(iiii);
               if (aSegIndices->LstSg1 == n2) { icsv = 1; iiii = aSegIndices->NxtSg1; }
               else { icsv = 2; iiii = aSegIndices->NxtSg2; }
             }
@@ -139,7 +141,7 @@ void HLRAlgo_PolyInternalData::UpdateLinks (HLRAlgo_Array1OfTData& theTData,
         }
       }
       if (newSeg) {
-      aSegIndices = &thePISeg.ChangeValue (myNbPISeg);
+        aSegIndices = &thePISeg.ChangeValue(myNbPISeg);
         aSegIndices->LstSg1 = n1;
         aSegIndices->LstSg2 = n2;
         aSegIndices->Conex1 = i;
@@ -167,7 +169,7 @@ void HLRAlgo_PolyInternalData::UpdateLinks (HLRAlgo_Array1OfTData& theTData,
           find = 0;
 
           while (iiii != 0 && find == 0) {
-    aSegIndices = &thePISeg.ChangeValue (iiii);
+            aSegIndices = &thePISeg.ChangeValue(iiii);
             if (aSegIndices->LstSg1 == n1) {
               if (aSegIndices->LstSg2 == n2) find = iiii;
               else                  iiii = aSegIndices->NxtSg1;
@@ -199,7 +201,7 @@ void HLRAlgo_PolyInternalData::UpdateLinks (HLRAlgo_Array1OfTData& theTData,
           if (iiii != 0) {
 
             while (iiii != 0) {
-      aSegIndices = &thePISeg.ChangeValue (iiii);
+              aSegIndices = &thePISeg.ChangeValue(iiii);
               if (aSegIndices->LstSg1 == n2) { icsv = 1; iiii = aSegIndices->NxtSg1; }
               else { icsv = 2; iiii = aSegIndices->NxtSg2; }
             }
@@ -210,7 +212,7 @@ void HLRAlgo_PolyInternalData::UpdateLinks (HLRAlgo_Array1OfTData& theTData,
         }
       }
       if (newSeg) {
-      aSegIndices = &thePISeg.ChangeValue (myNbPISeg);
+        aSegIndices = &thePISeg.ChangeValue(myNbPISeg);
         aSegIndices->LstSg1 = n1;
         aSegIndices->LstSg2 = n2;
         aSegIndices->Conex1 = i;
@@ -238,7 +240,7 @@ void HLRAlgo_PolyInternalData::UpdateLinks (HLRAlgo_Array1OfTData& theTData,
           find = 0;
 
           while (iiii != 0 && find == 0) {
-    aSegIndices = &thePISeg.ChangeValue (iiii);
+            aSegIndices = &thePISeg.ChangeValue(iiii);
             if (aSegIndices->LstSg1 == n1) {
               if (aSegIndices->LstSg2 == n2) find = iiii;
               else                  iiii = aSegIndices->NxtSg1;
@@ -270,7 +272,7 @@ void HLRAlgo_PolyInternalData::UpdateLinks (HLRAlgo_Array1OfTData& theTData,
           if (iiii != 0) {
 
             while (iiii != 0) {
-      aSegIndices = &thePISeg.ChangeValue (iiii);
+              aSegIndices = &thePISeg.ChangeValue(iiii);
               if (aSegIndices->LstSg1 == n2) { icsv = 1; iiii = aSegIndices->NxtSg1; }
               else { icsv = 2; iiii = aSegIndices->NxtSg2; }
             }
@@ -281,7 +283,7 @@ void HLRAlgo_PolyInternalData::UpdateLinks (HLRAlgo_Array1OfTData& theTData,
         }
       }
       if (newSeg) {
-      aSegIndices = &thePISeg.ChangeValue (myNbPISeg);
+        aSegIndices = &thePISeg.ChangeValue(myNbPISeg);
         aSegIndices->LstSg1 = n1;
         aSegIndices->LstSg2 = n2;
         aSegIndices->Conex1 = i;
@@ -297,7 +299,7 @@ void HLRAlgo_PolyInternalData::UpdateLinks (HLRAlgo_Array1OfTData& theTData,
 //function : AddNode
 //purpose  :
 //=======================================================================
-Standard_Integer HLRAlgo_PolyInternalData::AddNode (HLRAlgo_PolyInternalNode::NodeData& theNod1RValues,
+Standard_Integer HLRAlgo_PolyInternalData::AddNode(HLRAlgo_PolyInternalNode::NodeData& theNod1RValues,
   HLRAlgo_PolyInternalNode::NodeData& theNod2RValues,
   HLRAlgo_Array1OfPINod*& thePINod1,
   HLRAlgo_Array1OfPINod*& thePINod2,
@@ -307,7 +309,7 @@ Standard_Integer HLRAlgo_PolyInternalData::AddNode (HLRAlgo_PolyInternalNode::No
   const Standard_Real theZ3)
 {
   Standard_Real coef2 = 1 - theCoef1;
-  IncPINod (thePINod1, thePINod2);
+  IncPINod(thePINod1, thePINod2);
   Standard_Integer ip3 = myNbPINod;
   Handle(HLRAlgo_PolyInternalNode)& pip3 = thePINod1->ChangeValue(ip3);
   pip3 = new HLRAlgo_PolyInternalNode();
@@ -315,7 +317,7 @@ Standard_Integer HLRAlgo_PolyInternalData::AddNode (HLRAlgo_PolyInternalNode::No
   HLRAlgo_PolyInternalNode::NodeIndices& aNodeIndices = pip3->Indices();
   aNodeIndices.NdSg = 0;
   aNodeIndices.Flag = 0;
-  Nod3RValues.Point = gp_XYZ (theX3, theY3, theZ3);
+  Nod3RValues.Point = gp_XYZ(theX3, theY3, theZ3);
   Nod3RValues.UV = coef2 * theNod1RValues.UV + theCoef1 * theNod2RValues.UV;
   Nod3RValues.Scal = theNod1RValues.Scal * coef2 + theNod2RValues.Scal * theCoef1;
   const gp_XYZ aXYZ = coef2 * theNod1RValues.Normal + theCoef1 * theNod2RValues.Normal;
@@ -340,7 +342,7 @@ Standard_Integer HLRAlgo_PolyInternalData::AddNode (HLRAlgo_PolyInternalNode::No
 //=======================================================================
 
 void
-HLRAlgo_PolyInternalData::UpdateLinks (const Standard_Integer ip1,
+HLRAlgo_PolyInternalData::UpdateLinks(const Standard_Integer ip1,
   const Standard_Integer ip2,
   const Standard_Integer ip3,
   HLRAlgo_Array1OfTData*& TData1,
@@ -348,21 +350,21 @@ HLRAlgo_PolyInternalData::UpdateLinks (const Standard_Integer ip1,
   HLRAlgo_Array1OfPISeg*& PISeg1,
   HLRAlgo_Array1OfPISeg*& PISeg2,
   HLRAlgo_Array1OfPINod*& PINod1,
-				       HLRAlgo_Array1OfPINod*& )
+  HLRAlgo_Array1OfPINod*&)
 {
-  Standard_Integer find,iiii,iisv,icsv,iip2 =0,cnx1 =0,cnx2 =0;
+  Standard_Integer find, iiii, iisv, icsv, iip2 = 0, cnx1 = 0, cnx2 = 0;
   HLRAlgo_PolyInternalSegment* aSegIndices = NULL;
   HLRAlgo_PolyInternalSegment* aSegIndices2 = NULL;
   find = 0;
   iisv = 0;
   icsv = 0;
-  IncPISeg(PISeg1,PISeg2);
-  IncPISeg(PISeg1,PISeg2);
-  IncPISeg(PISeg1,PISeg2);
+  IncPISeg(PISeg1, PISeg2);
+  IncPISeg(PISeg1, PISeg2);
+  IncPISeg(PISeg1, PISeg2);
   myNbPISeg--;
   myNbPISeg--;
-  IncTData(TData1,TData2);
-  IncTData(TData1,TData2);
+  IncTData(TData1, TData2);
+  IncTData(TData1, TData2);
   myNbTData--;
   myNbTData--;
   HLRAlgo_PolyInternalNode::NodeIndices* aNodIndices1 =
@@ -432,8 +434,8 @@ HLRAlgo_PolyInternalData::UpdateLinks (const Standard_Integer ip1,
     aSegIndices2->Conex2 = cnx2;
     aNodIndices3.NdSg = find;
 
-    Standard_Integer iOld,iNew,iTr,skip,ip4,itpk[2];
-    Standard_Integer n1,n2,n3,nOld[3],nNew[3],New[4];
+    Standard_Integer iOld, iNew, iTr, skip, ip4, itpk[2];
+    Standard_Integer n1, n2, n3, nOld[3], nNew[3], New[4];
     New[0] = cnx1;
     New[2] = myNbTData + 1;
     if (cnx2 == 0) {
@@ -530,10 +532,10 @@ HLRAlgo_PolyInternalData::UpdateLinks (const Standard_Integer ip1,
     }
 
     for (iTr = 0; iTr <= 3; iTr++) {
-      iNew = New [iTr];
+      iNew = New[iTr];
       if (iTr < 2) skip = iTr;
       else         skip = iTr - 2;
-      iOld = New [skip];
+      iOld = New[skip];
       ip4 = itpk[skip];
       if (iNew != 0) {
         HLRAlgo_TriangleData& aTriangle2 = TData1->ChangeValue(iNew);
@@ -631,7 +633,7 @@ HLRAlgo_PolyInternalData::UpdateLinks (const Standard_Integer ip1,
 //purpose  : 
 //=======================================================================
 
-void HLRAlgo_PolyInternalData::Dump () const
+void HLRAlgo_PolyInternalData::Dump() const
 {
   Standard_Integer i;//,i1,i2,i3;
   HLRAlgo_Array1OfTData* TData = &myTData->ChangeArray1();
@@ -644,9 +646,9 @@ void HLRAlgo_PolyInternalData::Dump () const
     HLRAlgo_PolyInternalNode::NodeData& Nod1RValues = (*pi)->Data();
     std::cout << "Node " << std::setw(6) << i << " : ";
     std::cout << std::setw(6) << aNodIndices1.NdSg;
-    std::cout << std::setw(20)<< Nod1RValues.Point.X();
-    std::cout << std::setw(20)<< Nod1RValues.Point.Y();
-    std::cout << std::setw(20)<< Nod1RValues.Point.Z();
+    std::cout << std::setw(20) << Nod1RValues.Point.X();
+    std::cout << std::setw(20) << Nod1RValues.Point.Y();
+    std::cout << std::setw(20) << Nod1RValues.Point.Z();
     std::cout << std::endl;
   }
 
@@ -685,12 +687,12 @@ void HLRAlgo_PolyInternalData::IncTData(
     if (HLRAlgo_PolyInternalData_TRACE)
       std::cout << "HLRAlgo_PolyInternalData::IncTData : " << myMxTData << std::endl;
 #endif
-    Standard_Integer i,j,k;
+    Standard_Integer i, j, k;
     j = myMxTData;
     k = 2 * j;
 
     Handle(HLRAlgo_HArray1OfTData) NwTData =
-      new HLRAlgo_HArray1OfTData(0,k);
+      new HLRAlgo_HArray1OfTData(0, k);
     HLRAlgo_Array1OfTData& oTData = myTData->ChangeArray1();
     HLRAlgo_Array1OfTData& nTData = NwTData->ChangeArray1();
 
@@ -724,11 +726,11 @@ void HLRAlgo_PolyInternalData::IncPISeg(
     if (HLRAlgo_PolyInternalData_TRACE)
       std::cout << "HLRAlgo_PolyInternalData::IncPISeg : " << myMxPISeg << std::endl;
 #endif
-    Standard_Integer i,j,k;
+    Standard_Integer i, j, k;
     j = myMxPISeg;
     k = 2 * j;
     Handle(HLRAlgo_HArray1OfPISeg) NwPISeg =
-      new HLRAlgo_HArray1OfPISeg(0,k);
+      new HLRAlgo_HArray1OfPISeg(0, k);
     HLRAlgo_Array1OfPISeg& oPISeg = myPISeg->ChangeArray1();
     HLRAlgo_Array1OfPISeg& nPISeg = NwPISeg->ChangeArray1();
 
@@ -753,7 +755,7 @@ void HLRAlgo_PolyInternalData::IncPISeg(
 //function : IncPINod
 //purpose  :
 //=======================================================================
-void HLRAlgo_PolyInternalData::IncPINod (HLRAlgo_Array1OfPINod*& PINod1,
+void HLRAlgo_PolyInternalData::IncPINod(HLRAlgo_Array1OfPINod*& PINod1,
   HLRAlgo_Array1OfPINod*& PINod2)
 {
   if (myNbPINod >= myMxPINod)
@@ -762,10 +764,10 @@ void HLRAlgo_PolyInternalData::IncPINod (HLRAlgo_Array1OfPINod*& PINod1,
     if (HLRAlgo_PolyInternalData_TRACE)
       std::cout << "HLRAlgo_PolyInternalData::IncPINod : " << myMxPINod << std::endl;
 #endif
-    Standard_Integer i,j,k;
+    Standard_Integer i, j, k;
     j = myMxPINod;
     k = 2 * j;
-    Handle(HLRAlgo_HArray1OfPINod) NwPINod = new HLRAlgo_HArray1OfPINod(0,k);
+    Handle(HLRAlgo_HArray1OfPINod) NwPINod = new HLRAlgo_HArray1OfPINod(0, k);
     HLRAlgo_Array1OfPINod& oPINod = myPINod->ChangeArray1();
     HLRAlgo_Array1OfPINod& nPINod = NwPINod->ChangeArray1();
     Handle(HLRAlgo_PolyInternalNode)* ON = &(oPINod.ChangeValue(1));