From: isn Date: Tue, 19 Mar 2019 19:02:16 +0000 (+0300) Subject: lot 11 : corrections X-Git-Tag: SH_V2_2_0~99^2~27^2~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=eb529fcc2aa2cae469acf760f34ffacbaaf77a79;p=modules%2Fhydro.git lot 11 : corrections --- diff --git a/src/HYDROData/HYDROData_LISM.cxx b/src/HYDROData/HYDROData_LISM.cxx index f60f03c1..3e3b0c09 100644 --- 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 #include diff --git a/src/HYDROData/HYDROData_LISM.h b/src/HYDROData/HYDROData_LISM.h index d19d66fd..8224ff67 100644 --- 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>& warnings); - -protected: - //NCollection_DataMap> myWarnings; }; diff --git a/src/HYDROGUI/resources/HYDROGUI_msg_en.ts b/src/HYDROGUI/resources/HYDROGUI_msg_en.ts index 1e87f9f1..dc4465a1 100755 --- 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. STREAM_DDZ Stream ddz + + STREAM_SPATIAL_STEP + Stream spatial step + VIA_DTM via DTM diff --git a/src/HYDRO_tests/ExternalFiles.cmake b/src/HYDRO_tests/ExternalFiles.cmake index b71f3d1e..23fae5e5 100644 --- 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