From: asl Date: Thu, 9 Nov 2017 15:17:34 +0000 (+0300) Subject: debug of automatic tests X-Git-Tag: v2.1~38 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=54c40c969f35951df0dc5428b4bc2bc89ee09d46;p=modules%2Fhydro.git debug of automatic tests --- diff --git a/src/HYDRO_tests/reference_data/LandCoverMap_Split_Polyline.png b/src/HYDRO_tests/reference_data/LandCoverMap_Split_Polyline.png index bae3119d..93db9e58 100644 Binary files a/src/HYDRO_tests/reference_data/LandCoverMap_Split_Polyline.png and b/src/HYDRO_tests/reference_data/LandCoverMap_Split_Polyline.png differ diff --git a/src/HYDRO_tests/reference_data/Polyline_Presentation.png b/src/HYDRO_tests/reference_data/Polyline_Presentation.png index b48f1e0e..e5275ac7 100644 Binary files a/src/HYDRO_tests/reference_data/Polyline_Presentation.png and b/src/HYDRO_tests/reference_data/Polyline_Presentation.png differ diff --git a/src/HYDRO_tests/reference_data/Polyline_Presentation_triangle.png b/src/HYDRO_tests/reference_data/Polyline_Presentation_triangle.png index d20e639e..652ec440 100644 Binary files a/src/HYDRO_tests/reference_data/Polyline_Presentation_triangle.png and b/src/HYDRO_tests/reference_data/Polyline_Presentation_triangle.png differ diff --git a/src/HYDRO_tests/reference_data/bathy_prs.png b/src/HYDRO_tests/reference_data/bathy_prs.png index 727113fd..72452c09 100644 Binary files a/src/HYDRO_tests/reference_data/bathy_prs.png and b/src/HYDRO_tests/reference_data/bathy_prs.png differ diff --git a/src/HYDRO_tests/reference_data/bathy_prs_fit_selected.png b/src/HYDRO_tests/reference_data/bathy_prs_fit_selected.png index 370cbf71..69a8f937 100644 Binary files a/src/HYDRO_tests/reference_data/bathy_prs_fit_selected.png and b/src/HYDRO_tests/reference_data/bathy_prs_fit_selected.png differ diff --git a/src/HYDRO_tests/reference_data/bathy_rescaled_selection.png b/src/HYDRO_tests/reference_data/bathy_rescaled_selection.png index 935cb390..6f628ccc 100644 Binary files a/src/HYDRO_tests/reference_data/bathy_rescaled_selection.png and b/src/HYDRO_tests/reference_data/bathy_rescaled_selection.png differ diff --git a/src/HYDRO_tests/reference_data/bathy_rescaled_user.png b/src/HYDRO_tests/reference_data/bathy_rescaled_user.png index da49b301..63d666dc 100644 Binary files a/src/HYDRO_tests/reference_data/bathy_rescaled_user.png and b/src/HYDRO_tests/reference_data/bathy_rescaled_user.png differ diff --git a/src/HYDRO_tests/reference_data/bathy_rescaled_visible.png b/src/HYDRO_tests/reference_data/bathy_rescaled_visible.png index b47ec36c..1d70bc84 100644 Binary files a/src/HYDRO_tests/reference_data/bathy_rescaled_visible.png and b/src/HYDRO_tests/reference_data/bathy_rescaled_visible.png differ diff --git a/src/HYDRO_tests/reference_data/bathy_selection.png b/src/HYDRO_tests/reference_data/bathy_selection.png index 410c192b..4855ae47 100644 Binary files a/src/HYDRO_tests/reference_data/bathy_selection.png and b/src/HYDRO_tests/reference_data/bathy_selection.png differ diff --git a/src/HYDRO_tests/reference_data/bathy_text_labels.png b/src/HYDRO_tests/reference_data/bathy_text_labels.png index 3899936e..7b88665b 100644 Binary files a/src/HYDRO_tests/reference_data/bathy_text_labels.png and b/src/HYDRO_tests/reference_data/bathy_text_labels.png differ diff --git a/src/HYDRO_tests/reference_data/overview_drag.png b/src/HYDRO_tests/reference_data/overview_drag.png index e4f5a910..d9c64263 100644 Binary files a/src/HYDRO_tests/reference_data/overview_drag.png and b/src/HYDRO_tests/reference_data/overview_drag.png differ diff --git a/src/HYDRO_tests/reference_data/overview_empty.png b/src/HYDRO_tests/reference_data/overview_empty.png index 49120672..1e37efd6 100644 Binary files a/src/HYDRO_tests/reference_data/overview_empty.png and b/src/HYDRO_tests/reference_data/overview_empty.png differ diff --git a/src/HYDRO_tests/reference_data/overview_panned_1.png b/src/HYDRO_tests/reference_data/overview_panned_1.png index d1cdf9dd..48c25af3 100644 Binary files a/src/HYDRO_tests/reference_data/overview_panned_1.png and b/src/HYDRO_tests/reference_data/overview_panned_1.png differ diff --git a/src/HYDRO_tests/reference_data/overview_prs.png b/src/HYDRO_tests/reference_data/overview_prs.png index d0120ec9..c2b37cf1 100644 Binary files a/src/HYDRO_tests/reference_data/overview_prs.png and b/src/HYDRO_tests/reference_data/overview_prs.png differ diff --git a/src/HYDRO_tests/reference_data/overview_rotated_1.png b/src/HYDRO_tests/reference_data/overview_rotated_1.png index 703c3602..da4ab14d 100644 Binary files a/src/HYDRO_tests/reference_data/overview_rotated_1.png and b/src/HYDRO_tests/reference_data/overview_rotated_1.png differ diff --git a/src/HYDRO_tests/reference_data/overview_selection.png b/src/HYDRO_tests/reference_data/overview_selection.png index bff97cc5..417780e6 100644 Binary files a/src/HYDRO_tests/reference_data/overview_selection.png and b/src/HYDRO_tests/reference_data/overview_selection.png differ diff --git a/src/HYDRO_tests/reference_data/overview_selection_a.png b/src/HYDRO_tests/reference_data/overview_selection_a.png index 18e18296..4af1406c 100644 Binary files a/src/HYDRO_tests/reference_data/overview_selection_a.png and b/src/HYDRO_tests/reference_data/overview_selection_a.png differ diff --git a/src/HYDRO_tests/reference_data/overview_zoomed_1.png b/src/HYDRO_tests/reference_data/overview_zoomed_1.png index 50051a2c..2944ba53 100644 Binary files a/src/HYDRO_tests/reference_data/overview_zoomed_1.png and b/src/HYDRO_tests/reference_data/overview_zoomed_1.png differ diff --git a/src/HYDRO_tests/reference_data/overview_zoomed_2.png b/src/HYDRO_tests/reference_data/overview_zoomed_2.png index 1d58bc4f..4c443cd9 100644 Binary files a/src/HYDRO_tests/reference_data/overview_zoomed_2.png and b/src/HYDRO_tests/reference_data/overview_zoomed_2.png differ diff --git a/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx b/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx index dfbf94ae..9b505914 100644 --- a/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx +++ b/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx @@ -263,6 +263,7 @@ void test_HYDROData_PolylineXY::test_presentation() // Check default type Handle(HYDROGUI_Arrow) arr = Handle(HYDROGUI_Arrow)::DownCast( aNewPolylinePrs->getAISObjects()[1] ); CPPUNIT_ASSERT_EQUAL( HYDROGUI_Arrow::Cone, arr->GetType() ); + CPPUNIT_ASSERT_EQUAL( 35, arr->GetSize() ); // Check polyline presentation with default (cone) arrow @@ -270,6 +271,7 @@ void test_HYDROData_PolylineXY::test_presentation() TestViewer::show( aPointsPrs, AIS_PointCloud::DM_Points, 0, true, "Polyline_Presentation" ); TestViewer::show( aPolyline2d->GetShape(), 0, true, Qt::red ); //TestViewer::show( aNewPolylinePrs, AIS_PointCloud::DM_Points, 0, true, "" ); + aNewPolylinePrs->setBorderColor( Qt::blue ); aNewPolylinePrs->display(); TestViewer::fitAll(); CPPUNIT_ASSERT_IMAGES