Merge remote-tracking branch 'origin/BR_DEMO' into BR_2017

[modules/hydro.git] / src / HYDROData / HYDROData_IAltitudeObject.h

diff --git a/src/HYDROData/HYDROData_IAltitudeObject.h b/src/HYDROData/HYDROData_IAltitudeObject.h
index ba76126b9b9c3f5072404f429b7ea99b65a55f8c..638a1b783e67ea1650ac2fa64a5f974a3a6ba453 100644 (file)
--- a/src/HYDROData/HYDROData_IAltitudeObject.h
+++ b/src/HYDROData/HYDROData_IAltitudeObject.h
@@ -1,3 +1,20 @@
+// Copyright (C) 2014-2015  EDF-R&D
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef HYDROData_IAltitudeObject_HeaderFile
 #define HYDROData_IAltitudeObject_HeaderFile
@@ -5,9 +22,6 @@
 #include "HYDROData_Entity.h"
 
 class gp_XY;
-class QPointF;
-
-DEFINE_STANDARD_HANDLE(HYDROData_IAltitudeObject, HYDROData_Entity)
 
 
 /**\class HYDROData_IAltitudeObject
@@ -27,15 +41,14 @@ protected:
   };
 
 public:
-
-  DEFINE_STANDARD_RTTI(HYDROData_IAltitudeObject);
+  DEFINE_STANDARD_RTTIEXT(HYDROData_IAltitudeObject, HYDROData_Entity);
 
   /**
    * Returns the kind of this object. Must be redefined in all objects of known type.
    */
   HYDRODATA_EXPORT virtual const ObjectKind GetKind() const = 0;
 
-public:      
+public:
   // Public methods to work with altitudes.
 
   /**
@@ -49,14 +62,7 @@ public:
    * \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
-   * \return altitude value
-   */
-  HYDRODATA_EXPORT virtual double           GetAltitudeForPoint( const gp_XY& thePoint ) const = 0;
+  HYDRODATA_EXPORT virtual double           GetAltitudeForPoint( const gp_XY& thePoint, int theMethod=0 ) const = 0;
 
 
 protected:
@@ -65,12 +71,12 @@ protected:
    * Creates new object in the internal data structure. Use higher level objects 
    * to create objects with real content.
    */
-  HYDROData_IAltitudeObject();
+  HYDRODATA_EXPORT HYDROData_IAltitudeObject();
 
   /**
    * Destructs properties of the object and object itself, removes it from the document.
    */
-  ~HYDROData_IAltitudeObject();
+  HYDRODATA_EXPORT ~HYDROData_IAltitudeObject();
 };
 
 #endif