X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_PolylineXY.cxx;h=4b82850f80e1b0bda53f4f2cf2cd6517a7cfaea0;hb=9082efb75ca2505f8b4c5096d37e8d87491cd5d9;hp=fc97524992fc8faa9c0e97234727ab7e7d6fbe6d;hpb=24fb5adcac723810ac120abf37ad191a092cbefe;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_PolylineXY.cxx b/src/HYDROData/HYDROData_PolylineXY.cxx
index fc975249..4b82850f 100644
--- a/src/HYDROData/HYDROData_PolylineXY.cxx
+++ b/src/HYDROData/HYDROData_PolylineXY.cxx
@@ -346,14 +346,14 @@ bool convertEdgesToSections( const TopoDS_Edge&
                              double                                                   theDeflection,
                              const Handle( HYDROData_PolylineXY )&                    theOldPolyline )
 {
-  DEBTRACE("convertEdgesToSections")
+  //DEBTRACE("convertEdgesToSections")
   Standard_Real aFirst = 0.0, aLast = 0.0;
   Handle(Geom_Curve) anEdgeGeomCurve = BRep_Tool::Curve( theEdge, aFirst, aLast );
   if ( anEdgeGeomCurve.IsNull() )
     return false;
 
   bool isPrevious = (theSectTypes.Size() > 0);
-  DEBTRACE("nb sections: " << theSectTypes.Size());
+  //DEBTRACE("nb sections: " << theSectTypes.Size());
   HYDROData_PolylineXY::SectionType prevSectType = HYDROData_PolylineXY::SECTION_SPLINE;;
   HYDROData_PolylineXY::PointsList prevPointList;
   bool isPrevClosed = true;
@@ -382,7 +382,7 @@ bool convertEdgesToSections( const TopoDS_Edge&
     }
 
   bool isNewSection = !isPrevious || isPrevClosed || anIsEdgeClosed || prevSectType != aSectionType;
-  DEBTRACE(isNewSection <<": " << !isPrevious << " " << isPrevClosed << " " << anIsEdgeClosed << " " << (prevSectType != aSectionType));
+  //DEBTRACE(isNewSection <<": " << !isPrevious << " " << isPrevClosed << " " << anIsEdgeClosed << " " << (prevSectType != aSectionType));
 
   HYDROData_PolylineXY::PointsList aPointsList;
   if (!isNewSection)
@@ -392,7 +392,7 @@ bool convertEdgesToSections( const TopoDS_Edge&
 
   if( aSectionType == HYDROData_PolylineXY::SECTION_POLYLINE )
     {
-      DEBTRACE("SECTION_POLYLINE");
+      //DEBTRACE("SECTION_POLYLINE");
       Handle(Geom_Line) aGeomLine = Handle(Geom_Line)::DownCast( anEdgeGeomCurve );
 
       gp_Pnt aFirstPoint, aLastPoint;
@@ -404,27 +404,27 @@ bool convertEdgesToSections( const TopoDS_Edge&
         {
           if (aSectFirstPoint == prevPointList.Last())
             {
-              DEBTRACE("points shared: a");//aPointsList.Append( aSectFirstPoint );
+              //DEBTRACE("points shared: a");//aPointsList.Append( aSectFirstPoint );
               aPointsList.Append( aSectLastPoint );
             }
           else if (aSectLastPoint == prevPointList.Last())
             {
-              DEBTRACE("points shared: b");//aPointsList.Append( aSectLastPoint );
+              //DEBTRACE("points shared: b");//aPointsList.Append( aSectLastPoint );
               aPointsList.Append( aSectFirstPoint );
             }
           else if (aSectFirstPoint == prevPointList.First())
             {
-              DEBTRACE("points shared: c");//aPointsList.Prepend( aSectFirstPoint );
+              //DEBTRACE("points shared: c");//aPointsList.Prepend( aSectFirstPoint );
               aPointsList.Prepend( aSectLastPoint );
             }
           else if (aSectLastPoint == prevPointList.First())
             {
-              DEBTRACE("points shared: d");//aPointsList.Prepend( aSectLastPoint );
+              //DEBTRACE("points shared: d");//aPointsList.Prepend( aSectLastPoint );
               aPointsList.Prepend( aSectFirstPoint );
             }
           else
             {
-              DEBTRACE("no point shared")
+              //DEBTRACE("no point shared")
               isNewSection = true; // no point shared, new section
               aPointsList.Clear();
               aPointsList.Append( aSectFirstPoint );
@@ -433,14 +433,14 @@ bool convertEdgesToSections( const TopoDS_Edge&
         }
      else
        {
-         DEBTRACE("new section");
+         //DEBTRACE("new section");
          aPointsList.Append( aSectFirstPoint );
          aPointsList.Append( aSectLastPoint );
        }
     }
   else // aSectionType == HYDROData_PolylineXY::SECTION_SPLINE
     {
-      DEBTRACE("SECTION_SPLINE");
+      //DEBTRACE("SECTION_SPLINE");
       isNewSection = true;
       aPointsList.Clear();
 
@@ -465,8 +465,8 @@ bool convertEdgesToSections( const TopoDS_Edge&
 
           gp_Pnt endPts[] = {gp_Pnt(aPointsList.First().X(),aPointsList.First().Y(), 0),
                              gp_Pnt(aPointsList.Last().X(),aPointsList.Last().Y(), 0) };
-          DEBTRACE("curve start: "<< endPts[0].X() << " " << endPts[0].Y());
-          DEBTRACE("curve end: "<< endPts[1].X() << " " << endPts[1].Y());
+          //DEBTRACE("curve start: "<< endPts[0].X() << " " << endPts[0].Y());
+          //DEBTRACE("curve end: "<< endPts[1].X() << " " << endPts[1].Y());
         }
       else // --- split of a previous polyline: try to retrieve old sets of points and add intersection points
         {
@@ -475,18 +475,18 @@ bool convertEdgesToSections( const TopoDS_Edge&
           double midPar = (anAdaptorCurve.LastParameter() + anAdaptorCurve.FirstParameter())/2;
           gp_Pnt midPnt;
           anAdaptorCurve.D0(midPar, midPnt);
-          DEBTRACE("curve first point: " << aEndPs[0].X() << " " << aEndPs[0].Y() << " " << aEndPs[0].Z());
-          DEBTRACE("curve last point: " << aEndPs[1].X() << " " << aEndPs[1].Y() << " " << aEndPs[1].Z());
-          DEBTRACE("curve mid point: " << midPnt.X() << " " << midPnt.Y() << " " << midPnt.Z());
+          //DEBTRACE("curve first point: " << aEndPs[0].X() << " " << aEndPs[0].Y() << " " << aEndPs[0].Z());
+          //DEBTRACE("curve last point: " << aEndPs[1].X() << " " << aEndPs[1].Y() << " " << aEndPs[1].Z());
+          //DEBTRACE("curve mid point: " << midPnt.X() << " " << midPnt.Y() << " " << midPnt.Z());
 
           std::vector<TopoDS_Wire> aCurves;
           HYDROData_PolylineOperator::GetWires(theOldPolyline, aCurves);
 
           int nbSections = theOldPolyline->NbSections();
-          DEBTRACE("nbSections: "<< nbSections << ", nbCurves: " << aCurves.size() );
+          //DEBTRACE("nbSections: "<< nbSections << ", nbCurves: " << aCurves.size() );
           for (int isec = 0; isec < nbSections; isec++)
             {
-              DEBTRACE("section: "<< isec);
+              //DEBTRACE("section: "<< isec);
               bool isOldSectionclosed = theOldPolyline->IsClosedSection(isec);
               TopoDS_Wire aWire = aCurves[isec]; // we suppose sections and wires are in the same order
               TopExp_Explorer anExp(aWire, TopAbs_EDGE);
@@ -494,18 +494,18 @@ bool convertEdgesToSections( const TopoDS_Edge&
               BRepAdaptor_Curve adaptorOldCurve(anEdge);
               double pfirst = adaptorOldCurve.FirstParameter();
               double plast = adaptorOldCurve.LastParameter();
-              DEBTRACE("previous curve first last : "<< pfirst << " " << plast);
+              //DEBTRACE("previous curve first last : "<< pfirst << " " << plast);
               double p[3] = {-1, -1};
               double d0= ProjectPointToCurve(aEndPs[0].XYZ(), adaptorOldCurve,p[0]);
               double d1= ProjectPointToCurve(aEndPs[1].XYZ(), adaptorOldCurve,p[1]);
               double d2= ProjectPointToCurve(midPnt.XYZ(), adaptorOldCurve, p[2]);
-              DEBTRACE("d0: "<<d0<<" d1: "<<d1<<" d2: "<<d2<<" p0: "<<p[0]<<" p1: "<<p[1]<<" p2: "<<p[2]);
+              //DEBTRACE("d0: "<<d0<<" d1: "<<d1<<" d2: "<<d2<<" p0: "<<p[0]<<" p1: "<<p[1]<<" p2: "<<p[2]);
               if ((d0 < 1.e-3) && (d1 < 1.e-3) && (d2 < 1.e-3)) // we got the good old curve (and the good section)
                 {
                   double pmin = p[0];
                   double pmax = p[1];
                   bool forward = true;
-                  DEBTRACE("isOldSectionclosed: " << isOldSectionclosed);
+                  //DEBTRACE("isOldSectionclosed: " << isOldSectionclosed);
                   if (!isOldSectionclosed) // no need to check first and last points on an open curve
                     {
                       if (pmin > pmax)
@@ -542,7 +542,7 @@ bool convertEdgesToSections( const TopoDS_Edge&
                       else if ((abs(pmax - pfirst) <1.e-3) && (p[2] > pmin)) // forward, replace pmax par plast
                         pmax = plast;
                    }
-                  DEBTRACE("forward: "<< forward << " pmin " << pmin <<  " pmax " << pmax);
+                  //DEBTRACE("forward: "<< forward << " pmin " << pmin <<  " pmax " << pmax);
                   HYDROData_PolylineXY::Point aFirstPoint, aLastPoint;
                   if (forward)
                     {
@@ -558,7 +558,7 @@ bool convertEdgesToSections( const TopoDS_Edge&
 
                   HYDROData_PolylineXY::PointsList aSectPoints = theOldPolyline->GetPoints(isec, false);
                   int nbPoints = aSectPoints.Length();
-                  DEBTRACE("nbPoints " << nbPoints);
+                  //DEBTRACE("nbPoints " << nbPoints);
                   if (forward)
                     for (int i=1; i<=nbPoints; i++)
                       {
@@ -568,7 +568,7 @@ bool convertEdgesToSections( const TopoDS_Edge&
                         double d = ProjectPointToCurve(p, adaptorOldCurve, param);
                         if ((param > pmin) && (param < pmax))
                           {
-                            DEBTRACE("param: " << param);
+                            //DEBTRACE("param: " << param);
                             aPointsList.Append(aPoint);
                           }
                       }
@@ -581,7 +581,7 @@ bool convertEdgesToSections( const TopoDS_Edge&
                         double d = ProjectPointToCurve(p, adaptorOldCurve, param);
                         if ((param > pmin) && (param < pmax))
                           {
-                            DEBTRACE("param: " << param);
+                            //DEBTRACE("param: " << param);
                             aPointsList.Append(aPoint);
                           }
                       }
@@ -599,7 +599,7 @@ bool convertEdgesToSections( const TopoDS_Edge&
   TCollection_AsciiString aSectName = getUniqueSectionName( theSectNames );
   if (isNewSection)
     {
-      DEBTRACE("isNewSection");
+      //DEBTRACE("isNewSection");
       theSectNames.Append( aSectName );
       theSectTypes.Append( aSectionType );
       theSectClosures.Append( anIsEdgeClosed );
@@ -607,7 +607,7 @@ bool convertEdgesToSections( const TopoDS_Edge&
     }
   else
     {
-      DEBTRACE("sameSection");
+      //DEBTRACE("sameSection");
       theSectPoints.SetValue(theSectPoints.Length(), aPointsList);
     }
 
@@ -620,7 +620,7 @@ bool HYDROData_PolylineXY::ImportShape( const TopoDS_Shape& theShape,
                                         bool IsClosureAllowed,
                                         double theDeviation )
 {
-  DEBTRACE("ImportShape");
+  //DEBTRACE("ImportShape");
   if ( theShape.IsNull() )
     return false;
 
@@ -639,7 +639,7 @@ bool HYDROData_PolylineXY::ImportShape( const TopoDS_Shape& theShape,
 
   if ( theShape.ShapeType() == TopAbs_EDGE )
   {
-      DEBTRACE("TopAbs_EDGE");
+      //DEBTRACE("TopAbs_EDGE");
     TopoDS_Edge anEdge = TopoDS::Edge( theShape );
 //    anIsCanBeImported = convertEdgeToSection( anEdge, aSectNames, aSectTypes,
 //      aSectClosures, aSectPoints, true, IsInterpolationAllowed, theDeviation );
@@ -649,7 +649,7 @@ bool HYDROData_PolylineXY::ImportShape( const TopoDS_Shape& theShape,
   }
   else if ( theShape.ShapeType() == TopAbs_WIRE )
   {
-      DEBTRACE("TopAbs_WIRE");
+      //DEBTRACE("TopAbs_WIRE");
     TopTools_SequenceOfShape anEdges;
     HYDROData_ShapesTool::ExploreShapeToShapes( theShape, TopAbs_EDGE, anEdges );