Useless method has been removed.

diff --git a/src/HYDROData/HYDROData_Bathymetry.h b/src/HYDROData/HYDROData_Bathymetry.h
index f7bc599fa5dddbed8880f0bc829121ed00e0d87d..db928f7a506b994deb3efb9ffbdfc297660c4a98 100644 (file)
--- a/src/HYDROData/HYDROData_Bathymetry.h
+++ b/src/HYDROData/HYDROData_Bathymetry.h
@@ -76,9 +76,6 @@ public:
    */
   HYDRODATA_EXPORT virtual double           GetAltitudeForPoint( const gp_XY& thePoint ) const;
 
-  using HYDROData_IAltitudeObject::GetAltitudeForPoint;  
-
-
 public:
   // Public methods to work with files.
 

diff --git a/src/HYDROData/HYDROData_IAltitudeObject.cxx b/src/HYDROData/HYDROData_IAltitudeObject.cxx
index 2dc967a5efe2bfca96901cc3906b13d9ffc3a23e..79c11237ba3ed3a0b36d5d2e2ef5143b687df069 100644 (file)
--- a/src/HYDROData/HYDROData_IAltitudeObject.cxx
+++ b/src/HYDROData/HYDROData_IAltitudeObject.cxx
@@ -3,8 +3,6 @@
 
 #include <gp_XY.hxx>
 
-#include <QPointF>
-
 #define INVALID_ALTITUDE_VALUE -9999.0
 
 IMPLEMENT_STANDARD_HANDLE(HYDROData_IAltitudeObject, HYDROData_Entity)
@@ -24,11 +22,4 @@ double HYDROData_IAltitudeObject::GetInvalidAltitude()
   return INVALID_ALTITUDE_VALUE;
 }
 
-double HYDROData_IAltitudeObject::GetAltitudeForPoint( const QPointF& thePoint ) const
-{
-  gp_XY aGpPoint( thePoint.x(), thePoint.y() );
-  return GetAltitudeForPoint( aGpPoint );
-}
-
-
 

diff --git a/src/HYDROData/HYDROData_IAltitudeObject.h b/src/HYDROData/HYDROData_IAltitudeObject.h
index ba76126b9b9c3f5072404f429b7ea99b65a55f8c..ceb393519f0edf23543288600f42952ef8d7cd92 100644 (file)
--- a/src/HYDROData/HYDROData_IAltitudeObject.h
+++ b/src/HYDROData/HYDROData_IAltitudeObject.h
@@ -5,7 +5,6 @@
 #include "HYDROData_Entity.h"
 
 class gp_XY;
-class QPointF;
 
 DEFINE_STANDARD_HANDLE(HYDROData_IAltitudeObject, HYDROData_Entity)
 
@@ -44,13 +43,6 @@ public:
    */
   HYDRODATA_EXPORT static double            GetInvalidAltitude();
 
-  /**
-   * Returns altitude for given point.
-   * \param thePoint the point to examine
-   * \return altitude value
-   */
-  HYDRODATA_EXPORT virtual double           GetAltitudeForPoint( const QPointF& thePoint ) const;
-
   /**
    * Returns altitude for given point.
    * \param thePoint the point to examine

diff --git a/src/HYDROData/test_HYDROData_Bathymetry.cxx b/src/HYDROData/test_HYDROData_Bathymetry.cxx
index 78bc6a81ec3a67dc79cffd5f4757d449b28dcc7e..2a1a95c2bc4139566c598f7f1d07894ad9aab33f 100755 (executable)
--- a/src/HYDROData/test_HYDROData_Bathymetry.cxx
+++ b/src/HYDROData/test_HYDROData_Bathymetry.cxx
@@ -4,11 +4,11 @@
 #include <HYDROData_Tool.h>
 #include <HYDROData_Bathymetry.h>
 
+#include <gp_XY.hxx>
 #include <gp_XYZ.hxx>
 
 #include <QDir>
 #include <QFile>
-#include <QPointF>
 #include <QTextStream>
 
 bool test_HYDROData_Bathymetry::createTestFile( const QString& theFileName )
@@ -67,27 +67,27 @@ void test_HYDROData_Bathymetry::testFileImport()
   HYDROData_Bathymetry::AltitudePoints anAltitudePoints = aBathymetry->GetAltitudePoints();
   CPPUNIT_ASSERT( anAltitudePoints.length() != 16 );
 
-  QPointF aTestPoint( 1, 1 );
+  gp_XY aTestPoint( 1, 1 );
   double anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint );
   CPPUNIT_ASSERT( !ValuesEquals( anAltitude, 10.0 ) );
 
-  aTestPoint = QPointF( 0.5, 0.5 );
+  aTestPoint = gp_XY( 0.5, 0.5 );
   anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint );
   CPPUNIT_ASSERT( !ValuesEquals( anAltitude, 5.0 ) );
 
-  aTestPoint = QPointF( 1.5, 1 );
+  aTestPoint = gp_XY( 1.5, 1 );
   anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint );
   CPPUNIT_ASSERT( !ValuesEquals( anAltitude, 10.0 ) );
 
-  aTestPoint = QPointF( 1.5, 0.7 );
+  aTestPoint = gp_XY( 1.5, 0.7 );
   anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint );
   CPPUNIT_ASSERT( !ValuesEquals( anAltitude, 7.0 ) );
 
-  aTestPoint = QPointF( 1.5, -0.7 );
+  aTestPoint = gp_XY( 1.5, -0.7 );
   anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint );
   CPPUNIT_ASSERT( !ValuesEquals( anAltitude, HYDROData_Bathymetry::GetInvalidAltitude() ) );
 
-  aTestPoint = QPointF( 2, 3.5 );
+  aTestPoint = gp_XY( 2, 3.5 );
   anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint );
   CPPUNIT_ASSERT( !ValuesEquals( anAltitude, 35.0 ) );