lot 11 : corrections

diff --git a/src/HYDROData/HYDROData_LISM.cxx b/src/HYDROData/HYDROData_LISM.cxx
index f60f03c1f4ac57927ab06e31c512b16aeb6ab467..3e3b0c09fb0ab5de11c7a07c22173566c19f4cdd 100644 (file)
--- a/src/HYDROData/HYDROData_LISM.cxx
+++ b/src/HYDROData/HYDROData_LISM.cxx
@@ -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
+
 
 #include <HYDROData_LISM.h>
 #include <HYDROData_Profile.h>

diff --git a/src/HYDROData/HYDROData_LISM.h b/src/HYDROData/HYDROData_LISM.h
index d19d66fda9c89a811b220597fbe86dd24322e9bd..8224ff678ac04d8bce23f3fc83f27e151fdc6822 100644 (file)
--- a/src/HYDROData/HYDROData_LISM.h
+++ b/src/HYDROData/HYDROData_LISM.h
@@ -82,13 +82,6 @@ public:
   HYDRODATA_EXPORT void GetShapePresentations( HYDROData_Stream::PrsDefinition& prsDef);
 
 
-
-public:
-
-  //HYDRODATA_EXPORT void GetWarnings(NCollection_DataMap<Handle(HYDROData_Profile), QSet<QString>>& warnings);
-
-protected:
-    //NCollection_DataMap<Handle(HYDROData_Profile), QSet<QString>> myWarnings;
 };
 
 

diff --git a/src/HYDROGUI/resources/HYDROGUI_msg_en.ts b/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
index 1e87f9f18e4a1f7c8315ee7f71f80c606ba5ae89..dc4465a16b99a828add3d02ece7e4ea799c15ef0 100755 (executable)
--- a/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
+++ b/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
@@ -3000,6 +3000,10 @@ file cannot be correctly imported for an Obstacle definition.</translation>
       <source>STREAM_DDZ</source>\r
       <translation>Stream ddz</translation>\r
     </message>\r
+    <message>\r
+      <source>STREAM_SPATIAL_STEP</source>\r
+      <translation>Stream spatial step</translation>\r
+    </message>\r
     <message>\r
       <source>VIA_DTM</source>\r
       <translation>via DTM</translation>\r

diff --git a/src/HYDRO_tests/ExternalFiles.cmake b/src/HYDRO_tests/ExternalFiles.cmake
index b71f3d1e6f7ba781ab57e4585efc4ae3fb6ad3e5..23fae5e5402ca213824562f0b3f306c96d155da9 100644 (file)
--- a/src/HYDRO_tests/ExternalFiles.cmake
+++ b/src/HYDRO_tests/ExternalFiles.cmake
@@ -63,7 +63,8 @@ set( EXTERNAL_FILES
   ../HYDROData/HYDROData_QuadtreeNode.cxx
   ../HYDROData/HYDROData_LCM_FaceClassifier.cxx
   ../HYDROData/HYDROData_DTM.cxx
-
+  ../HYDROData/HYDROData_LISM.cxx
+  ../HYDROData/HYDROData_StreamLinearInterpolation.cxx
   ../HYDROGUI/HYDROGUI_ListModel.cxx
   ../HYDROGUI/HYDROGUI_DataObject.cxx
   ../HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx