Merge branch 'BR_MULTI_BATHS' into HEAD

diff --cc src/HYDRO_tests/TestViewer.cxx
index 904dbc93d0029bd309b6787d226403a825f5914e,a8599d348b432d1b0085d1e534d7d3a51984170d..fce3baadf3643f100b23246b8d3b323bc88395bd
--- 1/src/HYDRO_tests/TestViewer.cxx
--- 2/src/HYDRO_tests/TestViewer.cxx
+++ b/src/HYDRO_tests/TestViewer.cxx
@@@ -257,18 -257,11 +257,18 @@@ bool AreImagesEqual( const QImage& theI
    return true;
  }
  
 -bool TestViewer::AssertImages( QString& theMessage )
 +bool TestViewer::AssertImages( QString& theMessage, const QImage* theImage, const char* theCase )
  {
 -  QImage anActualImage = viewWindow()->dumpView();
 +  QImage anActualImage;
 +  if( theImage )
 +    anActualImage = *theImage;
 +  else
 +    anActualImage = viewWindow()->dumpView();
 +
 +  if( theCase )
 +    myKey = theCase;
  
-   QString anExpectedRefFilePath = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO";
+   QString anExpectedRefFilePath = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test";
    anExpectedRefFilePath += "/" + myKey + ".png";
    QImage anExpectedRefImage; 
    anExpectedRefImage.load( anExpectedRefFilePath );