From: asl <asl@opencascade.com>
Date: Wed, 11 Oct 2017 09:12:15 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/BR_1321_ECW' into BR_DEMO
X-Git-Tag: v2.1~66^2~7
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=54c517abf4fb5f89df90c75a71d8292eec4148d6;p=modules%2Fhydro.git

Merge remote-tracking branch 'origin/BR_1321_ECW' into BR_DEMO

# Conflicts:
#	doc/CMakeLists.txt
#	src/HYDROData/HYDROData_IProfilesInterpolator.h
#	src/HYDROGUI/HYDROGUI_BathymetryPrs.cxx
#	src/HYDROGUI/HYDROGUI_BathymetryPrs.h
#	src/HYDRO_tests/CMakeLists.txt
#	src/HYDRO_tests/reference_data/Extraction_Channel.png
#	src/HYDRO_tests/reference_data/Extraction_ImmZone.png
#	src/HYDRO_tests/reference_data/Merge_Polylines.png
#	src/HYDRO_tests/reference_data/Polyline_Presentation.png
#	src/HYDRO_tests/reference_data/Split_Polylines_Colors.png
#	src/HYDRO_tests/reference_data/Split_Straight.png
---

54c517abf4fb5f89df90c75a71d8292eec4148d6
diff --cc src/HYDROGUI/HYDROGUI_BathymetryPrs.cxx
index 63d04939,e6e427b4..bf7f53b3
--- a/src/HYDROGUI/HYDROGUI_BathymetryPrs.cxx
+++ b/src/HYDROGUI/HYDROGUI_BathymetryPrs.cxx
@@@ -83,6 -75,7 +83,7 @@@ void HYDROGUI_BathymetryPrs::Compute( c
      if( myBound.IsVoid() )
        UpdateBound();
  
++
      if( myBound.IsVoid() || 
          myBound.IsOpenXmin() || myBound.IsOpenXmax() ||
          myBound.IsOpenYmin() || myBound.IsOpenYmax() ||