X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Bathymetry.h;h=5c3551997e1ba8ec082dd48654cfe3726f97cb9e;hb=0b8b69a9ad7c8c3340c4a828c7f96cb9455d7df9;hp=e8682fd461db8beaa38415f8104c4907c0bc61ad;hpb=c7019bbe1470fd78e243033d71e8b9fcdaee18a7;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Bathymetry.h b/src/HYDROData/HYDROData_Bathymetry.h
index e8682fd4..5c355199 100644
--- a/src/HYDROData/HYDROData_Bathymetry.h
+++ b/src/HYDROData/HYDROData_Bathymetry.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_Bathymetry_HeaderFile
 #define HYDROData_Bathymetry_HeaderFile
@@ -6,6 +23,7 @@
 
 class QFile;
 class gp_XYZ;
+class Handle_HYDROData_PolylineXY;
 
 DEFINE_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_IAltitudeObject)
 
@@ -19,8 +37,8 @@ class HYDROData_Bathymetry : public HYDROData_IAltitudeObject
 {
 public:
 
-  typedef gp_XYZ               AltitudePoint;
-  typedef QList<AltitudePoint> AltitudePoints;
+  typedef gp_XYZ                              AltitudePoint;
+  typedef NCollection_Sequence<AltitudePoint> AltitudePoints;
 
 protected:
 
@@ -63,7 +81,7 @@ public:
    * Returns altitude points list.
    * \return points list
    */
-  HYDRODATA_EXPORT virtual AltitudePoints   GetAltitudePoints() const;
+  HYDRODATA_EXPORT virtual AltitudePoints   GetAltitudePoints(bool IsConvertToGlobal = false) const;
 
   /**
    * Remove all altitude points.
@@ -84,12 +102,12 @@ public:
    * Stores the bathymetry file path
    * \param theFilePath image file path
    */
-  HYDRODATA_EXPORT void                     SetFilePath( const QString& theFilePath );
+  HYDRODATA_EXPORT void                     SetFilePath( const TCollection_AsciiString& theFilePath );
 
   /**
    * Returns uploaded bathymetry file path
    */
-  HYDRODATA_EXPORT QString                  GetFilePath() const;
+  HYDRODATA_EXPORT TCollection_AsciiString  GetFilePath() const;
 
   /**
    * Set flag indicating needs to invert altitude values
@@ -110,9 +128,11 @@ public:
    * \param theFileName the path to file
    * \return \c true if file has been successfully read
    */
-  HYDRODATA_EXPORT virtual bool             ImportFromFile( const QString& theFileName );
+  HYDRODATA_EXPORT virtual bool             ImportFromFile( const TCollection_AsciiString& theFileName );
 
-  HYDRODATA_EXPORT bool CreateBoundaryPolyline() const;
+  HYDRODATA_EXPORT Handle_HYDROData_PolylineXY CreateBoundaryPolyline() const;
+
+  HYDRODATA_EXPORT virtual void UpdateLocalCS( double theDx, double theDy );
 
 private:
 
@@ -122,6 +142,9 @@ private:
   bool                                      importFromXYZFile( QFile&          theFile,
                                                                AltitudePoints& thePoints ) const;
 
+  bool                                      importFromASCFile( QFile&          theFile,
+                                                               AltitudePoints& thePoints ) const;
+
 protected:
 
   friend class HYDROData_Iterator;