From: akl Date: Thu, 27 Mar 2014 06:26:27 +0000 (+0400) Subject: Moving of unexistent 'Shading' property to 'Interpolation' one. X-Git-Tag: V7_4_0rc1~4^2~2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=93847f816f680019d5cc28d9c6536aea2f36bda0;p=modules%2Fparavis.git Moving of unexistent 'Shading' property to 'Interpolation' one. --- diff --git a/test/VisuPrs/3D_viewer/A6.py b/test/VisuPrs/3D_viewer/A6.py index 2c8f3024..95e80097 100644 --- a/test/VisuPrs/3D_viewer/A6.py +++ b/test/VisuPrs/3D_viewer/A6.py @@ -58,7 +58,7 @@ else: represents = [RepresentationType.POINTS, RepresentationType.WIREFRAME, RepresentationType.SURFACE, RepresentationType.VOLUME] shrinks = [0, 1] -shadings = [0, 1] +shadings = ["Flat", "Gouraud"] opacities = [1.0, 0.5, 0.0] linewidths = [1.0, 3.0, 10.0] compare_prec = 0.00001 diff --git a/test/VisuPrs/3D_viewer/A9.py b/test/VisuPrs/3D_viewer/A9.py index 2ee12921..d52482d1 100644 --- a/test/VisuPrs/3D_viewer/A9.py +++ b/test/VisuPrs/3D_viewer/A9.py @@ -144,7 +144,7 @@ pic_name = picturedir + "params_SURFACE_2." + pictureext process_prs_for_test(shape_to_show, my_view, pic_name) err = check_all_params(shape_to_show, -RepresentationType.get_name(RepresentationType.SURFACE), 1, 0.8, 5.0) +RepresentationType.get_name(RepresentationType.SURFACE), "Gouraud", 0.8, 5.0) ##call_and_check(scalar_map, "Shrinked", 0, "Shrinked") ##call_and_check(scalar_map, "Shrinked", 1, "Shrinked") @@ -158,7 +158,7 @@ pic_name = picturedir + "params_SURFACE_3." + pictureext process_prs_for_test(shape_to_show, my_view, pic_name) err = err + check_all_params(shape_to_show, -RepresentationType.get_name(RepresentationType.SURFACE), 1, 0.8, 5.0) +RepresentationType.get_name(RepresentationType.SURFACE), "Gouraud", 0.8, 5.0) call_and_check(shape_to_show, "Interpolation", "Flat") call_and_check(shape_to_show, "Interpolation", "Gouraud") @@ -172,7 +172,7 @@ pic_name = picturedir + "params_SURFACE_4." + pictureext process_prs_for_test(shape_to_show, my_view, pic_name) err = err + check_all_params(shape_to_show, -RepresentationType.get_name(RepresentationType.SURFACE), 1, 0.8, 5.0) +RepresentationType.get_name(RepresentationType.SURFACE), "Gouraud", 0.8, 5.0) call_and_check(shape_to_show, "Opacity", 1.0, 1, compare_prec) call_and_check(shape_to_show, "Opacity", 0.8, 1, compare_prec) @@ -186,7 +186,7 @@ pic_name = picturedir + "params_SURFACE_5." + pictureext process_prs_for_test(shape_to_show, my_view, pic_name) err = err + check_all_params(shape_to_show, -RepresentationType.get_name(RepresentationType.SURFACE), 1, 0.8, 5.0) +RepresentationType.get_name(RepresentationType.SURFACE), "Gouraud", 0.8, 5.0) # Reset ##call_and_check(shape_to_show, "Shrinked", 0, "Shrinked") @@ -243,7 +243,7 @@ pic_name = picturedir + "params_WIREFRAME_2." + pictureext process_prs_for_test(shape_to_show, my_view, pic_name) err = err + check_all_params(shape_to_show, -RepresentationType.get_name(RepresentationType.WIREFRAME), 1, 0.8, 5.0) +RepresentationType.get_name(RepresentationType.WIREFRAME), "Gouraud", 0.8, 5.0) ##call_and_check(shape_to_show, "Shrinked", 0) ##call_and_check(shape_to_show, "Shrinked", 1) @@ -256,7 +256,7 @@ pic_name = picturedir + "params_WIREFRAME_3." + pictureext process_prs_for_test(shrinked_scalar_map, my_view, pic_name) err = err + check_all_params(shape_to_show, -RepresentationType.get_name(RepresentationType.WIREFRAME), 1, 0.8, 5.0) +RepresentationType.get_name(RepresentationType.WIREFRAME), "Gouraud", 0.8, 5.0) call_and_check(shape_to_show, "Interpolation", "Flat") call_and_check(shape_to_show, "Interpolation", "Gouraud") @@ -269,7 +269,7 @@ pic_name = picturedir + "params_WIREFRAME_4." + pictureext process_prs_for_test(shape_to_show, my_view, pic_name) err = err + check_all_params(shape_to_show, -RepresentationType.get_name(RepresentationType.WIREFRAME), 1, 0.8, 5.0) +RepresentationType.get_name(RepresentationType.WIREFRAME), "Gouraud", 0.8, 5.0) call_and_check(shape_to_show, "Opacity", 1.0, 1, compare_prec) call_and_check(shape_to_show, "Opacity", 0.8, 1, compare_prec) @@ -282,7 +282,7 @@ pic_name = picturedir + "params_WIREFRAME_5." + pictureext process_prs_for_test(shape_to_show, my_view, pic_name) err = err + check_all_params(shape_to_show, -RepresentationType.get_name(RepresentationType.WIREFRAME), 1, 0.8, 5.0) +RepresentationType.get_name(RepresentationType.WIREFRAME), "Gouraud", 0.8, 5.0) if err: raise RuntimeError("Presentation parameters are not stable")