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

diff --git a/src/HYDROData/HYDROData_Bathymetry.h b/src/HYDROData/HYDROData_Bathymetry.h
index 0f93d19c..7c4f092d 100644
--- a/src/HYDROData/HYDROData_Bathymetry.h
+++ b/src/HYDROData/HYDROData_Bathymetry.h
@@ -1,15 +1,13 @@
 
 #ifndef HYDROData_Bathymetry_HeaderFile
-#define HYDROData_Polyline_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,6 +44,11 @@ public:
   HYDRODATA_EXPORT virtual const ObjectKind GetKind() const { return KIND_BATHYMETRY; }
 
 
+  /**
+   * Dump Bathymetry object to Python script representation.
+   */
+  HYDRODATA_EXPORT virtual QStringList DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const;
+
 public:      
   // Public methods to work with Bathymetry altitudes.
 
@@ -65,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
@@ -79,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
@@ -108,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