Merge remote branch 'origin/V7_dev'

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

diff --git a/test/VisuPrs/3D_viewer/B0.py b/test/VisuPrs/3D_viewer/B0.py
index 6aca6741d7ecbf6a57e0cdb3e42c960b57558f05..ead298bbf8d462aee1ecb522b700828af5970650 100644 (file)
--- a/test/VisuPrs/3D_viewer/B0.py
+++ b/test/VisuPrs/3D_viewer/B0.py
@@ -1,9 +1,9 @@
-# Copyright (C) 2010-2013  CEA/DEN, EDF R&D
+# Copyright (C) 2010-2016  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -24,19 +24,15 @@ from paravistest import *
 from presentations import *
 from pvsimple import *
 import sys
-import paravis
 import time
 
 # Directory for saving snapshots
-picturedir = get_picture_dir(sys.argv[1], "3D_viewer/B0")
+picturedir = get_picture_dir("3D_viewer/B0")
 
 # Add path separator to the end of picture path if necessery
 if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
-#import file
-myParavis = paravis.myParavis
-
 # Get view
 my_view = GetRenderView()
 reset_view(my_view)
@@ -47,7 +43,7 @@ print " --------------------------------- "
 print "file ", theFileName
 print " --------------------------------- "
 
-myParavis.ImportFile(theFileName)
+OpenDataFile(theFileName)
 proxy = GetActiveSource()
 if proxy is None:
     raise RuntimeError("Error: can't import file.")
@@ -57,7 +53,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 +63,7 @@ shrinked_sm = None
 field_name = 'VITESSE'
 
 print "\nCreating scalar map.......",
-scalar_map = ScalarMapOnField(proxy, EntityType.CELL, field_name, 1)
+scalar_map = ScalarMapOnField(proxy, EntityType.NODE, field_name, 1)
 if scalar_map is None:
     raise RuntimeError("Error!!! Presentation wasn't created...")
 
@@ -88,9 +84,8 @@ for reprCode in represents:
                 shrink_filter = Shrink(scalar_map.Input)
                 shrinked_sm = GetRepresentation(shrink_filter)
                 shrink_filter.ShrinkFactor = 0.8
-                shrink_filter.UpdatePipeline()                
-                shrinked_sm.ColorAttributeType = scalar_map.ColorAttributeType
-                shrinked_sm.ColorArrayName = scalar_map.ColorArrayName
+                shrink_filter.UpdatePipeline()
+                shrinked_sm.ColorArrayName = scalar_map.ColorArrayName[0:2]
                 lookup_table = scalar_map.LookupTable
                 shrinked_sm.LookupTable = lookup_table
 
@@ -107,7 +102,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: