The data model has been rolled back to previous version.

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

diff --git a/src/HYDROData/HYDROData_Bathymetry.h b/src/HYDROData/HYDROData_Bathymetry.h
index 3b74f4695473824aa9fe2fd73fecf84827cbbe81..7c4f092da723d9e40f382439599b2f47f40830f4 100644 (file)
--- a/src/HYDROData/HYDROData_Bathymetry.h
+++ b/src/HYDROData/HYDROData_Bathymetry.h
@@ -2,14 +2,12 @@
 #ifndef HYDROData_Bathymetry_HeaderFile
 #define HYDROData_Bathymetry_HeaderFile
 
-#include <HYDROData_Object.h>
+#include "HYDROData_IAltitudeObject.h"
 
-class gp_XY;
-class gp_XYZ;
-class QPointF;
 class QFile;
+class gp_XYZ;
 
-DEFINE_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_Object)
+DEFINE_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_IAltitudeObject)
 
 
 /**\class HYDROData_Bathymetry
@@ -17,7 +15,7 @@ DEFINE_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_Object)
  *
  * The Bathymetry represents measurement of the altitude of points on the terrain.
  */
-class HYDROData_Bathymetry : public HYDROData_Object
+class HYDROData_Bathymetry : public HYDROData_IAltitudeObject
 {
 public:
 
@@ -31,7 +29,7 @@ protected:
    */
   enum DataTag
   {
-    DataTag_First = HYDROData_Object::DataTag_First + 100, ///< first tag, to reserve
+    DataTag_First = HYDROData_IAltitudeObject::DataTag_First + 100, ///< first tag, to reserve
     DataTag_AltitudePoints, ///< altitude points, array of reals
     DataTag_FilePath        ///< bathymetry imported file path
   };
@@ -46,14 +44,13 @@ public:
   HYDRODATA_EXPORT virtual const ObjectKind GetKind() const { return KIND_BATHYMETRY; }
 
 
-public:      
-  // Public methods to work with Bathymetry altitudes.
-
   /**
-   * Returns altitude points list.
-   * \return points list
+   * Dump Bathymetry object to Python script representation.
    */
-  HYDRODATA_EXPORT static double            GetInvalidAltitude();
+  HYDRODATA_EXPORT virtual QStringList DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const;
+
+public:      
+  // Public methods to work with Bathymetry altitudes.
 
   /**
    * Replace current altitude points by new one.
@@ -72,13 +69,6 @@ public:
    */
   HYDRODATA_EXPORT virtual void             RemoveAltitudePoints();
 
-  /**
-   * 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
@@ -86,7 +76,6 @@ public:
    */
   HYDRODATA_EXPORT virtual double           GetAltitudeForPoint( const gp_XY& thePoint ) const;
 
-
 public:
   // Public methods to work with files.
 
@@ -126,12 +115,12 @@ protected:
    * Creates new object in the internal data structure. Use higher level objects 
    * to create objects with real content.
    */
-  HYDROData_Bathymetry();
+  HYDRODATA_EXPORT HYDROData_Bathymetry();
 
   /**
    * Destructs properties of the object and object itself, removes it from the document.
    */
-  ~HYDROData_Bathymetry();
+  HYDRODATA_EXPORT ~HYDROData_Bathymetry();
 };
 
 #endif