Merge branch 'BR_1331' into BR_DEMO

# Conflicts:
#	src/HYDRO_tests/CMakeLists.txt
#	src/HYDRO_tests/ExternalFiles.cmake
#	src/HYDRO_tests/reference_data/CMakeLists.txt

diff --cc src/HYDROGUI/HYDROGUI_ViewerDlg.h
Simple merge

diff --cc src/HYDRO_tests/CMakeLists.txt
index 3c68334a6d0e5b312b8baabf8c027756ad183476,dcd654ff359ee1f5c7857e11efaeb3adb32d4288..59a85ab5352628da403615a403aef1cf5f320765
--- 1/src/HYDRO_tests/CMakeLists.txt
--- 2/src/HYDRO_tests/CMakeLists.txt
+++ b/src/HYDRO_tests/CMakeLists.txt
@@@ -58,8 -56,7 +58,9 @@@ set(PROJECT_SOURCE
    test_Dependencies.cxx
    test_HYDROData_Tool.cxx
    test_GraphicsView.cxx
 +  test_Overview.cxx
+   test_HYDROGUI_ProfilesDlg.cxx
 +  test_HYDROGUI_BathymetryPrs.cxx
   
    TestShape.cxx
    TestViewer.cxx

diff --cc src/HYDRO_tests/ExternalFiles.cmake
index 947468e075308ed8d0c502f9e4eb4188b833a58d,a62eed2342b1fb8daa4b5ddbfeb2f2dac10e6ef3..f93423ba664db911f9f4196af8ea2d1eab96b576
--- 1/src/HYDRO_tests/ExternalFiles.cmake
--- 2/src/HYDRO_tests/ExternalFiles.cmake
+++ b/src/HYDRO_tests/ExternalFiles.cmake
@@@ -77,7 -77,10 +77,11 @@@ set( EXTERNAL_FILE
    ../HYDROGUI/HYDROGUI_StreamDlg.cxx
    ../HYDROGUI/HYDROGUI_ListSelector.cxx
    ../HYDROGUI/HYDROGUI_OrderedListWidget.cxx
 +  ../HYDROGUI/HYDROGUI_Overview.cxx
+   ../HYDROGUI/HYDROGUI_ProfileDlg.cxx
+   ../HYDROGUI/HYDROGUI_ViewerDlg.cxx
+   ../HYDROGUI/HYDROGUI_AISTrihedron.cxx
+   ../HYDROGUI/HYDROGUI_CurveCreatorProfile.cxx
  )
  
  set( MOC_HEADERS 
@@@ -86,7 -89,8 +90,9 @@@
    ../HYDROGUI/HYDROGUI_StreamDlg.h
    ../HYDROGUI/HYDROGUI_ListSelector.h
    ../HYDROGUI/HYDROGUI_OrderedListWidget.h
 +  ../HYDROGUI/HYDROGUI_Overview.h
+   ../HYDROGUI/HYDROGUI_ProfileDlg.h
+   ../HYDROGUI/HYDROGUI_ViewerDlg.h
  )
  
  QT_WRAP_MOC( PROJECT_MOC_HEADERS ${MOC_HEADERS} )

diff --cc src/HYDRO_tests/TestViewer.cxx
index ba0b7b5d059b76a37bb623a5179be8096df2aa77,f7876baab344234da7344dfd2c97f0f43b4c6e57..080f9b9ddd8ad042c2c3f28c2defc55f125a90e8
--- 1/src/HYDRO_tests/TestViewer.cxx
--- 2/src/HYDRO_tests/TestViewer.cxx
+++ b/src/HYDRO_tests/TestViewer.cxx
@@@ -271,10 -272,9 +271,9 @@@ bool TestViewer::AssertImages( QString
    if( theImage )
      anActualImage = *theImage;
    else
 -    anActualImage = viewWindow()->dumpView();
 +    anActualImage = viewWindow()->getView(OCCViewer_ViewFrame::MAIN_VIEW)->dumpView();
  
-   const bool SWAP_RGB_ORDER = true;
-   if( SWAP_RGB_ORDER )
+   if( swapRGB )
    {
      // A temporary patch for bug in SALOME/OCC dump; the result image contains swapped RGB colors
      anActualImage = anActualImage.rgbSwapped();

diff --cc src/HYDRO_tests/TestViewer.h
Simple merge

diff --cc src/HYDRO_tests/reference_data/CMakeLists.txt
index 24fa175d194896414ffd8c382ec1e518e4309670,17ac2ca8a94a0870c165c941c732419b40b1cf8c..8957b0957432814d767b926c28d4f0a2371910ba
--- 1/src/HYDRO_tests/reference_data/CMakeLists.txt
--- 2/src/HYDRO_tests/reference_data/CMakeLists.txt
+++ b/src/HYDRO_tests/reference_data/CMakeLists.txt
@@@ -125,22 -124,8 +125,24 @@@ SET(REFERENCE_DAT
      gv_fitall.png
      gv_zoomed_1.png
      gv_zoomed_2.png
+     profiles_dlg_presentation.png
+     profiles_selected_points.png
 +    bathy.xyz
 +    bathy_prs.png
 +    bathy_selection.png
 +    bathy_rescaled_selection.png
 +    test_zone.brep
 +    overview_empty.png
 +    overview_prs.png
 +    overview_selection.png
 +    overview_zoomed_1.png
 +    overview_zoomed_2.png
 +    overview_panned_1.png
 +    overview_rotated_1.png
 +    bathy_rescaled_user.png
 +    bathy_rescaled_visible.png
 +    bathy_text_labels.png
 +    bathy_prs_fit_selected.png
  )
  
  # Application tests