From: asl <asl@opencascade.com>
Date: Wed, 11 Oct 2017 05:23:46 +0000 (+0300)
Subject: Merge branch 'BR_1331' into BR_DEMO
X-Git-Tag: v2.1~66^2~12
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=988bd1963f29e4e923cf3fd6c06cf9033f7670ae;p=modules%2Fhydro.git

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
---

988bd1963f29e4e923cf3fd6c06cf9033f7670ae
diff --cc src/HYDRO_tests/CMakeLists.txt
index 3c68334a,dcd654ff..59a85ab5
--- a/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 947468e0,a62eed23..f93423ba
--- a/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 ba0b7b5d,f7876baa..080f9b9d
--- a/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/reference_data/CMakeLists.txt
index 24fa175d,17ac2ca8..8957b095
--- a/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