From 5d5e39ca58802da26dcb00d81d520ad489e81fa4 Mon Sep 17 00:00:00 2001 From: akl Date: Wed, 26 Mar 2014 18:02:54 +0400 Subject: [PATCH] Moving of unexistent 'Shading' property to 'Interpolation' one. --- test/VisuPrs/3D_viewer/A1.py | 6 +++--- test/VisuPrs/3D_viewer/A2.py | 4 ++-- test/VisuPrs/3D_viewer/A3.py | 4 ++-- test/VisuPrs/3D_viewer/A4.py | 4 ++-- test/VisuPrs/3D_viewer/A5.py | 4 ++-- test/VisuPrs/3D_viewer/A6.py | 2 +- test/VisuPrs/3D_viewer/A7.py | 4 ++-- test/VisuPrs/3D_viewer/A8.py | 4 ++-- test/VisuPrs/3D_viewer/A9.py | 16 ++++++++-------- test/VisuPrs/3D_viewer/B0.py | 4 ++-- 10 files changed, 26 insertions(+), 26 deletions(-) diff --git a/test/VisuPrs/3D_viewer/A1.py b/test/VisuPrs/3D_viewer/A1.py index 3591563f..1bd3e02e 100644 --- a/test/VisuPrs/3D_viewer/A1.py +++ b/test/VisuPrs/3D_viewer/A1.py @@ -57,7 +57,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 @@ -67,7 +67,7 @@ field_name = 'VITESSE' # Get view my_view = GetRenderView() -print "\nCreating plot3d.......", +print "\nCreating plot3d......." plot3d = Plot3DOnField(proxy, EntityType.NODE, field_name, 1) if plot3d is None: raise RuntimeError("Error!!! Presentation wasn't created...") @@ -90,7 +90,7 @@ for reprCode in represents: for sha in shadings: setShaded(my_view, sha) - call_and_check(plot3d, "Shading", sha, 1) + call_and_check(plot3d, "Interpolation", sha, 1) Render(my_view) for opa in opacities: diff --git a/test/VisuPrs/3D_viewer/A2.py b/test/VisuPrs/3D_viewer/A2.py index 447cda5a..aeded9c6 100644 --- a/test/VisuPrs/3D_viewer/A2.py +++ b/test/VisuPrs/3D_viewer/A2.py @@ -57,7 +57,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 @@ -87,7 +87,7 @@ for reprCode in represents: call_and_check(vectors, "Representation", repr, 1) for sha in shadings: - call_and_check(vectors, "Shading", sha, 1) + call_and_check(vectors, "Interpolation", sha, 1) setShaded(my_view, sha) Render(my_view) time.sleep(1) diff --git a/test/VisuPrs/3D_viewer/A3.py b/test/VisuPrs/3D_viewer/A3.py index 1dbceb50..c7819418 100644 --- a/test/VisuPrs/3D_viewer/A3.py +++ b/test/VisuPrs/3D_viewer/A3.py @@ -57,7 +57,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 @@ -97,7 +97,7 @@ for reprCode in represents: for sha in shadings: setShaded(my_view, sha) - call_and_check(stream_lines, "Shading", sha, 1) + call_and_check(stream_lines, "Interpolation", sha, 1) Render(my_view) time.sleep(1) diff --git a/test/VisuPrs/3D_viewer/A4.py b/test/VisuPrs/3D_viewer/A4.py index d464806c..9d1c95e0 100644 --- a/test/VisuPrs/3D_viewer/A4.py +++ b/test/VisuPrs/3D_viewer/A4.py @@ -56,7 +56,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 @@ -86,7 +86,7 @@ for reprCode in represents: for sha in shadings: setShaded(my_view, sha) - call_and_check(iso_surf, "Shading", sha, 1) + call_and_check(iso_surf, "Interpolation", sha, 1) Render(my_view) for opa in opacities: diff --git a/test/VisuPrs/3D_viewer/A5.py b/test/VisuPrs/3D_viewer/A5.py index 286418b7..4592e8e1 100644 --- a/test/VisuPrs/3D_viewer/A5.py +++ b/test/VisuPrs/3D_viewer/A5.py @@ -57,7 +57,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 @@ -105,7 +105,7 @@ for reprCode in represents: for sha in shadings: setShaded(my_view, sha) - call_and_check(shape_to_show, "Shading", sha, 1) + call_and_check(shape_to_show, "Interpolation", sha, 1) Render(my_view) for opa in opacities: diff --git a/test/VisuPrs/3D_viewer/A6.py b/test/VisuPrs/3D_viewer/A6.py index 1aec3631..2c8f3024 100644 --- a/test/VisuPrs/3D_viewer/A6.py +++ b/test/VisuPrs/3D_viewer/A6.py @@ -106,7 +106,7 @@ for reprCode in represents: for sha in shadings: setShaded(my_view, sha) - call_and_check(shape_to_show, "Shading", sha, 1) + call_and_check(shape_to_show, "Interpolation", sha, 1) Render(my_view) for opa in opacities: diff --git a/test/VisuPrs/3D_viewer/A7.py b/test/VisuPrs/3D_viewer/A7.py index 59fe120b..4a11afaa 100644 --- a/test/VisuPrs/3D_viewer/A7.py +++ b/test/VisuPrs/3D_viewer/A7.py @@ -56,7 +56,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 @@ -87,7 +87,7 @@ for reprCode in represents: for sha in shadings: setShaded(my_view, sha) - call_and_check(cut_planes, "Shading", sha, 1) + call_and_check(cut_planes, "Interpolation", sha, 1) Render(my_view) for opa in opacities: diff --git a/test/VisuPrs/3D_viewer/A8.py b/test/VisuPrs/3D_viewer/A8.py index a6e19b9f..f27ff1a6 100644 --- a/test/VisuPrs/3D_viewer/A8.py +++ b/test/VisuPrs/3D_viewer/A8.py @@ -56,7 +56,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 @@ -90,7 +90,7 @@ for reprCode in represents: for sha in shadings: setShaded(my_view, sha) - call_and_check(cut_lines, "Shading", sha, 1) + call_and_check(cut_lines, "Interpolation", sha, 1) Render(my_view) for opa in opacities: diff --git a/test/VisuPrs/3D_viewer/A9.py b/test/VisuPrs/3D_viewer/A9.py index 3a090f18..2ee12921 100644 --- a/test/VisuPrs/3D_viewer/A9.py +++ b/test/VisuPrs/3D_viewer/A9.py @@ -48,7 +48,7 @@ def check_value(prs, property_name, value, do_raise=1, compare_toler=-1.0): def check_all_params(prs, pres_type, shad, opac, lwid): err = check_value(prs, "Representation", pres_type, 0, -1.0) - err = err + check_value(prs, "Shading", shad, 0, -1.0) + err = err + check_value(prs, "Interpolation", shad, 0, -1.0) err = err + check_value(prs, "Opacity", opac, 0, compare_prec) err = err + check_value(prs, "LineWidth", lwid, 0, compare_prec) return err @@ -115,7 +115,7 @@ Render(my_view) shape_to_show = shrinked_scalar_map setShaded(my_view, 1) -call_and_check(shape_to_show, "Shading", 1) +call_and_check(shape_to_show, "Interpolation", "Gouraud") Render(my_view) call_and_check(shape_to_show, "Opacity", 0.8, 1, compare_prec) call_and_check(shape_to_show, "LineWidth", 5.0, 1, compare_prec) @@ -160,8 +160,8 @@ 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) -call_and_check(shape_to_show, "Shading", 0) -call_and_check(shape_to_show, "Shading", 1) +call_and_check(shape_to_show, "Interpolation", "Flat") +call_and_check(shape_to_show, "Interpolation", "Gouraud") time.sleep(1) @@ -191,7 +191,7 @@ RepresentationType.get_name(RepresentationType.SURFACE), 1, 0.8, 5.0) # Reset ##call_and_check(shape_to_show, "Shrinked", 0, "Shrinked") setShaded(my_view, 0) -call_and_check(shape_to_show, "Shading", 0,) +call_and_check(shape_to_show, "Interpolation", "Flat",) Render(my_view) call_and_check(shape_to_show, "Opacity", 1.0, 1, compare_prec) call_and_check(shape_to_show, "LineWidth", 1.0, 1, compare_prec) @@ -216,7 +216,7 @@ shrinked_scalar_map.Visibility = 1 shape_to_show = shrinked_scalar_map setShaded(my_view, 1) -call_and_check(shape_to_show, "Shading", 1) +call_and_check(shape_to_show, "Interpolation", "Gouraud") Render(my_view) call_and_check(shape_to_show, "Opacity", 0.8, 1, compare_prec) call_and_check(shape_to_show, "LineWidth", 5.0, 1, compare_prec) @@ -258,8 +258,8 @@ 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) -call_and_check(shape_to_show, "Shading", 0) -call_and_check(shape_to_show, "Shading", 1) +call_and_check(shape_to_show, "Interpolation", "Flat") +call_and_check(shape_to_show, "Interpolation", "Gouraud") time.sleep(1) # save picture in file diff --git a/test/VisuPrs/3D_viewer/B0.py b/test/VisuPrs/3D_viewer/B0.py index 100e89eb..b61a74b6 100644 --- a/test/VisuPrs/3D_viewer/B0.py +++ b/test/VisuPrs/3D_viewer/B0.py @@ -57,7 +57,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 @@ -107,7 +107,7 @@ for reprCode in represents: for sha in shadings: setShaded(my_view, sha) - call_and_check(shape_to_show, "Shading", sha, 1) + call_and_check(shape_to_show, "Interpolation", sha, 1) Render(my_view) for opa in opacities: -- 2.39.2