]> SALOME platform Git repositories - modules/hydro.git/commitdiff
Salome HOME
Merge remote-tracking branch 'origin/BR_1321_ECW' into BR_DEMO
authorasl <asl@opencascade.com>
Wed, 11 Oct 2017 09:12:15 +0000 (12:12 +0300)
committerasl <asl@opencascade.com>
Wed, 11 Oct 2017 09:12:15 +0000 (12:12 +0300)
# 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

1  2 
src/HYDROGUI/HYDROGUI_BathymetryPrs.cxx
src/HYDROGUI/resources/HYDROGUI_msg_en.ts
src/HYDRO_tests/CMakeLists.txt

index 63d04939820a11689b5c9ff7dc527804ebbec7fa,e6e427b44aad5f8f438b55adf586c5c8699466f3..bf7f53b367e5804a7c5b8e309f08fd118030f711
@@@ -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() ||
Simple merge