0024023: Revamp the OCCT Handle -- general

[occt.git] / src / ChFi3d / ChFi3d_FilBuilder_C2.cxx

diff --git a/src/ChFi3d/ChFi3d_FilBuilder_C2.cxx b/src/ChFi3d/ChFi3d_FilBuilder_C2.cxx
index 919e704..48b078f 100644 (file)
--- a/src/ChFi3d/ChFi3d_FilBuilder_C2.cxx
+++ b/src/ChFi3d/ChFi3d_FilBuilder_C2.cxx
@@ -5,8 +5,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.
@@ -38,6 +38,7 @@
 #include <Geom_BSplineCurve.hxx>
 #include <Geom2d_TrimmedCurve.hxx>
 #include <Geom2d_BSplineCurve.hxx>
+#include <Geom_BSplineSurface.hxx>
 #include <Law_Linear.hxx>
 #include <BRepBlend_CSCircular.hxx>
 #include <BRepBlend_Line.hxx>
@@ -96,7 +97,7 @@
 #ifdef DRAW
 #include <DrawTrSurf.hxx>
 #endif
-#ifdef DEB
+#ifdef OCCT_DEBUG
 #include <Geom_TrimmedCurve.hxx>
 extern Standard_Boolean ChFi3d_GettraceDRAWSPINE();
 extern Standard_Boolean ChFi3d_GetcontextFORCEFILLING();
@@ -165,7 +166,7 @@ static void RemoveSD(Handle(ChFiDS_Stripe)& Stripe,
 
 void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
 {
-#ifdef DEB 
+#ifdef OCCT_DEBUG
   OSD_Chronometer ch;
   ChFi3d_InitChron(ch); // init perf initialisation 
 #endif 
@@ -393,7 +394,7 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
     }
   }
   
-#ifdef DEB  
+#ifdef OCCT_DEBUG
   ChFi3d_ResultChron(ch ,t_t2cornerinit);//result perf initialisation 
 #endif 
   
@@ -403,13 +404,13 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
   ChFiDS_FaceInterference intf11,intf12,intf21,intf22;
 
   if(c1biseau){
-#ifdef DEB   
+#ifdef OCCT_DEBUG
     ChFi3d_InitChron(ch); // init perf PerformTwoCornerbyInter
 #endif 
     
     done = PerformTwoCornerbyInter(Index);
     
-#ifdef DEB 
+#ifdef OCCT_DEBUG
     ChFi3d_ResultChron(ch , t_perf2cornerbyinter); // result perf  PerformTwoCornerbyInter
 #endif 
    
@@ -428,13 +429,13 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
     intf12 = sd1->InterferenceOnS2();
     intf21 = sd2->InterferenceOnS1();
     intf22 = sd2->InterferenceOnS2();
-#ifdef DEB   
+#ifdef OCCT_DEBUG
     ChFi3d_InitChron(ch); // init perf PerformTwoCornerbyInter
 #endif 
       
     done = PerformTwoCornerbyInter(Index);
       
-#ifdef DEB 
+#ifdef OCCT_DEBUG
       ChFi3d_ResultChron(ch , t_perf2cornerbyinter); // result perf  PerformTwoCornerbyInter
 #endif 
     if (!done) {
@@ -476,14 +477,14 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
        if(yapiv) bid = ChFi3d::ConcaveSide(BRS1,BRS2,pivot,op1,op2);
        op1 = TopAbs::Reverse(op1);
        op2 = TopAbs::Reverse(op2);
-#ifdef DEB  
+#ifdef OCCT_DEBUG
        ChFi3d_InitChron(ch);// init perf ChFiKPart_ComputeData 
 #endif 
        Standard_Real radius = 
          Handle(ChFiDS_FilSpine)::DownCast(st1->Spine())->Radius();
        done = ChFiKPart_ComputeData::ComputeCorner(DStr,coin,HFaCo,HBRS1,HBRS2,
                                                    OFaCo,ori,op1,op2,radius);
-#ifdef DEB 
+#ifdef OCCT_DEBUG
        ChFi3d_ResultChron(ch , t_chfikpartcompdata);//result perf ChFiKPart_ComputeData 
 #endif 
       }
@@ -502,7 +503,7 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
        p2da2 = sd2->Interference(IFaArc2).PCurveOnSurf()->Value(uPCArc2);
        p2df2 = sd2->Interference(IFaCo2).PCurveOnSurf()->Value(uPCArc2);
        sd2->Interference(IFaCo2).PCurveOnFace()->D1(uPCArc2,p2dfac2,v2dfac2);
-#ifdef DEB 
+#ifdef OCCT_DEBUG
        ChFi3d_InitChron(ch ); // init perf filling
 #endif 
        B1 = ChFi3d_mkbound(surf1,p2df1,p2da1,tolesp,2.e-4);
@@ -574,11 +575,11 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
                            HFaCo,PCurveOnFace,
                            HFaPiv,PCurveOnPiv,OFaCo,1,
                            0,0,0,0);
-#ifdef DEB 
+#ifdef OCCT_DEBUG
        ChFi3d_ResultChron(ch , t_remplissage);// result perf filling 
 #endif 
       }
-#ifdef DEB   
+#ifdef OCCT_DEBUG
       ChFi3d_InitChron(ch); // init perf update DS
 #endif 
       if (done){
@@ -703,7 +704,7 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
        sd2->ChangeInterference(IFaCo2).SetParameter(par2,isfirst2);
        if (IFaCo2 == 2) st2->SetOrientation(TopAbs_REVERSED,isfirst2);
       }
-#ifdef DEB   
+#ifdef OCCT_DEBUG
       ChFi3d_ResultChron(ch , t_t2cornerDS);// result perf update DS 
 #endif 
     }
@@ -752,7 +753,7 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
            ("TwoCorner : No common face to loop the contour");
        }
       }
-#ifdef DEB 
+#ifdef OCCT_DEBUG
       ChFi3d_InitChron(ch ); // init perf filling 
 #endif 
       Handle(GeomFill_Boundary) Bsam,Bdif,Bfac;
@@ -809,11 +810,11 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
                          Hsurfsam,pcsurfsam,
                          HBRFopsam,pcnul,Osurfsam,1,
                          0,0,0,0);
-#ifdef DEB 
+#ifdef OCCT_DEBUG
       ChFi3d_ResultChron(ch , t_remplissage);// result perf filling 
 #endif 
       if(!done) Standard_Failure::Raise("concavites inverted : fail");
-#ifdef DEB   
+#ifdef OCCT_DEBUG
       ChFi3d_InitChron(ch); // init perf update DS
 #endif 
       // Update 3 CornerData and the DS
@@ -924,7 +925,7 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
       sddif->ChangeVertex(isfirstdif,ifacodif) = Pl1;
       sddif->ChangeInterference(ifacodif).SetParameter(uintpcdif,isfirstdif);
       if (ifaopdif == 1) stdif->SetOrientation(TopAbs_REVERSED,isfirstdif);
-#ifdef DEB   
+#ifdef OCCT_DEBUG
       ChFi3d_ResultChron(ch , t_t2cornerDS);// result perf update DS 
 #endif 
     }