X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Bathymetry.h;h=7c4f092da723d9e40f382439599b2f47f40830f4;hb=ad8562bab9992101430a6327aa7ca06c71f6d084;hp=d14110f828cad3536b02167efe9ac3f0d4cdbc3c;hpb=a9809a049bc84242310991d410fb8a43fd4bb116;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Bathymetry.h b/src/HYDROData/HYDROData_Bathymetry.h
index d14110f8..7c4f092d 100644
--- 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,8 +29,9 @@ protected:
    */
   enum DataTag
   {
-    DataTag_First = HYDROData_Object::DataTag_First + 100, ///< first tag, to reserve
-    DataTag_AltitudePoints ///< altitude points, array of reals
+    DataTag_First = HYDROData_IAltitudeObject::DataTag_First + 100, ///< first tag, to reserve
+    DataTag_AltitudePoints, ///< altitude points, array of reals
+    DataTag_FilePath        ///< bathymetry imported file path
   };
 
 public:
@@ -45,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.
@@ -71,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
@@ -85,10 +76,20 @@ public:
    */
   HYDRODATA_EXPORT virtual double           GetAltitudeForPoint( const gp_XY& thePoint ) const;
 
-
 public:
   // Public methods to work with files.
 
+  /**
+   * Stores the bathymetry file path
+   * \param theFilePath image file path
+   */
+  HYDRODATA_EXPORT void                     SetFilePath( const QString& theFilePath );
+
+  /**
+   * Returns uploaded bathymetry file path
+   */
+  HYDRODATA_EXPORT QString                  GetFilePath() const;
+
   /**
    * Imports Bathymetry data from file. The supported file types:
    *  - xyz
@@ -114,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