From de1be168adaee2bfd5ab7b13552d0859cc36c6e2 Mon Sep 17 00:00:00 2001 From: adv Date: Tue, 29 Oct 2013 11:39:37 +0000 Subject: [PATCH] Useless method has been removed. --- src/HYDROData/HYDROData_Bathymetry.h | 3 --- src/HYDROData/HYDROData_IAltitudeObject.cxx | 9 --------- src/HYDROData/HYDROData_IAltitudeObject.h | 8 -------- src/HYDROData/test_HYDROData_Bathymetry.cxx | 14 +++++++------- 4 files changed, 7 insertions(+), 27 deletions(-) diff --git a/src/HYDROData/HYDROData_Bathymetry.h b/src/HYDROData/HYDROData_Bathymetry.h index f7bc599f..db928f7a 100644 --- 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 2dc967a5..79c11237 100644 --- a/src/HYDROData/HYDROData_IAltitudeObject.cxx +++ b/src/HYDROData/HYDROData_IAltitudeObject.cxx @@ -3,8 +3,6 @@ #include -#include - #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 ba76126b..ceb39351 100644 --- 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 78bc6a81..2a1a95c2 100755 --- a/src/HYDROData/test_HYDROData_Bathymetry.cxx +++ b/src/HYDROData/test_HYDROData_Bathymetry.cxx @@ -4,11 +4,11 @@ #include #include +#include #include #include #include -#include #include 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 ) ); -- 2.39.2