debug of automatic tests

diff --git a/src/HYDROData/HYDROData_Channel.cxx b/src/HYDROData/HYDROData_Channel.cxx
index e8c8b3ee1e556549a059cb10eca0ce0ab49dec56..899c4fbe7dea3c6e2c06579b1a4a8324e10196b2 100644 (file)
--- a/src/HYDROData/HYDROData_Channel.cxx
+++ b/src/HYDROData/HYDROData_Channel.cxx
@@ -454,7 +454,7 @@ void HYDROData_Channel::RemoveProfile()
 
 ObjectKind HYDROData_Channel::getAltitudeObjectType() const
 {
-  DEBTRACE("HYDROData_Channel::getAltitudeObjectType");
+  //DEBTRACE("HYDROData_Channel::getAltitudeObjectType");
   return KIND_CHANNEL_ALTITUDE;
   //return KIND_STREAM_ALTITUDE;
 }

diff --git a/src/HYDROData/HYDROData_Entity.cxx b/src/HYDROData/HYDROData_Entity.cxx
index 4b8a76ede2252fff6b4f2700f68fba7273368190..8d4c2afb413b600cb7e6f9ea336a029ba5b6e8ce 100644 (file)
--- a/src/HYDROData/HYDROData_Entity.cxx
+++ b/src/HYDROData/HYDROData_Entity.cxx
@@ -656,7 +656,7 @@ QStringList HYDROData_Entity::dumpObjectCreation( MapOfTreatedObjects& theTreate
 
 QString HYDROData_Entity::getPyTypeID() const
 {
-  DEBTRACE("HYDROData_Entity::getPyTypeID " << GetKind());
+  //DEBTRACE("HYDROData_Entity::getPyTypeID " << GetKind());
   switch( GetKind() )
   {
     case KIND_IMAGE:             return "KIND_IMAGE";

diff --git a/src/HYDROData/HYDROData_ImmersibleZone.cxx b/src/HYDROData/HYDROData_ImmersibleZone.cxx
index c456c8c9ce85f6629307e9871af9959abc47eadb..52e9a5acf6628c224cd46de582f22973ee4c18c8 100644 (file)
--- a/src/HYDROData/HYDROData_ImmersibleZone.cxx
+++ b/src/HYDROData/HYDROData_ImmersibleZone.cxx
@@ -123,7 +123,7 @@ TopoDS_Shape HYDROData_ImmersibleZone::generateTopShape() const
 
 TopoDS_Shape HYDROData_ImmersibleZone::generateTopShape( const Handle(HYDROData_PolylineXY)& aPolyline )
 {
-  DEBTRACE("generateTopShape");
+  //DEBTRACE("generateTopShape");
   TopoDS_Face aResultFace = TopoDS_Face(); // --- result: default = null face
 
   if (!aPolyline.IsNull())
@@ -138,7 +138,7 @@ TopoDS_Shape HYDROData_ImmersibleZone::generateTopShape( const Handle(HYDROData_
       if (!aPolylineShape.IsNull() && aPolylineShape.ShapeType() == TopAbs_WIRE)
         {
           // --- only one wire: try to make a face
-          DEBTRACE("one wire: try to build a face");
+          //DEBTRACE("one wire: try to build a face");
           const TopoDS_Wire& aPolylineWire = TopoDS::Wire(aPolylineShape);
           if (!aPolylineWire.IsNull())
             {
@@ -146,7 +146,7 @@ TopoDS_Shape HYDROData_ImmersibleZone::generateTopShape( const Handle(HYDROData_
               aMakeFace.Build();
               if (aMakeFace.IsDone())
                 {
-                  DEBTRACE(" a face with the only wire given");
+                  //DEBTRACE(" a face with the only wire given");
                   aResultFace = aMakeFace.Face();
                 }
             }
@@ -157,14 +157,14 @@ TopoDS_Shape HYDROData_ImmersibleZone::generateTopShape( const Handle(HYDROData_
           Handle(TopTools_HSequenceOfShape) aSeqWires = new TopTools_HSequenceOfShape;
           Handle(TopTools_HSequenceOfShape) aSeqEdges = new TopTools_HSequenceOfShape;
           TopExp_Explorer anExp(aPolylineShape, TopAbs_WIRE);
-          DEBTRACE("list of wires ?");
+          //DEBTRACE("list of wires ?");
           for (; anExp.More(); anExp.Next())
             {
               if (!anExp.Current().IsNull())
                 {
                   const TopoDS_Wire& aWire = TopoDS::Wire(anExp.Current());
                   aWiresList.Append(aWire);
-                  DEBTRACE("  append wire");
+                  //DEBTRACE("  append wire");
                   TopExp_Explorer it2(aWire, TopAbs_EDGE);
                   for (; it2.More(); it2.Next())
                     aSeqEdges->Append(it2.Current());
@@ -175,7 +175,7 @@ TopoDS_Shape HYDROData_ImmersibleZone::generateTopShape( const Handle(HYDROData_
 
           if (aSeqEdges->Length() > 1)
             {
-              DEBTRACE("try to connect all the edges together, build a unique wire and a face");
+              //DEBTRACE("try to connect all the edges together, build a unique wire and a face");
               // --- try to create one wire by connecting edges with a distance tolerance (no necessity of sharing points)
               ShapeAnalysis_FreeBounds::ConnectEdgesToWires(aSeqEdges, 1E-5, Standard_False, aSeqWires);
 
@@ -189,7 +189,7 @@ TopoDS_Shape HYDROData_ImmersibleZone::generateTopShape( const Handle(HYDROData_
                       aMakeFace.Build();
                       if (aMakeFace.IsDone())
                         {
-                          DEBTRACE("  a face from all the wires connected");
+                          //DEBTRACE("  a face from all the wires connected");
                           aResultFace = aMakeFace.Face();
                         }
                     }
@@ -198,7 +198,7 @@ TopoDS_Shape HYDROData_ImmersibleZone::generateTopShape( const Handle(HYDROData_
 
           if (aResultFace.IsNull())
             {
-            DEBTRACE("try to make a face with the first wire of the list and other wires as restrictions");
+              //DEBTRACE("try to make a face with the first wire of the list and other wires as restrictions");
               // --- try to make a face with the first wire of the list and other wires as restrictions
               BRepAlgo_FaceRestrictor aFR;
               TopoDS_Face aRefFace;
@@ -207,7 +207,7 @@ TopoDS_Shape HYDROData_ImmersibleZone::generateTopShape( const Handle(HYDROData_
               aMakeFace.Build();
               if (aMakeFace.IsDone())
                 {
-                  DEBTRACE("  a face with first wire");
+                  //DEBTRACE("  a face with first wire");
                   aRefFace = aMakeFace.Face();
                 }
               if (!aRefFace.IsNull())
@@ -226,7 +226,7 @@ TopoDS_Shape HYDROData_ImmersibleZone::generateTopShape( const Handle(HYDROData_
                     {
                       for (; aFR.More(); aFR.Next())
                         {
-                          DEBTRACE("  a restricted face");
+                          //DEBTRACE("  a restricted face");
                           aResultFace = aFR.Current();
                           break;
                         }
@@ -239,15 +239,17 @@ TopoDS_Shape HYDROData_ImmersibleZone::generateTopShape( const Handle(HYDROData_
   if (aResultFace.IsNull())
     return aResultFace;
 
-  DEBTRACE("check the face");
+  //DEBTRACE("check the face");
   BRepCheck_Analyzer anAnalyzer(aResultFace);
   if (anAnalyzer.IsValid() && aResultFace.ShapeType() == TopAbs_FACE)
-    {
-      DEBTRACE("face OK");
-      return aResultFace;
-    }
+  {
+    //DEBTRACE("face OK");
+    return aResultFace;
+  }
   else
-    DEBTRACE("bad face");
+  {
+    //DEBTRACE("bad face");
+  }
   return TopoDS_Face();
 }
 

diff --git a/src/HYDROData/HYDROData_Object.cxx b/src/HYDROData/HYDROData_Object.cxx
index f2570cfe08970263164b2e063f6b1d50a308c686..93499b742335d4787b5b438ab74b44875a3b7f80 100644 (file)
--- a/src/HYDROData/HYDROData_Object.cxx
+++ b/src/HYDROData/HYDROData_Object.cxx
@@ -328,7 +328,7 @@ void HYDROData_Object::checkAndSetAltitudeObject()
       HYDROData_Iterator::CreateObject( aChildLabel, anAltitudeObjectType ) );
 
   QString anAltitudePref = GetName() + "_Altitude";
-  DEBTRACE("anAltitudePref " << anAltitudePref.toStdString());
+  //DEBTRACE("anAltitudePref " << anAltitudePref.toStdString());
   QString anAltitudeName = HYDROData_Tool::GenerateObjectName( aDocument, anAltitudePref );
   anAltitudeObject->SetName( anAltitudeName );
 

diff --git a/src/HYDROData/HYDROData_PolylineOperator.cxx b/src/HYDROData/HYDROData_PolylineOperator.cxx
index fd4a5edcd397fd155d866c3e9d177bedf8fec365..d36f5fa115e2c0147d164ae1fa40be0fc21a3273 100644 (file)
--- a/src/HYDROData/HYDROData_PolylineOperator.cxx
+++ b/src/HYDROData/HYDROData_PolylineOperator.cxx
@@ -216,7 +216,7 @@ bool HYDROData_PolylineOperator::split( const Handle( HYDROData_Document )& theD
   for (int aPSI = 0; aPSI < aPSCount; ++aPSI)
   {
     HYDROData_TopoCurve aCurve;
-    DEBTRACE("Initialize curve " << aPSI);
+    //DEBTRACE("Initialize curve " << aPSI);
     if (!aCurve.Initialize(aCurves[aPSI]))
     {
       continue;
@@ -308,7 +308,7 @@ bool HYDROData_PolylineOperator::CreatePolylines( const Handle( HYDROData_Docume
   const QColor& theColor = theOldPolyline->GetWireColor();
 
   int n = theShapes.size();
-  DEBTRACE("theShapes.size() "<< n);
+  //DEBTRACE("theShapes.size() "<< n);
   int anIndex = 1;
   for( int i=0; i<n; i++ )
   {

diff --git a/src/HYDROData/HYDROData_PolylineXY.cxx b/src/HYDROData/HYDROData_PolylineXY.cxx
index fc97524992fc8faa9c0e97234727ab7e7d6fbe6d..4b82850f80e1b0bda53f4f2cf2cd6517a7cfaea0 100644 (file)
--- 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 );
 

diff --git a/src/HYDROData/HYDROData_TopoCurve.cxx b/src/HYDROData/HYDROData_TopoCurve.cxx
index c08d6bf6d84d324194718d02d6a16912092935be..ffa0361075c86d446a21d891f10633588a23ab78 100644 (file)
--- a/src/HYDROData/HYDROData_TopoCurve.cxx
+++ b/src/HYDROData/HYDROData_TopoCurve.cxx
@@ -373,7 +373,7 @@ bool HYDROData_TopoCurve::Initialize(const TopoDS_Wire& theWire)
   TopExp::MapShapesAndAncestors(theWire,
     TopAbs_VERTEX, TopAbs_EDGE, aVertexToEdges);
   const int aVCount = aVertexToEdges.Extent();
-  DEBTRACE("initialize VCount= "<< aVCount);
+  //DEBTRACE("initialize VCount= "<< aVCount);
   if (aVCount == 0)
   {
     return false;
@@ -502,7 +502,7 @@ bool HYDROData_TopoCurve::Cut(
     aParamI ^= 1;
   }
   const bool isClosed = IsClosed();
-  DEBTRACE("aParamI: " << aParamI << " isClosed: "<< isClosed);
+  //DEBTRACE("aParamI: " << aParamI << " isClosed: "<< isClosed);
   if (aParamI < 0)
   {
     aEdge.Orientation(TopAbs_FORWARD);
@@ -679,7 +679,7 @@ int HYDROData_TopoCurve::Intersect(
       aIntCount += IntersectEdge(aEdge,TopoDS::Edge(aEIt2.Current()), aParams);
     }
   }
-  DEBTRACE("aIntCount " << aIntCount);
+  //DEBTRACE("aIntCount " << aIntCount);
   return aIntCount;
 }
 

diff --git a/src/HYDRO_tests/test_HYDROData_DTM.cxx b/src/HYDRO_tests/test_HYDROData_DTM.cxx
index 4b265dca71a7ed3476df26ccf9235b63423b9285..153f3c44292eda3e1e7cfec5875706b422ef2577 100644 (file)
--- a/src/HYDRO_tests/test_HYDROData_DTM.cxx
+++ b/src/HYDRO_tests/test_HYDROData_DTM.cxx
@@ -507,9 +507,9 @@ void test_HYDROData_DTM::test_curve_to_3d()
   HYDROData_DTM::CurveTo3D( HA, mid, wid, points, 0.0 );
 
   CPPUNIT_ASSERT_EQUAL( 4, (int)points.size() );
-  CPPUNIT_ASSERT_EQUAL( HYDROData_DTM::AltitudePoint( 15.673, -1.479, 5.0 ), points[0] );
-  CPPUNIT_ASSERT_EQUAL( HYDROData_DTM::AltitudePoint( 14.259, -0.065, 5.0 ), points[1] );
-  CPPUNIT_ASSERT_EQUAL( HYDROData_DTM::AltitudePoint( 16.380, -2.186, 6.0 ), points[2] );
+  CPPUNIT_ASSERT_EQUAL( HYDROData_DTM::AltitudePoint( 16.380, -2.186, 6.0 ), points[0] );
+  CPPUNIT_ASSERT_EQUAL( HYDROData_DTM::AltitudePoint( 15.673, -1.479, 5.0 ), points[1] );
+  CPPUNIT_ASSERT_EQUAL( HYDROData_DTM::AltitudePoint( 14.259, -0.065, 5.0 ), points[2] );
   CPPUNIT_ASSERT_EQUAL( HYDROData_DTM::AltitudePoint( 12.137,  2.056, 6.0 ), points[3] );
 
   aDoc->Close();
@@ -547,7 +547,7 @@ void test_HYDROData_DTM::test_presentation()
   CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0, DTM->GetSpatialStep(), EPS );
   DTM->Update();
   
-  CPPUNIT_ASSERT_EQUAL( 10098, (int)DTM->GetAltitudePoints().size() ); 
+  CPPUNIT_ASSERT_EQUAL( 9177, (int)DTM->GetAltitudePoints().size() ); 
 
   Handle_AIS_InteractiveContext aContext = TestViewer::context();
   HYDROGUI_ShapeBathymetry* aBathPrs = new HYDROGUI_ShapeBathymetry( 0, aContext, DTM );
@@ -588,7 +588,7 @@ void test_HYDROData_DTM::test_garonne()
       profiles.Append( Handle(HYDROData_Profile)::DownCast( it.Current() ) );
   }
 
-  //CPPUNIT_ASSERT_EQUAL( 46, (int)profiles.Size() );
+  CPPUNIT_ASSERT_EQUAL( 11, (int)profiles.Size() );
 
 
 
@@ -600,7 +600,7 @@ void test_HYDROData_DTM::test_garonne()
   CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0, DTM->GetSpatialStep(), EPS );
   DTM->Update();
   
-  CPPUNIT_ASSERT_EQUAL( 277158, (int)DTM->GetAltitudePoints().size() ); 
+  CPPUNIT_ASSERT_EQUAL( 275690, (int)DTM->GetAltitudePoints().size() ); 
 
   Handle_AIS_InteractiveContext aContext = TestViewer::context();
   HYDROGUI_ShapeBathymetry* aBathPrs = new HYDROGUI_ShapeBathymetry( 0, aContext, DTM );