Merge remote-tracking branch 'remotes/origin/BR_2017' into HEAD

Conflicts:
	src/HYDROGUI/HYDROGUI_BathymetrySelectionOp.cxx
	src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx

diff --cc src/HYDROData/HYDROData_Bathymetry.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_Entity.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_Entity.h
Simple merge

diff --cc src/HYDROGUI/HYDROGUI_BathymetrySelectionOp.cxx
index 7a18167d5ba97c645f303f56199505cdf5707126,165dcc88f7bd0d5981f978376e60eb0fae7c3d56..dd5fb3cf0faeec51bdbb8ffbc704afde292179a3
--- 1/src/HYDROGUI/HYDROGUI_BathymetrySelectionOp.cxx
--- 2/src/HYDROGUI/HYDROGUI_BathymetrySelectionOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_BathymetrySelectionOp.cxx
@@@ -90,8 -91,10 +91,9 @@@ void HYDROGUI_BathymetrySelectionOp::ac
    if( myIsActive==isActive )
      return;
  
- 
 +  getContext( module() )->ClearSelected(true);
 -
 -  getContext( module() )->ClearSelected();
 -
+   qApp->setOverrideCursor( Qt::WaitCursor );
++  getContext( module() )->ClearSelected(true);
    Handle(AIS_InteractiveContext) ctx = getContext( module() );
    QList<Handle(HYDROGUI_BathymetryPrs)> baths = getShownBathymetries( module() );
    if( isActive )

diff --cc src/HYDROGUI/HYDROGUI_Overview.cxx
Simple merge

diff --cc src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx
index ddb5d785a22b1e3dcdd7d9f687155617ba726904,f59c3302d4eee523acd876825ed4c5def59cdc60..c9416967a1a17ea921c40b91637960df3198526b
--- 1/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx
--- 2/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx
+++ b/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx
@@@ -247,7 -304,10 +304,10 @@@ void HYDROGUI_ShapeBathymetry::Rescale
    setToUpdateColorScale( true );
  
    if( !getAISObjects().isEmpty() )
-     getAISObjects()[0]->Redisplay();
+   {
+     getContext()->RecomputePrsOnly( getAISObjects()[0] );
+     //getAISObjects()[0]->Redisplay();
 -  }
++}
  }
  
  void HYDROGUI_ShapeBathymetry::RescaleDefault()
@@@ -295,8 -355,10 +355,11 @@@ void HYDROGUI_ShapeBathymetry::TextLabe
    if( isOn )
      selection = selected();
  
 -  //getContext()->ClearSelected();
++
 +  getContext()->ClearSelected(true);
    prs->SetTextLabels( selection );
-   prs->Redisplay();
+   getContext()->RecomputePrsOnly( prs, Standard_False, Standard_False );
+   //prs->Redisplay();
+   if( isUpdateCurrentViewer )
 -    getContext()->UpdateCurrentViewer();
 +  getContext()->UpdateCurrentViewer();
  }

diff --cc src/HYDRO_tests/TestViewer.cxx
index 6e20be46cc4b09bdeea8c543f946da29227226c0,7210c108a6f02d7b635a6f13fc006a1d5d1c5e62..3f886a5c025c8f8ac29d17457dead53007e7967c
--- 1/src/HYDRO_tests/TestViewer.cxx
--- 2/src/HYDRO_tests/TestViewer.cxx
+++ b/src/HYDRO_tests/TestViewer.cxx
@@@ -173,6 -173,6 +173,7 @@@ void TestViewer::show( const TopoDS_Sha
    int theUIANb, int theVIANb)
  {
    Handle(AIS_Shape) aShape = new AIS_Shape( theShape );
++  cout <<theShape;
    if( theShape.ShapeType()==TopAbs_VERTEX )
      aShape->Attributes()->PointAspect()->SetTypeOfMarker( Aspect_TOM_X );
    if (theShape.ShapeType()==TopAbs_FACE)

diff --cc src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
index 43320fc973aaf49e440ba0819e6107a425e1b643,43320fc973aaf49e440ba0819e6107a425e1b643..922a7c3351494a23936556333d809795d3ffc286
--- 1/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
--- 2/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
+++ b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
@@@ -569,7 -569,7 +569,7 @@@ void test_HYDROData_LandCoverMap::test_
  
    aDoc->Close();
  }
--
++#include <QTest>
  void test_HYDROData_LandCoverMap::test_land_cover_prs_by_types()
  {
    Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
@@@ -600,7 -600,7 +600,23 @@@
    // show presentation in viewer
    TestViewer::show( aPrs, AIS_Shaded, 4, true, "LandCoverMap_PrsByTypes" );
    // select one of faces (first)
--  TestViewer::select( 200, 300 );
++ TestViewer::select( 200, 300 );
++  QTest::qWait(1000);
++   TestViewer::select( 220, 300 );
++  QTest::qWait(1000);
++   TestViewer::select( 250, 300 );
++  QTest::qWait(1000);
++   TestViewer::select( 300, 300 );
++  QTest::qWait(1000);
++   TestViewer::select( 200, 350 );
++  QTest::qWait(1000);
++   TestViewer::select( 200, 500 );
++  QTest::qWait(1000);
++   TestViewer::select( 250, 400 );
++  QTest::qWait(1000);
++   TestViewer::select( 300, 99 );
++  QTest::qWait(1000);
++
    CPPUNIT_ASSERT_IMAGES
    TestViewer::eraseAll(true, true);
    aDoc->Close();
@@@ -635,6 -635,6 +651,7 @@@ void test_HYDROData_LandCoverMap::test_
    TestViewer::showColorScale( true );
    aPrs->SetColorScale( TestViewer::colorScale() );
    TestViewer::show( aPrs, AIS_Shaded, 4, true, "LandCoverMap_PrsByCoeff" );
++
    CPPUNIT_ASSERT_IMAGES
  
    TestViewer::showColorScale( false );