X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2Ftest_HYDROData_Bathymetry.cxx;h=9901c8ea7eb99f4b9ad775419754fba72a302a5c;hb=e7225e329739e01faed6682de0bc83cf84c28de6;hp=ec48701cdf519d48d379d2f47dcf63c58313c302;hpb=0ef4d399f85935154e349e0ccc8b40f1eca4c090;p=modules%2Fhydro.git

diff --git a/src/HYDROData/test_HYDROData_Bathymetry.cxx b/src/HYDROData/test_HYDROData_Bathymetry.cxx
index ec48701c..9901c8ea 100755
--- a/src/HYDROData/test_HYDROData_Bathymetry.cxx
+++ b/src/HYDROData/test_HYDROData_Bathymetry.cxx
@@ -48,45 +48,44 @@ bool test_HYDROData_Bathymetry::createTestFile( const QString& theFileName )
     QTextStream anOutStream( &aTmpFile );
 
     srand( 4587 );
-
-    generateOne( anOutStream, 0, -5, 0, 5 );
-    generateOne( anOutStream, 10, -5, 10, 5 );
-    generateOne( anOutStream, 20, -5, 20, 5 );
-    generateOne( anOutStream, 30, -5, 30, 5 );
-    generateOne( anOutStream, 40, -5, 40, 5 );
-    generateOne( anOutStream, 50.85397, -3.794724, 45.833271, 6.703101 );
+    generateOne( anOutStream, 0, 5, 0, -5 );
+    generateOne( anOutStream, 10, 5, 10, -5 );
+    generateOne( anOutStream, 20, 5, 20, -5 );
+    generateOne( anOutStream, 30, 5, 30, -5 );
+    generateOne( anOutStream, 40, 5, 40, -5 );
+    generateOne( anOutStream, 45.833271, 6.703101, 50.85397, -3.794724 );
     generateOne( anOutStream, 50.85397, 11.267372, 56.787525, 2.367043 );
-    generateOne( anOutStream, 62.721077, 10.354518, 52.67968, 16.516285 );
-    generateOne( anOutStream, 65.23143, 17.657352, 55.190029, 23.819118 );
+    generateOne( anOutStream, 52.67968, 16.516285, 62.721077, 10.354518 );
+    generateOne( anOutStream, 55.190029, 23.819118, 65.23143, 17.657352 );
     generateOne( anOutStream, 58.385021, 31.806595, 68.198204, 23.819118 );
     generateOne( anOutStream, 65.916069, 38.653004, 75.044609, 27.470537 );
-    generateOne( anOutStream, 82.575661, 28.38339, 76.870323, 41.847992 );
+    generateOne( anOutStream, 76.870323, 41.847992, 82.575661, 28.38339 );
     generateOne( anOutStream, 92.845276, 40.022282, 91.932419, 26.557682 );
     generateOne( anOutStream, 106.081657, 35.686226, 98.778824, 21.99341 );
-    generateOne( anOutStream, 106.994514, 14.91879, 119.774475, 29.980886 );
+    generateOne( anOutStream, 119.774475, 29.980886, 106.994514, 14.91879 );
     generateOne( anOutStream, 133.239075, 26.785896, 115.666634, 5.790246 );
-    generateOne( anOutStream, 125.47982, -4.707579, 150.811523, 20.167702 );
+    generateOne( anOutStream, 150.811523, 20.167702, 125.47982, -4.707579 );
     generateOne( anOutStream, 163.591476, 13.777717, 135.977631, -12.92327 );
-    generateOne( anOutStream, 151.496155, -24.105736, 183.446045, 11.267367 );
-    generateOne( anOutStream, 172.720016, -31.180355, 197.367081, 8.98523100 );
-    generateOne( anOutStream, 197.823502, -38.483189, 214.026672, 9.669872 );
-    generateOne( anOutStream, 220.873108, -47.155304, 235.706985, 9.89809100 );
-    generateOne( anOutStream, 248.715134, -58.565987, 266.744019, 9.213447 );
-    generateOne( anOutStream, 278.611145, -67.922737, 307.366028, 10.354514 );
-    generateOne( anOutStream, 316.951019, -84.81053, 342.510925, 7.159524 );
-    generateOne( anOutStream, 350.913635, -100.02983, 384.659393, -4.55408 );
+    generateOne( anOutStream, 183.446045, 11.267367, 151.496155, -24.105736 );
+    generateOne( anOutStream, 197.367081, 8.98523100, 172.720016, -31.180355 );
+    generateOne( anOutStream, 214.026672, 9.669872, 197.823502, -38.483189 );
+    generateOne( anOutStream, 235.706985, 9.89809100, 220.873108, -47.155304 );
+    generateOne( anOutStream, 266.744019, 9.213447, 248.715134, -58.565987 );
+    generateOne( anOutStream, 307.366028, 10.354514, 278.611145, -67.922737 );
+    generateOne( anOutStream, 342.510925, 7.159524, 316.951019, -84.81053 );
+    generateOne( anOutStream, 384.659393, -4.55408, 350.913635, -100.02983 );
     generateOne( anOutStream, 443.097107, -21.015415, 391.243927, -118.960365 );
-    generateOne( anOutStream, 440.62793, -147.7677, 500.711792, -34.184483 );
-    generateOne( anOutStream, 482.604309, -169.990509, 547.626587, -52.291954 );
-    generateOne( anOutStream, 534.45752, -193.8594, 589.603027, -68.753288 );
+    generateOne( anOutStream, 500.711792, -34.184483, 440.62793, -147.7677 );
+    generateOne( anOutStream, 547.626587, -52.291954, 482.604309, -169.990509 );
+    generateOne( anOutStream, 589.603027, -68.753288, 534.45752, -193.8594 );
     generateOne( anOutStream, 633.225525, -97.560631, 569.026306, -206.205444 );
-    generateOne( anOutStream, 601.948975, -224.312912, 673.555786, -120.606499 );
-    generateOne( anOutStream, 654.625305, -248.181854, 719.647522, -148.590775 );
-    generateOne( anOutStream, 708.947693, -278.635315, 770.677673, -183.982635 );
-    generateOne( anOutStream, 742.69342, -314.027191, 824.177002, -225.959045 );
-    generateOne( anOutStream, 793.05932, -341.853638, 855.937317, -260.368958 );
-    generateOne( anOutStream, 838.6137700, -355.969116, 884.168213, -294.37439 );
-    generateOne( anOutStream, 875.185669, -366.234894, 915.607178, -327.096588 );
+    generateOne( anOutStream, 673.555786, -120.606499, 601.948975, -224.312912 );
+    generateOne( anOutStream, 719.647522, -148.590775, 654.625305, -248.181854 );
+    generateOne( anOutStream, 770.677673, -183.982635, 708.947693, -278.635315 );
+    generateOne( anOutStream, 824.177002, -225.959045, 742.69342, -314.027191 );
+    generateOne( anOutStream, 855.937317, -260.368958, 793.05932, -341.853638 );
+    generateOne( anOutStream, 884.168213, -294.37439, 838.6137700, -355.969116 );
+    generateOne( anOutStream, 915.607178, -327.096588, 875.185669, -366.234894 );
     generateOne( anOutStream, 940.630066, -348.269775, 903.416565, -381.633575 );
     generateOne( anOutStream, 963.728088, -370.726166, 936.780396, -397.032257 );
     generateOne( anOutStream, 983.618042, -390.61615, 959.878418, -411.789337 );
@@ -113,10 +112,10 @@ void test_HYDROData_Bathymetry::testFileImport()
   if ( !createTestFile( aFileName ) )
     return; // No file has been created
 
-  CPPUNIT_ASSERT( aBathymetry->ImportFromFile( aFileName ) );
+  CPPUNIT_ASSERT( aBathymetry->ImportFromFile( aFileName.toStdString().c_str() ) );
 
   HYDROData_Bathymetry::AltitudePoints anAltitudePoints = aBathymetry->GetAltitudePoints();
-  CPPUNIT_ASSERT( anAltitudePoints.length() == 20 );
+  CPPUNIT_ASSERT( anAltitudePoints.Length() == 20 );
 
   gp_XY aTestPoint( 1, 1 );
   double anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint );
@@ -159,10 +158,10 @@ void test_HYDROData_Bathymetry::testCopy()
   
   if ( anIsFileCreated )
   {
-    CPPUNIT_ASSERT( aBathymetry1->ImportFromFile( aFileName ) );
+    CPPUNIT_ASSERT( aBathymetry1->ImportFromFile( aFileName.toStdString().c_str() ) );
 
     HYDROData_Bathymetry::AltitudePoints anAltitudePoints = aBathymetry1->GetAltitudePoints();
-    CPPUNIT_ASSERT( anAltitudePoints.length() == 20 );
+    CPPUNIT_ASSERT( anAltitudePoints.Length() == 20 );
   }
 
   Handle(HYDROData_Bathymetry) aBathymetry2 = 
@@ -173,7 +172,7 @@ void test_HYDROData_Bathymetry::testCopy()
   if ( anIsFileCreated )
   {
     HYDROData_Bathymetry::AltitudePoints anAltitudePoints = aBathymetry2->GetAltitudePoints();
-    CPPUNIT_ASSERT( anAltitudePoints.length() == 20 );
+    CPPUNIT_ASSERT( anAltitudePoints.Length() == 20 );
   }
 
   aDoc->Close();