From: asl Date: Mon, 19 Oct 2015 06:06:09 +0000 (+0300) Subject: patch for the same size on Windows/Linux X-Git-Tag: v1.5~94 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=438adbfba1a0b6f6f608b9f874c9ec144d29ad1a;p=modules%2Fhydro.git patch for the same size on Windows/Linux --- diff --git a/src/HYDRO_tests/reference_data/LandCoverMap_Add_2_Objects.png b/src/HYDRO_tests/reference_data/LandCoverMap_Add_2_Objects.png index f19fb736..1a912477 100644 Binary files a/src/HYDRO_tests/reference_data/LandCoverMap_Add_2_Objects.png and b/src/HYDRO_tests/reference_data/LandCoverMap_Add_2_Objects.png differ diff --git a/src/HYDRO_tests/reference_data/LandCoverMap_Merge_1.png b/src/HYDRO_tests/reference_data/LandCoverMap_Merge_1.png index aac1e901..86179527 100644 Binary files a/src/HYDRO_tests/reference_data/LandCoverMap_Merge_1.png and b/src/HYDRO_tests/reference_data/LandCoverMap_Merge_1.png differ diff --git a/src/HYDRO_tests/reference_data/LandCoverMap_Remove_1.png b/src/HYDRO_tests/reference_data/LandCoverMap_Remove_1.png index 86d933df..4586e6d1 100644 Binary files a/src/HYDRO_tests/reference_data/LandCoverMap_Remove_1.png and b/src/HYDRO_tests/reference_data/LandCoverMap_Remove_1.png differ diff --git a/src/HYDRO_tests/reference_data/LandCoverMap_Split_1.png b/src/HYDRO_tests/reference_data/LandCoverMap_Split_1.png index 4f1b80a8..44cf6fb0 100644 Binary files a/src/HYDRO_tests/reference_data/LandCoverMap_Split_1.png and b/src/HYDRO_tests/reference_data/LandCoverMap_Split_1.png differ diff --git a/src/HYDRO_tests/reference_data/LandCoverMap_Split_2.png b/src/HYDRO_tests/reference_data/LandCoverMap_Split_2.png index 42f8dc1d..9c4a8334 100644 Binary files a/src/HYDRO_tests/reference_data/LandCoverMap_Split_2.png and b/src/HYDRO_tests/reference_data/LandCoverMap_Split_2.png differ diff --git a/src/HYDRO_tests/reference_data/_cs13.png b/src/HYDRO_tests/reference_data/_cs13.png index c107613d..141bed64 100644 Binary files a/src/HYDRO_tests/reference_data/_cs13.png and b/src/HYDRO_tests/reference_data/_cs13.png differ diff --git a/src/HYDRO_tests/reference_data/_cs23.png b/src/HYDRO_tests/reference_data/_cs23.png index c107613d..141bed64 100644 Binary files a/src/HYDRO_tests/reference_data/_cs23.png and b/src/HYDRO_tests/reference_data/_cs23.png differ diff --git a/src/HYDRO_tests/reference_data/cs11.png b/src/HYDRO_tests/reference_data/cs11.png index 9b5b4239..5db2e8d8 100644 Binary files a/src/HYDRO_tests/reference_data/cs11.png and b/src/HYDRO_tests/reference_data/cs11.png differ diff --git a/src/HYDRO_tests/reference_data/cs11_c.png b/src/HYDRO_tests/reference_data/cs11_c.png index 35057305..972d1734 100644 Binary files a/src/HYDRO_tests/reference_data/cs11_c.png and b/src/HYDRO_tests/reference_data/cs11_c.png differ diff --git a/src/HYDRO_tests/reference_data/cs12.png b/src/HYDRO_tests/reference_data/cs12.png index eb5de694..80400342 100644 Binary files a/src/HYDRO_tests/reference_data/cs12.png and b/src/HYDRO_tests/reference_data/cs12.png differ diff --git a/src/HYDRO_tests/reference_data/cs12_c.png b/src/HYDRO_tests/reference_data/cs12_c.png index 26ce53c0..694a77df 100644 Binary files a/src/HYDRO_tests/reference_data/cs12_c.png and b/src/HYDRO_tests/reference_data/cs12_c.png differ diff --git a/src/HYDRO_tests/reference_data/cs13.png b/src/HYDRO_tests/reference_data/cs13.png index 90b9e45b..8f609863 100644 Binary files a/src/HYDRO_tests/reference_data/cs13.png and b/src/HYDRO_tests/reference_data/cs13.png differ diff --git a/src/HYDRO_tests/reference_data/cs14.png b/src/HYDRO_tests/reference_data/cs14.png index 51d20ccc..aa7f5971 100644 Binary files a/src/HYDRO_tests/reference_data/cs14.png and b/src/HYDRO_tests/reference_data/cs14.png differ diff --git a/src/HYDRO_tests/reference_data/cs14_c.png b/src/HYDRO_tests/reference_data/cs14_c.png index c107613d..141bed64 100644 Binary files a/src/HYDRO_tests/reference_data/cs14_c.png and b/src/HYDRO_tests/reference_data/cs14_c.png differ diff --git a/src/HYDRO_tests/reference_data/cs21.png b/src/HYDRO_tests/reference_data/cs21.png index 9b5b4239..5db2e8d8 100644 Binary files a/src/HYDRO_tests/reference_data/cs21.png and b/src/HYDRO_tests/reference_data/cs21.png differ diff --git a/src/HYDRO_tests/reference_data/cs21_c.png b/src/HYDRO_tests/reference_data/cs21_c.png index 35057305..972d1734 100644 Binary files a/src/HYDRO_tests/reference_data/cs21_c.png and b/src/HYDRO_tests/reference_data/cs21_c.png differ diff --git a/src/HYDRO_tests/reference_data/cs22.png b/src/HYDRO_tests/reference_data/cs22.png index eb5de694..80400342 100644 Binary files a/src/HYDRO_tests/reference_data/cs22.png and b/src/HYDRO_tests/reference_data/cs22.png differ diff --git a/src/HYDRO_tests/reference_data/cs22_c.png b/src/HYDRO_tests/reference_data/cs22_c.png index 26ce53c0..694a77df 100644 Binary files a/src/HYDRO_tests/reference_data/cs22_c.png and b/src/HYDRO_tests/reference_data/cs22_c.png differ diff --git a/src/HYDRO_tests/reference_data/cs23.png b/src/HYDRO_tests/reference_data/cs23.png index 90b9e45b..8f609863 100644 Binary files a/src/HYDRO_tests/reference_data/cs23.png and b/src/HYDRO_tests/reference_data/cs23.png differ diff --git a/src/HYDRO_tests/reference_data/cs24.png b/src/HYDRO_tests/reference_data/cs24.png index 51d20ccc..aa7f5971 100644 Binary files a/src/HYDRO_tests/reference_data/cs24.png and b/src/HYDRO_tests/reference_data/cs24.png differ diff --git a/src/HYDRO_tests/reference_data/cs24_c.png b/src/HYDRO_tests/reference_data/cs24_c.png index c107613d..141bed64 100644 Binary files a/src/HYDRO_tests/reference_data/cs24_c.png and b/src/HYDRO_tests/reference_data/cs24_c.png differ diff --git a/src/HYDRO_tests/test_HYDROData_Main.cxx b/src/HYDRO_tests/test_HYDROData_Main.cxx index 2ad810e2..fb731922 100644 --- a/src/HYDRO_tests/test_HYDROData_Main.cxx +++ b/src/HYDRO_tests/test_HYDROData_Main.cxx @@ -39,10 +39,18 @@ int main( int argc, char* argv[] ) SUIT_Session aSession; OCCViewer_ViewWindow* aWindow = TestViewer::viewWindow(); - aWindow->setGeometry( 200, 200, 800, 600 ); + + int W = 800, H = 600; + aWindow->setGeometry( 200, 200, W, H ); aWindow->show(); QTest::qWaitForWindowShown( aWindow ); + QSize aSize = aWindow->dumpView().size(); + int dx = W-aSize.width(); + int dy = H-aSize.height(); + aWindow->resize( W+dx, H+dy ); + anApp.processEvents(); + std::string testPath = (argc > 1) ? std::string(argv[1]) : ""; // Create the event manager and test controller