enable make test

[modules/paravis.git] / test / VisuPrs / 3D_viewer / A9.py

diff --git a/test/VisuPrs/3D_viewer/A9.py b/test/VisuPrs/3D_viewer/A9.py
index f1babcbe9bc37e2cb3407817832b20c213d528c4..02f61cb62da134ec846f942208e281f59065c067 100644 (file)
--- a/test/VisuPrs/3D_viewer/A9.py
+++ b/test/VisuPrs/3D_viewer/A9.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2014  CEA/DEN, EDF R&D
+# Copyright (C) 2010-2015  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -24,10 +24,8 @@ from paravistest import *
 from presentations import *
 from pvsimple import *
 import sys
-import paravis
 import time
 
-
 def check_value(prs, property_name, value, do_raise=1, compare_toler=-1.0):
     # compare just set value and the one got from presentation
     really_set_value = prs.GetPropertyValue(property_name)
@@ -48,7 +46,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
@@ -60,9 +58,6 @@ picturedir = get_picture_dir("3D_viewer/A9")
 if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
-#import file
-myParavis = paravis.myParavis
-
 # Get view
 my_view = GetRenderView()
 reset_view(my_view)
@@ -73,7 +68,7 @@ print " --------------------------------- "
 print "file ", theFileName
 print " --------------------------------- "
 
-myParavis.ImportFile(theFileName)
+OpenDataFile(theFileName)
 proxy = GetActiveSource()
 if proxy is None:
     raise RuntimeError("Error: can't import file.")
@@ -104,8 +99,7 @@ shrink_filter = Shrink(scalar_map.Input)
 shrink_filter.ShrinkFactor = 0.8
 shrink_filter.UpdatePipeline()
 shrinked_scalar_map = GetRepresentation(shrink_filter)
-shrinked_scalar_map.ColorAttributeType = EntityType.get_pvtype(EntityType.CELL)
-shrinked_scalar_map.ColorArrayName = field_name
+shrinked_scalar_map.ColorArrayName = (EntityType.get_pvtype(EntityType.CELL), field_name)
 shrinked_scalar_map.Representation = scalar_map.Representation
 lookup_table = scalar_map.LookupTable
 shrinked_scalar_map.LookupTable = lookup_table
@@ -115,7 +109,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)
@@ -144,7 +138,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,10 +152,10 @@ 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, "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)
 
@@ -172,7 +166,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,12 +180,12 @@ 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")
 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)
@@ -206,8 +200,7 @@ shrink_filter = Shrink(scalar_map.Input)
 shrink_filter.ShrinkFactor = 0.8
 shrink_filter.UpdatePipeline()
 shrinked_scalar_map = GetRepresentation(shrink_filter)
-shrinked_scalar_map.ColorAttributeType = EntityType.get_pvtype(EntityType.CELL)
-shrinked_scalar_map.ColorArrayName = field_name
+shrinked_scalar_map.ColorArrayName = (EntityType.get_pvtype(EntityType.CELL), field_name)
 shrinked_scalar_map.Representation = scalar_map.Representation
 lookup_table = scalar_map.LookupTable
 shrinked_scalar_map.LookupTable = lookup_table
@@ -216,7 +209,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)
@@ -243,7 +236,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,10 +249,10 @@ 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, "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
@@ -269,7 +262,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 +275,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")