Salome HOME
Merge branch 'origin/agy/feedbackads140304'
authorakl <akl@opencascade.com>
Wed, 26 Mar 2014 06:37:54 +0000 (10:37 +0400)
committerakl <akl@opencascade.com>
Wed, 26 Mar 2014 06:37:54 +0000 (10:37 +0400)
104 files changed:
src/PV_SWIG/VTKWrapping/presentations.py
src/PV_SWIG/presentations.py
src/Plugins/MEDReader/CMakeLists.txt
src/Plugins/MEDReader/Test/CMakeLists.txt
test/VisuPrs/2D_viewer/A0.py
test/VisuPrs/2D_viewer/A1.py
test/VisuPrs/3D_viewer/A1.py
test/VisuPrs/3D_viewer/A2.py
test/VisuPrs/3D_viewer/A3.py
test/VisuPrs/3D_viewer/A7.py
test/VisuPrs/3D_viewer/A8.py
test/VisuPrs/3D_viewer/B0.py
test/VisuPrs/Animation/A0.py [changed mode: 0755->0644]
test/VisuPrs/Animation/A2.py [changed mode: 0755->0644]
test/VisuPrs/Animation/A4.py
test/VisuPrs/Animation/A7.py
test/VisuPrs/Animation/A8.py
test/VisuPrs/Animation/B2.py
test/VisuPrs/Animation/B5.py
test/VisuPrs/Animation/B6.py
test/VisuPrs/Animation/C0.py
test/VisuPrs/Animation/C1.py
test/VisuPrs/Animation/C3.py
test/VisuPrs/Animation/C8.py
test/VisuPrs/Animation/D1.py
test/VisuPrs/Animation/D2.py
test/VisuPrs/Animation/D6.py
test/VisuPrs/Animation/D9.py
test/VisuPrs/Animation/E0.py
test/VisuPrs/Animation/E4.py
test/VisuPrs/Animation/E8.py
test/VisuPrs/Animation/F2.py
test/VisuPrs/Animation/F5.py
test/VisuPrs/Animation/F6.py
test/VisuPrs/Animation/G0.py
test/VisuPrs/Animation/G3.py
test/VisuPrs/Animation/G4.py
test/VisuPrs/Animation/G8.py
test/VisuPrs/Animation/H1.py
test/VisuPrs/Animation/H2.py
test/VisuPrs/CutLines/G2.py
test/VisuPrs/CutPlanes/G2.py
test/VisuPrs/DeformedShape/B3.py
test/VisuPrs/DeformedShape/B4.py
test/VisuPrs/DeformedShape/F9.py
test/VisuPrs/GaussPoints/A0.py
test/VisuPrs/GaussPoints/A1.py
test/VisuPrs/GaussPoints/A2.py
test/VisuPrs/GaussPoints/A3.py
test/VisuPrs/GaussPoints/A4.py
test/VisuPrs/GaussPoints/A5.py
test/VisuPrs/GaussPoints/A6.py
test/VisuPrs/GaussPoints/A7.py
test/VisuPrs/GaussPoints/A9.py
test/VisuPrs/GaussPoints/B0.py
test/VisuPrs/GaussPoints/B1.py
test/VisuPrs/GaussPoints/B2.py
test/VisuPrs/GaussPoints/B3.py
test/VisuPrs/GaussPoints/B4.py
test/VisuPrs/GaussPoints/B5.py
test/VisuPrs/GaussPoints/B6.py
test/VisuPrs/GaussPoints/B7.py
test/VisuPrs/GaussPoints/B8.py
test/VisuPrs/GaussPoints/B9.py
test/VisuPrs/GaussPoints/C0.py
test/VisuPrs/GaussPoints/C1.py
test/VisuPrs/GaussPoints/C2.py
test/VisuPrs/GaussPoints/C3.py
test/VisuPrs/GaussPoints/C4.py
test/VisuPrs/GaussPoints/C5.py
test/VisuPrs/GaussPoints/C6.py
test/VisuPrs/GaussPoints/C7.py
test/VisuPrs/GaussPoints/C8.py
test/VisuPrs/GaussPoints/C9.py
test/VisuPrs/IsoSurfaces/G2.py
test/VisuPrs/Plot3D/G2.py
test/VisuPrs/SWIG_scripts/A1.py
test/VisuPrs/SWIG_scripts/A8.py
test/VisuPrs/SWIG_scripts/A9.py
test/VisuPrs/SWIG_scripts/C3.py
test/VisuPrs/ScalarMap/G2.py
test/VisuPrs/Util/paravistest.py
test/VisuPrs/Vectors/F9.py
test/VisuPrs/bugs/A0.py
test/VisuPrs/bugs/A1.py
test/VisuPrs/bugs/A2.py
test/VisuPrs/bugs/A6.py
test/VisuPrs/bugs/A7.py
test/VisuPrs/bugs/A9.py
test/VisuPrs/bugs/B1.py
test/VisuPrs/bugs/C3.py
test/VisuPrs/bugs/C4.py
test/VisuPrs/bugs/C6.py
test/VisuPrs/bugs/C7.py
test/VisuPrs/bugs/D0.py
test/VisuPrs/bugs/D1.py
test/VisuPrs/bugs/D3.py
test/VisuPrs/bugs/D6.py
test/VisuPrs/bugs/D7.py
test/VisuPrs/dump_study/A7.py
test/VisuPrs/imps/A1.py
test/VisuPrs/imps/A6.py
test/VisuPrs/united/A1.py
test/VisuPrs/united/A4.py

index fb5c7584d40c3215eedf8d1cd28c0ee8f84e8916..360b54349dbed0f0fe223cfbd514d8c2ab1f5f28 100644 (file)
@@ -32,12 +32,15 @@ import warnings
 from math import sqrt, sin, cos, radians
 from string import upper
 
-import pvsimple as pv
+# Do not use pv as a short name.
+# It is a name of function from numpy and may be redefined implicitly by 'from numpy import *' call.
+# import pvsimple as pv
+import pvsimple as pvs
 #try:
 #    # TODO(MZN): to be removed (issue with Point Sprite texture)
 #    #import paravisSM as sm
 #except:
-#    import paraview.simple as pv
+#    import paraview.simple as pvs
 #    import paraview.servermanager as sm
 
 
@@ -50,6 +53,7 @@ GAP_COEFFICIENT = 0.0001
 
 # Globals
 _current_bar = None
+_med_field_sep = '@@][@@'
 
 
 # Enumerations
@@ -94,11 +98,11 @@ class EntityType:
     NODE = 0
     CELL = 1
 
-    _type2name = {NODE: 'OnPoint',
-                  CELL: 'OnCell'}
+    _type2name = {NODE: 'P1',
+                  CELL: 'P0'}
 
-    _name2type = {'OnPoint': NODE,
-                  'OnCell': CELL}
+    _name2type = {'P1': NODE,
+                  'P0': CELL}
 
     _type2pvtype = {NODE: 'POINT_DATA',
                     CELL: 'CELL_DATA'}
@@ -168,6 +172,42 @@ class GaussType:
 
 
 # Auxiliary functions
+
+def get_field_mesh_name(full_field_name):
+    """Return mesh name of the field by its full name."""
+    aList = full_field_name.split('/')
+    if len(aList) >= 2 :
+        field_name = full_field_name.split('/')[1]
+        return field_name
+
+
+def get_field_entity(full_field_name):
+    """Return entity type of the field by its full name."""
+    aList = full_field_name.split(_med_field_sep)
+    if len(aList) == 2 :
+        entity_name = full_field_name.split(_med_field_sep)[-1]
+        entity = EntityType.get_type(entity_name)
+        return entity
+
+
+def get_field_short_name(full_field_name):
+    """Return short name of the field by its full name."""
+    aList = full_field_name.split('/')
+    if len(aList) == 4 :
+        short_name_with_type = full_field_name.split('/')[-1]
+        short_name = short_name_with_type.split(_med_field_sep)[0]
+        return short_name
+
+
+def find_mesh_full_name(proxy, short_mesh_name):
+    """Return full mesh path by short mesh name, if found"""
+    proxy.UpdatePipeline()
+    all_mesh_names = get_mesh_full_names(proxy)
+    for name in all_mesh_names:
+        if short_mesh_name == get_field_short_name(name):
+            return name
+
+
 def process_prs_for_test(prs, view, picture_name, show_bar=True):
     """Show presentation and record snapshot image.
 
@@ -195,7 +235,7 @@ def process_prs_for_test(prs, view, picture_name, show_bar=True):
         os.makedirs(pic_dir)
 
     # Save picture
-    pv.WriteImage(file_name, view=view, Magnification=1)
+    pvs.WriteImage(file_name, view=view, Magnification=1)
 
 
 def reset_view(view=None):
@@ -206,7 +246,7 @@ def reset_view(view=None):
 
     """
     if not view:
-        view = pv.GetRenderView()
+        view = pvs.GetRenderView()
 
     # Camera preferences
     view.CameraFocalPoint = [0.0, 0.0, 0.0]
@@ -221,13 +261,13 @@ def reset_view(view=None):
     view.CameraParallelProjection = 1
 
     view.ResetCamera()
-    pv.Render(view=view)
+    pvs.Render(view=view)
 
 
 def hide_all(view, to_remove=False):
     """Hide all representations in the view."""
     if not view:
-        view = pv.GetRenderView()
+        view = pvs.GetRenderView()
 
     rep_list = view.Representations
     for rep in rep_list:
@@ -235,15 +275,19 @@ def hide_all(view, to_remove=False):
             rep.Visibility = 0
         if to_remove:
             view.Representations.remove(rep)
-    pv.Render(view=view)
+    pvs.Render(view=view)
 
 
 def display_only(prs, view=None):
     """Display only the given presentation in the view."""
-    hide_all(view)
-    if (hasattr(prs, 'Visibility') and prs.Visibility != 1):
-        prs.Visibility = 1
-    pv.Render(view=view)
+    if not view:
+        view = pvs.GetRenderView()
+
+    rep_list = view.Representations
+    for rep in rep_list:
+        if hasattr(rep, 'Visibility'):
+            rep.Visibility = (rep == prs)
+    pvs.Render(view=view)
 
 
 def set_visible_lines(xy_prs, lines):
@@ -325,6 +369,7 @@ def get_data_range(proxy, entity, field_name, vector_mode='Magnitude',
       Data range as [min, max]
 
     """
+    proxy.UpdatePipeline()
     entity_data_info = None
     field_data = proxy.GetFieldDataInformation()
 
@@ -357,6 +402,7 @@ def get_data_range(proxy, entity, field_name, vector_mode='Magnitude',
 
 def get_bounds(proxy):
     """Get bounds of the proxy in 3D."""
+    proxy.UpdatePipeline()
     dataInfo = proxy.GetDataInformation()
     bounds_info = dataInfo.GetBounds()
     return bounds_info
@@ -364,24 +410,28 @@ def get_bounds(proxy):
 
 def get_x_range(proxy):
     """Get X range of the proxy bounds in 3D."""
+    proxy.UpdatePipeline()
     bounds_info = get_bounds(proxy)
     return bounds_info[0:2]
 
 
 def get_y_range(proxy):
     """Get Y range of the proxy bounds in 3D."""
+    proxy.UpdatePipeline()
     bounds_info = get_bounds(proxy)
     return bounds_info[2:4]
 
 
 def get_z_range(proxy):
     """Get Z range of the proxy bounds in 3D."""
+    proxy.UpdatePipeline()
     bounds_info = get_bounds(proxy)
     return bounds_info[4:6]
 
 
 def is_planar_input(proxy):
     """Check if the given input is planar."""
+    proxy.UpdatePipeline()
     bounds_info = get_bounds(proxy)
 
     if (abs(bounds_info[0] - bounds_info[1]) <= FLT_MIN or
@@ -394,6 +444,7 @@ def is_planar_input(proxy):
 
 def is_data_on_cells(proxy, field_name):
     """Check the existence of a field on cells with the given name."""
+    proxy.UpdatePipeline()
     cell_data_info = proxy.GetCellDataInformation()
     return (field_name in cell_data_info.keys())
 
@@ -406,6 +457,7 @@ def is_empty(proxy):
       False: otherwise
 
     """
+    proxy.UpdatePipeline()
     data_info = proxy.GetDataInformation()
 
     nb_cells = data_info.GetNumberOfCells()
@@ -416,6 +468,7 @@ def is_empty(proxy):
 
 def get_orientation(proxy):
     """Get the optimum cutting plane orientation for Plot 3D."""
+    proxy.UpdatePipeline()
     orientation = Orientation.XY
 
     bounds = get_bounds(proxy)
@@ -587,6 +640,7 @@ def get_contours(scalar_range, nb_contours):
 
 def get_nb_components(proxy, entity, field_name):
     """Return number of components for the field."""
+    proxy.UpdatePipeline()
     entity_data_info = None
     field_data = proxy.GetFieldDataInformation()
 
@@ -640,6 +694,7 @@ def get_scale_factor(proxy):
 
 def get_default_scale(prs_type, proxy, entity, field_name):
     """Get default scale factor."""
+    proxy.UpdatePipeline()
     data_range = get_data_range(proxy, entity, field_name)
 
     if prs_type == PrsTypeEnum.DEFORMEDSHAPE:
@@ -667,12 +722,13 @@ def get_calc_magnitude(proxy, array_entity, array_name):
       the calculator object.
 
     """
+    proxy.UpdatePipeline()
     calculator = None
 
     # Transform vector array to scalar array if possible
     nb_components = get_nb_components(proxy, array_entity, array_name)
     if (nb_components > 1):
-        calculator = pv.Calculator(proxy)
+        calculator = pvs.Calculator(proxy)
         attribute_mode = "Point Data"
         if array_entity != EntityType.NODE:
             attribute_mode = "Cell Data"
@@ -701,11 +757,12 @@ def get_add_component_calc(proxy, array_entity, array_name):
       the calculator object.
 
     """
+    proxy.UpdatePipeline()
     calculator = None
 
     nb_components = get_nb_components(proxy, array_entity, array_name)
     if nb_components == 2:
-        calculator = pv.Calculator(proxy)
+        calculator = pvs.Calculator(proxy)
         attribute_mode = "Point Data"
         if array_entity != EntityType.NODE:
             attribute_mode = "Cell Data"
@@ -724,14 +781,13 @@ def select_all_cells(proxy):
     Used in creation of mesh/submesh presentation.
 
     """
-    ### Old API all_cell_types = proxy.CellTypes.Available
-    all_cell_types = proxy.Entity.Available
-    ### Old API proxy.CellTypes = all_cell_types
-    proxy.Entity = all_cell_types
     proxy.UpdatePipeline()
+    extractCT = pvs.ExtractCellType()
+    extractCT.AllGeoTypes = extractCT.GetProperty("GeoTypesInfo")[::2]
+    extractCT.UpdatePipelineInformation()
 
 
-def select_cells_with_data(proxy, on_points=None, on_cells=None):
+def select_cells_with_data(proxy, on_points=[], on_cells=[], on_gauss=[]):
     """Select cell types with data.
 
     Only cell types with data for the given fields will be selected.
@@ -739,8 +795,34 @@ def select_cells_with_data(proxy, on_points=None, on_cells=None):
     types with data for even one field (from available) will be selected.
 
     """
+    proxy.UpdatePipeline()
     if not hasattr(proxy, 'Entity'):
-        return
+        separator = proxy.GetProperty("Separator").GetData()
+
+        fields_info = proxy.GetProperty("FieldsTreeInfo")[::2]
+        arr_name_with_dis=[elt.split("/")[-1] for elt in fields_info]
+
+        proxy.AllArrays = []
+        
+        fields = []
+        for name in on_gauss:
+            fields.append(name+separator+'GAUSS')
+        for name in on_cells:
+            fields.append(name+separator+'P0')
+        for name in on_points:
+            fields.append(name+separator+'P1')
+
+        field_list = []
+        for name in fields:
+            if arr_name_with_dis.count(name) > 0:
+                index = arr_name_with_dis.index(name)
+                field_list.append(fields_info[index])
+                
+        proxy.AllArrays = field_list
+        proxy.UpdatePipeline()
+        return len(field_list) != 0
+
+    # TODO: VTN. Looks like this code is out of date.
     
     #all_cell_types = proxy.CellTypes.Available
     all_cell_types = proxy.Entity.Available
@@ -783,8 +865,9 @@ def select_cells_with_data(proxy, on_points=None, on_cells=None):
     proxy.Entity = cell_types_on
     proxy.UpdatePipeline()
 
-def if_possible(proxy, field_name, entity, prs_type):
+def if_possible(proxy, field_name, entity, prs_type, extrGrps=None):
     """Check if the presentation creation is possible on the given field."""
+    proxy.UpdatePipeline()
     result = True
     if (prs_type == PrsTypeEnum.DEFORMEDSHAPE or
         prs_type == PrsTypeEnum.DEFORMEDSHAPESCALARMAP or
@@ -796,7 +879,7 @@ def if_possible(proxy, field_name, entity, prs_type):
         result = (entity == EntityType.CELL or
                   field_name in proxy.QuadraturePointArrays.Available)
     elif (prs_type == PrsTypeEnum.MESH):
-        result = len(get_group_names(proxy, field_name, entity)) > 0
+        result = len(get_group_names(extrGrps)) > 0
 
     return result
 
@@ -812,7 +895,7 @@ def add_scalar_bar(field_name, nb_components,
         title = "\n".join([title, vector_mode])
 
     # Create scalar bar
-    scalar_bar = pv.CreateScalarBar(Enabled=1)
+    scalar_bar = pvs.CreateScalarBar(Enabled=1)
     scalar_bar.Orientation = 'Vertical'
     scalar_bar.Title = title
     scalar_bar.LookupTable = lookup_table
@@ -835,7 +918,7 @@ def add_scalar_bar(field_name, nb_components,
     scalar_bar.LabelShadow = 1
 
     # Add the scalar bar to the view
-    pv.GetRenderView().Representations.append(scalar_bar)
+    pvs.GetRenderView().Representations.append(scalar_bar)
 
     # Reassign the current bar
     _current_bar = scalar_bar
@@ -852,7 +935,7 @@ def get_bar():
 
 def get_lookup_table(field_name, nb_components, vector_mode='Magnitude'):
     """Get lookup table for the given field."""
-    lookup_table = pv.GetLookupTableForArray(field_name, nb_components)
+    lookup_table = pvs.GetLookupTableForArray(field_name, nb_components)
 
     if vector_mode == 'Magnitude':
         lookup_table.VectorMode = vector_mode
@@ -894,40 +977,28 @@ def get_group_entity(full_group_name):
 
 def get_group_short_name(full_group_name):
     """Return short name of the group by its full name."""
-    aList = full_group_name.split('/')
-    if len(aList) >= 4 :
-        short_name = full_group_name.split('/')[3]
-        return short_name
+    short_name = re.sub('^GRP_', '', full_group_name)
+    return short_name
 
 
-def get_mesh_names(proxy):
+def get_mesh_full_names(proxy):
     """Return all mesh names in the given proxy as a set."""
-    groups = proxy.Groups.Available
-    mesh_names = set([get_group_mesh_name(item) for item in groups])
-
-    return mesh_names
+    proxy.UpdatePipeline()
+    fields = proxy.GetProperty("FieldsTreeInfo")[::2]
+    mesh_full_names = set([item for item in fields if get_field_mesh_name(item) == get_field_short_name(item)])
+    return mesh_full_names
 
 
-def get_group_names(proxy, mesh_name, entity, wo_nogroups=False):
-    """Return full names of all groups of the given entity type
-    from the mesh with the given name as a list.
+def get_group_names(extrGrps):
+    """Return full names of all groups of the given 'ExtractGroup' filter object.
     """
-    groups = proxy.Groups.Available
-
-    condition = lambda item: (get_group_mesh_name(item) == mesh_name and
-                              get_group_entity(item) == entity)
-    group_names = [item for item in groups if condition(item)]
-
-    if wo_nogroups:
-        # Remove "No_Group" group
-        not_no_group = lambda item: get_group_short_name(item) != "No_Group"
-        group_names = filter(not_no_group, group_names)
-
+    group_names = filter(lambda x:x[:4]=="GRP_",list(extrGrps.GetProperty("GroupsFlagsInfo")[::2]))
     return group_names
 
 
 def get_time(proxy, timestamp_nb):
     """Get time value by timestamp number."""
+    proxy.UpdatePipeline()
     # Check timestamp number
     timestamps = []
     
@@ -936,12 +1007,15 @@ def get_time(proxy, timestamp_nb):
     elif (hasattr(proxy.Input, 'TimestepValues')):
         timestamps = proxy.Input.TimestepValues.GetData()
 
-    if ((timestamp_nb - 1) not in xrange(len(timestamps))):
+    length = len(timestamps)
+    if (timestamp_nb > 0 and (timestamp_nb - 1) not in xrange(length) ) or (timestamp_nb < 0 and -timestamp_nb > length):
         raise ValueError("Timestamp number is out of range: " + str(timestamp_nb))
 
     # Return time value
-    return timestamps[timestamp_nb - 1]
-
+    if timestamp_nb > 0:
+        return timestamps[timestamp_nb - 1]
+    else:
+        return timestamps[timestamp_nb]
 
 def create_prs(prs_type, proxy, field_entity, field_name, timestamp_nb):
     """Auxiliary function.
@@ -951,6 +1025,7 @@ def create_prs(prs_type, proxy, field_entity, field_name, timestamp_nb):
     Set the presentation properties like visu.CreatePrsForResult() do.
 
     """
+    proxy.UpdatePipeline()
     prs = None
 
     if prs_type == PrsTypeEnum.SCALARMAP:
@@ -1002,6 +1077,7 @@ def ScalarMapOnField(proxy, entity, field_name, timestamp_nb,
       Scalar Map as representation object.
 
     """
+    proxy.UpdatePipeline()
     # We don't need mesh parts with no data on them
     if entity == EntityType.NODE:
         select_cells_with_data(proxy, on_points=[field_name])
@@ -1016,11 +1092,11 @@ def ScalarMapOnField(proxy, entity, field_name, timestamp_nb,
     time_value = get_time(proxy, timestamp_nb)
 
     # Set timestamp
-    pv.GetRenderView().ViewTime = time_value
-    pv.UpdatePipeline(time_value, proxy)
+    pvs.GetRenderView().ViewTime = time_value
+    pvs.UpdatePipeline(time_value, proxy)
 
     # Get Scalar Map representation object
-    scalarmap = pv.GetRepresentation(proxy)
+    scalarmap = pvs.GetRepresentation(proxy)
 
     # Get lookup table
     lookup_table = get_lookup_table(field_name, nb_components, vector_mode)
@@ -1072,6 +1148,12 @@ def CutPlanesOnField(proxy, entity, field_name, timestamp_nb,
       Cut Planes as representation object.
 
     """
+    proxy.UpdatePipeline()
+    if entity == EntityType.NODE:
+        select_cells_with_data(proxy, on_points=[field_name])
+    else:
+        select_cells_with_data(proxy, on_cells=[field_name])
+
     # Check vector mode
     nb_components = get_nb_components(proxy, entity, field_name)
     check_vector_mode(vector_mode, nb_components)
@@ -1080,11 +1162,11 @@ def CutPlanesOnField(proxy, entity, field_name, timestamp_nb,
     time_value = get_time(proxy, timestamp_nb)
 
     # Set timestamp
-    pv.GetRenderView().ViewTime = time_value
-    pv.UpdatePipeline(time_value, proxy)
+    pvs.GetRenderView().ViewTime = time_value
+    pvs.UpdatePipeline(time_value, proxy)
 
     # Create slice filter
-    slice_filter = pv.Slice(proxy)
+    slice_filter = pvs.Slice(proxy)
     slice_filter.SliceType = "Plane"
 
     # Set cut planes normal
@@ -1098,7 +1180,7 @@ def CutPlanesOnField(proxy, entity, field_name, timestamp_nb,
     slice_filter.SliceOffsetValues = positions
 
     # Get Cut Planes representation object
-    cut_planes = pv.GetRepresentation(slice_filter)
+    cut_planes = pvs.GetRepresentation(slice_filter)
 
     # Get lookup table
     lookup_table = get_lookup_table(field_name, nb_components, vector_mode)
@@ -1162,6 +1244,12 @@ def CutLinesOnField(proxy, entity, field_name, timestamp_nb,
       (Cut Lines as representation object, list of 'PlotOverLine') otherwise
 
     """
+    proxy.UpdatePipeline()
+    if entity == EntityType.NODE:
+        select_cells_with_data(proxy, on_points=[field_name])
+    else:
+        select_cells_with_data(proxy, on_cells=[field_name])
+
     # Check vector mode
     nb_components = get_nb_components(proxy, entity, field_name)
     check_vector_mode(vector_mode, nb_components)
@@ -1170,11 +1258,11 @@ def CutLinesOnField(proxy, entity, field_name, timestamp_nb,
     time_value = get_time(proxy, timestamp_nb)
 
     # Set timestamp
-    pv.GetRenderView().ViewTime = time_value
-    pv.UpdatePipeline(time_value, proxy)
+    pvs.GetRenderView().ViewTime = time_value
+    pvs.UpdatePipeline(time_value, proxy)
 
     # Create base plane
-    base_plane = pv.Slice(proxy)
+    base_plane = pvs.Slice(proxy)
     base_plane.SliceType = "Plane"
 
     # Set base plane normal
@@ -1194,7 +1282,7 @@ def CutLinesOnField(proxy, entity, field_name, timestamp_nb,
         base_plane = proxy
 
     # Create cutting planes
-    cut_planes = pv.Slice(base_plane)
+    cut_planes = pvs.Slice(base_plane)
     cut_planes.SliceType = "Plane"
 
     # Set cutting planes normal and get positions
@@ -1220,9 +1308,9 @@ def CutLinesOnField(proxy, entity, field_name, timestamp_nb,
             point2 = [bounds[1], bounds[3], bounds[5]]
 
             # Create plot over line filter
-            pol = pv.PlotOverLine(cut_planes,
+            pol = pvs.PlotOverLine(cut_planes,
                                   Source="High Resolution Line Source")
-            pv.RenameSource('Y' + str(index), pol)
+            pvs.RenameSource('Y' + str(index), pol)
             pol.Source.Point1 = point1
             pol.Source.Point2 = point2
             pol.UpdatePipeline()
@@ -1234,7 +1322,7 @@ def CutLinesOnField(proxy, entity, field_name, timestamp_nb,
     cut_planes.UpdatePipeline()
 
     # Get Cut Lines representation object
-    cut_lines = pv.GetRepresentation(cut_planes)
+    cut_lines = pvs.GetRepresentation(cut_planes)
 
     # Get lookup table
     lookup_table = get_lookup_table(field_name, nb_components, vector_mode)
@@ -1284,6 +1372,12 @@ def CutSegmentOnField(proxy, entity, field_name, timestamp_nb,
       Cut Segment as 3D representation object.
 
     """
+    proxy.UpdatePipeline()
+    if entity == EntityType.NODE:
+        select_cells_with_data(proxy, on_points=[field_name])
+    else:
+        select_cells_with_data(proxy, on_cells=[field_name])
+
     # Check vector mode
     nb_components = get_nb_components(proxy, entity, field_name)
     check_vector_mode(vector_mode, nb_components)
@@ -1292,17 +1386,17 @@ def CutSegmentOnField(proxy, entity, field_name, timestamp_nb,
     time_value = get_time(proxy, timestamp_nb)
 
     # Set timestamp
-    pv.GetRenderView().ViewTime = time_value
-    pv.UpdatePipeline(time_value, proxy)
+    pvs.GetRenderView().ViewTime = time_value
+    pvs.UpdatePipeline(time_value, proxy)
 
     # Create plot over line filter
-    pol = pv.PlotOverLine(proxy, Source="High Resolution Line Source")
+    pol = pvs.PlotOverLine(proxy, Source="High Resolution Line Source")
     pol.Source.Point1 = point1
     pol.Source.Point2 = point2
     pol.UpdatePipeline()
 
     # Get Cut Segment representation object
-    cut_segment = pv.GetRepresentation(pol)
+    cut_segment = pvs.GetRepresentation(pol)
 
     # Get lookup table
     lookup_table = get_lookup_table(field_name, nb_components, vector_mode)
@@ -1352,6 +1446,12 @@ def VectorsOnField(proxy, entity, field_name, timestamp_nb,
       Vectors as representation object.
 
     """
+    proxy.UpdatePipeline()
+    if entity == EntityType.NODE:
+        select_cells_with_data(proxy, on_points=[field_name])
+    else:
+        select_cells_with_data(proxy, on_cells=[field_name])
+
     # Check vector mode
     nb_components = get_nb_components(proxy, entity, field_name)
     check_vector_mode(vector_mode, nb_components)
@@ -1360,15 +1460,15 @@ def VectorsOnField(proxy, entity, field_name, timestamp_nb,
     time_value = get_time(proxy, timestamp_nb)
 
     # Set timestamp
-    pv.GetRenderView().ViewTime = time_value
-    pv.UpdatePipeline(time_value, proxy)
+    pvs.GetRenderView().ViewTime = time_value
+    pvs.UpdatePipeline(time_value, proxy)
 
     # Extract only groups with data for the field
     source = proxy
 
     # Cell centers
     if is_data_on_cells(proxy, field_name):
-        cell_centers = pv.CellCenters(source)
+        cell_centers = pvs.CellCenters(source)
         cell_centers.VertexCells = 1
         source = cell_centers
 
@@ -1380,7 +1480,7 @@ def VectorsOnField(proxy, entity, field_name, timestamp_nb,
         source = calc
 
     # Glyph
-    glyph = pv.Glyph(source)
+    glyph = pvs.Glyph(source)
     glyph.Vectors = vector_array
     glyph.ScaleMode = 'vector'
     glyph.MaskPoints = 0
@@ -1413,7 +1513,7 @@ def VectorsOnField(proxy, entity, field_name, timestamp_nb,
     glyph.UpdatePipeline()
 
     # Get Vectors representation object
-    vectors = pv.GetRepresentation(glyph)
+    vectors = pvs.GetRepresentation(glyph)
 
     # Get lookup table
     lookup_table = get_lookup_table(field_name, nb_components, vector_mode)
@@ -1465,6 +1565,7 @@ def DeformedShapeOnField(proxy, entity, field_name,
       Defromed Shape as representation object.
 
     """
+    proxy.UpdatePipeline()
     # We don't need mesh parts with no data on them
     if entity == EntityType.NODE:
         select_cells_with_data(proxy, on_points=[field_name])
@@ -1479,15 +1580,15 @@ def DeformedShapeOnField(proxy, entity, field_name,
     time_value = get_time(proxy, timestamp_nb)
 
     # Set timestamp
-    pv.GetRenderView().ViewTime = time_value
-    pv.UpdatePipeline(time_value, proxy)
+    pvs.GetRenderView().ViewTime = time_value
+    pvs.UpdatePipeline(time_value, proxy)
 
     # Do merge
-    source = pv.MergeBlocks(proxy)
+    source = pvs.MergeBlocks(proxy)
 
     # Cell data to point data
     if is_data_on_cells(proxy, field_name):
-        cell_to_point = pv.CellDatatoPointData()
+        cell_to_point = pvs.CellDatatoPointData()
         cell_to_point.PassCellData = 1
         source = cell_to_point
 
@@ -1499,7 +1600,7 @@ def DeformedShapeOnField(proxy, entity, field_name,
         source = calc
 
     # Warp by vector
-    warp_vector = pv.WarpByVector(source)
+    warp_vector = pvs.WarpByVector(source)
     warp_vector.Vectors = [vector_array]
     if scale_factor is not None:
         warp_vector.ScaleFactor = scale_factor
@@ -1509,7 +1610,7 @@ def DeformedShapeOnField(proxy, entity, field_name,
         warp_vector.ScaleFactor = def_scale
 
     # Get Deformed Shape representation object
-    defshape = pv.GetRepresentation(warp_vector)
+    defshape = pvs.GetRepresentation(warp_vector)
 
     # Get lookup table
     lookup_table = get_lookup_table(field_name, nb_components, vector_mode)
@@ -1562,6 +1663,7 @@ def DeformedShapeAndScalarMapOnField(proxy, entity, field_name,
       Defromed Shape And Scalar Map as representation object.
 
     """
+    proxy.UpdatePipeline()
     # We don't need mesh parts with no data on them
     on_points = []
     on_cells = []
@@ -1587,8 +1689,8 @@ def DeformedShapeAndScalarMapOnField(proxy, entity, field_name,
     time_value = get_time(proxy, timestamp_nb)
 
     # Set timestamp
-    pv.GetRenderView().ViewTime = time_value
-    pv.UpdatePipeline(time_value, proxy)
+    pvs.GetRenderView().ViewTime = time_value
+    pvs.UpdatePipeline(time_value, proxy)
 
     # Set scalar field by default
     scalar_field_entity = scalar_entity
@@ -1598,11 +1700,11 @@ def DeformedShapeAndScalarMapOnField(proxy, entity, field_name,
         scalar_field = field_name
 
     # Do merge
-    source = pv.MergeBlocks(proxy)
+    source = pvs.MergeBlocks(proxy)
 
     # Cell data to point data
     if is_data_on_cells(proxy, field_name):
-        cell_to_point = pv.CellDatatoPointData(source)
+        cell_to_point = pvs.CellDatatoPointData(source)
         cell_to_point.PassCellData = 1
         source = cell_to_point
 
@@ -1614,7 +1716,7 @@ def DeformedShapeAndScalarMapOnField(proxy, entity, field_name,
         source = calc
 
     # Warp by vector
-    warp_vector = pv.WarpByVector(source)
+    warp_vector = pvs.WarpByVector(source)
     warp_vector.Vectors = [vector_array]
     if scale_factor is not None:
         warp_vector.ScaleFactor = scale_factor
@@ -1624,7 +1726,7 @@ def DeformedShapeAndScalarMapOnField(proxy, entity, field_name,
         warp_vector.ScaleFactor = def_scale
 
     # Get Defromed Shape And Scalar Map representation object
-    defshapemap = pv.GetRepresentation(warp_vector)
+    defshapemap = pvs.GetRepresentation(warp_vector)
 
     # Get lookup table
     lookup_table = get_lookup_table(scalar_field, nb_components, vector_mode)
@@ -1684,6 +1786,7 @@ def Plot3DOnField(proxy, entity, field_name, timestamp_nb,
       Plot 3D as representation object.
 
     """
+    proxy.UpdatePipeline()
     # We don't need mesh parts with no data on them
     if entity == EntityType.NODE:
         select_cells_with_data(proxy, on_points=[field_name])
@@ -1698,11 +1801,11 @@ def Plot3DOnField(proxy, entity, field_name, timestamp_nb,
     time_value = get_time(proxy, timestamp_nb)
 
     # Set timestamp
-    pv.GetRenderView().ViewTime = time_value
-    pv.UpdatePipeline(time_value, proxy)
+    pvs.GetRenderView().ViewTime = time_value
+    pvs.UpdatePipeline(time_value, proxy)
 
     # Do merge
-    merge_blocks = pv.MergeBlocks(proxy)
+    merge_blocks = pvs.MergeBlocks(proxy)
     merge_blocks.UpdatePipeline()
 
     poly_data = None
@@ -1722,7 +1825,7 @@ def Plot3DOnField(proxy, entity, field_name, timestamp_nb,
                                            radians(angle1), radians(angle2))
 
         # Create slice filter
-        slice_filter = pv.Slice(merge_blocks)
+        slice_filter = pvs.Slice(merge_blocks)
         slice_filter.SliceType = "Plane"
 
         # Set cutting plane normal
@@ -1744,7 +1847,7 @@ def Plot3DOnField(proxy, entity, field_name, timestamp_nb,
     use_normal = 0
     # Geometry filter
     if not poly_data or poly_data.GetDataInformation().GetNumberOfCells() == 0:
-        geometry_filter = pv.GeometryFilter(merge_blocks)
+        geometry_filter = pvs.GeometryFilter(merge_blocks)
         poly_data = geometry_filter
         use_normal = 1  # TODO(MZN): workaround
 
@@ -1754,7 +1857,7 @@ def Plot3DOnField(proxy, entity, field_name, timestamp_nb,
 
     if is_data_on_cells(poly_data, field_name):
         # Cell data to point data
-        cell_to_point = pv.CellDatatoPointData(poly_data)
+        cell_to_point = pvs.CellDatatoPointData(poly_data)
         cell_to_point.PassCellData = 1
         source = cell_to_point
 
@@ -1767,7 +1870,7 @@ def Plot3DOnField(proxy, entity, field_name, timestamp_nb,
         source = calc
 
     # Warp by scalar
-    warp_scalar = pv.WarpByScalar(source)
+    warp_scalar = pvs.WarpByScalar(source)
     warp_scalar.Scalars = scalars
     warp_scalar.Normal = normal
     warp_scalar.UseNormal = use_normal
@@ -1783,7 +1886,7 @@ def Plot3DOnField(proxy, entity, field_name, timestamp_nb,
 
     if (is_contour):
         # Contours
-        contour = pv.Contour(warp_scalar)
+        contour = pvs.Contour(warp_scalar)
         contour.PointMergeMethod = "Uniform Binning"
         contour.ContourBy = ['POINTS', field_name]
         scalar_range = get_data_range(proxy, entity,
@@ -1793,7 +1896,7 @@ def Plot3DOnField(proxy, entity, field_name, timestamp_nb,
         source = contour
 
     # Get Plot 3D representation object
-    plot3d = pv.GetRepresentation(source)
+    plot3d = pvs.GetRepresentation(source)
 
     # Get lookup table
     lookup_table = get_lookup_table(field_name, nb_components, vector_mode)
@@ -1841,6 +1944,7 @@ def IsoSurfacesOnField(proxy, entity, field_name, timestamp_nb,
       Iso Surfaces as representation object.
 
     """
+    proxy.UpdatePipeline()
     # We don't need mesh parts with no data on them
     if entity == EntityType.NODE:
         select_cells_with_data(proxy, on_points=[field_name])
@@ -1855,15 +1959,15 @@ def IsoSurfacesOnField(proxy, entity, field_name, timestamp_nb,
     time_value = get_time(proxy, timestamp_nb)
 
     # Set timestamp
-    pv.GetRenderView().ViewTime = time_value
-    pv.UpdatePipeline(time_value, proxy)
+    pvs.GetRenderView().ViewTime = time_value
+    pvs.UpdatePipeline(time_value, proxy)
 
     # Do merge
-    source = pv.MergeBlocks(proxy)
+    source = pvs.MergeBlocks(proxy)
 
     # Transform cell data into point data if necessary
     if is_data_on_cells(proxy, field_name):
-        cell_to_point = pv.CellDatatoPointData(source)
+        cell_to_point = pvs.CellDatatoPointData(source)
         cell_to_point.PassCellData = 1
         source = cell_to_point
 
@@ -1876,7 +1980,7 @@ def IsoSurfacesOnField(proxy, entity, field_name, timestamp_nb,
         source = calc
 
     # Contour filter settings
-    contour = pv.Contour(source)
+    contour = pvs.Contour(source)
     contour.ComputeScalars = 1
     contour.ContourBy = contour_by
 
@@ -1893,7 +1997,7 @@ def IsoSurfacesOnField(proxy, entity, field_name, timestamp_nb,
     contour.Isosurfaces = surfaces
 
     # Get Iso Surfaces representation object
-    isosurfaces = pv.GetRepresentation(contour)
+    isosurfaces = pvs.GetRepresentation(contour)
 
     # Get lookup table
     lookup_table = get_lookup_table(field_name, nb_components, vector_mode)
@@ -1960,11 +2064,14 @@ def GaussPointsOnField(proxy, entity, field_name,
       Gauss Points as representation object.
 
     """
+    proxy.UpdatePipeline()
     # We don't need mesh parts with no data on them
-    if entity == EntityType.NODE:
-        select_cells_with_data(proxy, on_points=[field_name])
-    else:
-        select_cells_with_data(proxy, on_cells=[field_name])
+    on_gauss = select_cells_with_data(proxy, on_gauss=[field_name])
+    if not on_gauss:
+        if entity == EntityType.NODE:
+            select_cells_with_data(proxy, on_points=[field_name])
+        else:
+            select_cells_with_data(proxy, on_cells=[field_name])
 
     # Check vector mode
     nb_components = get_nb_components(proxy, entity, field_name)
@@ -1974,22 +2081,19 @@ def GaussPointsOnField(proxy, entity, field_name,
     time_value = get_time(proxy, timestamp_nb)
 
     # Set timestamp
-    pv.GetRenderView().ViewTime = time_value
+    pvs.GetRenderView().ViewTime = time_value
     proxy.UpdatePipeline(time=time_value)
 
     source = proxy
 
-    # Quadrature point arrays
-    qp_arrays = proxy.QuadraturePointArrays.Available
-
     # If no quadrature point array is passed, use cell centers
-    if field_name in qp_arrays:
-        generate_qp = pv.GenerateQuadraturePoints(source)
-        generate_qp.SelectSourceArray = ['CELLS', 'ELGA_Offset']
+    if on_gauss:
+        generate_qp = pvs.GenerateQuadraturePoints(source)
+        generate_qp.QuadratureSchemeDef = ['CELLS', 'ELGA@0']
         source = generate_qp
     else:
         # Cell centers
-        cell_centers = pv.CellCenters(source)
+        cell_centers = pvs.CellCenters(source)
         cell_centers.VertexCells = 1
         source = cell_centers
 
@@ -2006,7 +2110,7 @@ def GaussPointsOnField(proxy, entity, field_name,
             source = calc
 
         # Warp by vector
-        warp_vector = pv.WarpByVector(source)
+        warp_vector = pvs.WarpByVector(source)
         warp_vector.Vectors = [vector_array]
         if scale_factor is not None:
             warp_vector.ScaleFactor = scale_factor
@@ -2018,7 +2122,7 @@ def GaussPointsOnField(proxy, entity, field_name,
         source = warp_vector
 
     # Get Gauss Points representation object
-    gausspnt = pv.GetRepresentation(source)
+    gausspnt = pvs.GetRepresentation(source)
 
     # Get lookup table
     lookup_table = get_lookup_table(field_name, nb_components, vector_mode)
@@ -2133,29 +2237,26 @@ def GaussPointsOnField1(proxy, entity, field_name,
       Gauss Points as representation object.
 
     """
+    proxy.UpdatePipeline()
+    select_cells_with_data(proxy, on_gauss=[field_name])
+
+    nb_components = get_nb_components(proxy, entity, field_name)
+
     # Get time value
     time_value = get_time(proxy, timestamp_nb)
 
     # Set timestamp
-    pv.GetRenderView().ViewTime = time_value
+    pvs.GetRenderView().ViewTime = time_value
     proxy.UpdatePipeline(time=time_value)
 
     # Create Gauss Points object
-    source = pv.GaussPoints(proxy)
+    source = pvs.GaussPoints(proxy)
     source.UpdatePipeline()
   
     # Get Gauss Points representation object
-    gausspnt = pv.GetRepresentation(source)
+    gausspnt = pvs.GetRepresentation(source)
 
     # Get lookup table
-    entity_data_info = None
-    point_data_info = source.GetPointDataInformation()
-    if field_name in point_data_info.keys():
-        entity_data_info = point_data_info
-    else:
-        entity_data_info = source.GetCellDataInformation()
-    nb_components = entity_data_info[field_name].GetNumberOfComponents()
-    
     lookup_table = get_lookup_table(field_name, nb_components, vector_mode)
 
     # Set field range if necessary
@@ -2258,6 +2359,7 @@ def StreamLinesOnField(proxy, entity, field_name, timestamp_nb,
       Stream Lines as representation object.
 
     """
+    proxy.UpdatePipeline()
     # We don't need mesh parts with no data on them
     if entity == EntityType.NODE:
         select_cells_with_data(proxy, on_points=[field_name])
@@ -2272,15 +2374,15 @@ def StreamLinesOnField(proxy, entity, field_name, timestamp_nb,
     time_value = get_time(proxy, timestamp_nb)
 
     # Set timestamp
-    pv.GetRenderView().ViewTime = time_value
-    pv.UpdatePipeline(time_value, proxy)
+    pvs.GetRenderView().ViewTime = time_value
+    pvs.UpdatePipeline(time_value, proxy)
 
     # Do merge
-    source = pv.MergeBlocks(proxy)
+    source = pvs.MergeBlocks(proxy)
 
     # Cell data to point data
     if is_data_on_cells(proxy, field_name):
-        cell_to_point = pv.CellDatatoPointData(source)
+        cell_to_point = pvs.CellDatatoPointData(source)
         cell_to_point.PassCellData = 1
         cell_to_point.UpdatePipeline()
         source = cell_to_point
@@ -2294,7 +2396,7 @@ def StreamLinesOnField(proxy, entity, field_name, timestamp_nb,
         source = calc
 
     # Stream Tracer
-    stream = pv.StreamTracer(source)
+    stream = pvs.StreamTracer(source)
     stream.SeedType = "Point Source"
     stream.Vectors = ['POINTS', vector_array]
     stream.SeedType = "Point Source"
@@ -2305,7 +2407,7 @@ def StreamLinesOnField(proxy, entity, field_name, timestamp_nb,
     # Get Stream Lines representation object
     if is_empty(stream):
         return None
-    streamlines = pv.GetRepresentation(stream)
+    streamlines = pvs.GetRepresentation(stream)
 
     # Get lookup table
     lookup_table = get_lookup_table(field_name, nb_components, vector_mode)
@@ -2339,69 +2441,73 @@ def MeshOnEntity(proxy, mesh_name, entity):
 
     Arguments:
       proxy -- the pipeline object, containig data
-      mesh_name -- the mesh name
-      entity -- the entity type
+      mesh_name -- the full or short name of mesh field
 
     Returns:
       Submesh as representation object of the given source.
 
     """
-    # Select all cell types
-    select_all_cells(proxy)
-
-    # Get subset of groups on the given entity
-    subset = get_group_names(proxy, mesh_name, entity)
-
-    # Select only groups of the given entity type
-    proxy.Groups = subset
+    proxy.UpdatePipeline()
+    mesh_full_name = None
+    aList = mesh_name.split('/')
+    if len(aList) >= 2:
+        mesh_full_name = mesh_name
+    else:
+        mesh_full_name = find_mesh_full_name(proxy, mesh_name)
+    if not mesh_full_name:
+        raise RuntimeError, "The given mesh name was not found"
+    # Select only the given mesh
+    proxy.AllArrays = []
+    proxy.UpdatePipeline()
+    proxy.AllArrays = [mesh_full_name]
     proxy.UpdatePipeline()
 
     # Get representation object if the submesh is not empty
     prs = None
     if (proxy.GetDataInformation().GetNumberOfPoints() or
         proxy.GetDataInformation().GetNumberOfCells()):
-        prs = pv.GetRepresentation(proxy)
+        prs = pvs.GetRepresentation(proxy)
         prs.ColorArrayName = ''
 
     return prs
 
 
-def MeshOnGroup(proxy, group_name):
+def MeshOnGroup(proxy, extrGroups, group_name):
     """Creates submesh on the group.
 
     Arguments:
       proxy -- the pipeline object, containig data
       group_name -- the full group name
+      extrGroups -- all extracted groups object
 
     Returns:
       Representation object of the given source with single group
       selected.
 
     """
-    # Select all cell types
-    select_all_cells(proxy)
-
-    # Select only the group with the given name
-    one_group = [group_name]
-    proxy.Groups = one_group
     proxy.UpdatePipeline()
+    # Deselect all groups
+    extrGroups.AllGroups = []
+    extrGroups.UpdatePipelineInformation()
+    # Select only the group with the given name
+    extrGroups.AllGroups = [group_name]
+    extrGroups.UpdatePipelineInformation()
 
     # Get representation object if the submesh is not empty
     prs = None
 
     # Check if the group was set
-    if proxy.Groups.GetData() == one_group:
-        group_entity = get_group_entity(group_name)
+    if len(extrGroups.AllGroups) == 1 and \
+       extrGroups.AllGroups[0] == group_name:
         # Check if the submesh is not empty
-        nb_items = 0
-        if group_entity == EntityType.NODE:
-            nb_items = proxy.GetDataInformation().GetNumberOfPoints()
-        elif group_entity == EntityType.CELL:
-            nb_items = proxy.GetDataInformation().GetNumberOfCells()
-
-        if nb_items:
-            prs = pv.GetRepresentation(proxy)
+        nb_points = proxy.GetDataInformation().GetNumberOfPoints()
+        nb_cells = proxy.GetDataInformation().GetNumberOfCells()
+
+        if nb_points or nb_cells:
+#            prs = pvs.GetRepresentation(proxy)
+            prs = pvs.Show()
             prs.ColorArrayName = ''
+            display_only(prs)
 
     return prs
 
@@ -2424,24 +2530,23 @@ def CreatePrsForFile(paravis_instance, file_name, prs_types,
     print "Import " + file_name.split(os.sep)[-1] + "..."
 
     try:
-        paravis_instance.ImportFile(file_name)
-        proxy = pv.GetActiveSource()
+        proxy = pvs.MEDReader(FileName=file_name)
         if proxy is None:
             print "FAILED"
         else:
             proxy.UpdatePipeline()
+            _med_field_sep = proxy.GetProperty("Separator")
             print "OK"
     except:
         print "FAILED"
     else:
         # Get view
-        view = pv.GetRenderView()
+        view = pvs.GetRenderView()
 
         # Create required presentations for the proxy
         CreatePrsForProxy(proxy, view, prs_types,
                           picture_dir, picture_ext)
 
-
 def CreatePrsForProxy(proxy, view, prs_types, picture_dir, picture_ext):
     """Build presentations of the given types for all fields of the proxy.
 
@@ -2456,10 +2561,10 @@ def CreatePrsForProxy(proxy, view, prs_types, picture_dir, picture_ext):
       picture_ext: graphics files extension (determines file type)
 
     """
+    proxy.UpdatePipeline()
     # List of the field names
-    field_names = list(proxy.PointArrays.GetData())
-    nb_on_nodes = len(field_names)
-    field_names.extend(proxy.CellArrays.GetData())
+    fields_info = proxy.GetProperty("FieldsTreeInfo")[::2]
+    print fields_info
 
     # Add path separator to the end of picture path if necessery
     if not picture_dir.endswith(os.sep):
@@ -2467,77 +2572,60 @@ def CreatePrsForProxy(proxy, view, prs_types, picture_dir, picture_ext):
 
     # Mesh Presentation
     if PrsTypeEnum.MESH in prs_types:
-        # Create Mesh presentation. Build all possible submeshes.
-
-        # Remember the current state
-        groups = list(proxy.Groups)
-
         # Iterate on meshes
-        mesh_names = get_mesh_names(proxy)
+        mesh_names = get_mesh_full_names(proxy)
         for mesh_name in mesh_names:
-            # Build mesh on nodes and cells
-            for entity in (EntityType.NODE, EntityType.CELL):
-                entity_name = EntityType.get_name(entity)
-                if if_possible(proxy, mesh_name, entity, PrsTypeEnum.MESH):
-                    print "Creating submesh on " + entity_name + " for '" + mesh_name + "' mesh... "
-                    prs = MeshOnEntity(proxy, mesh_name, entity)
-                    if prs is None:
-                        print "FAILED"
-                        continue
-                    else:
-                        print "OK"
-                    # Construct image file name
-                    pic_name = picture_dir + mesh_name + "_" + entity_name + "." + picture_ext
-
-                    # Show and dump the presentation into a graphics file
-                    process_prs_for_test(prs, view, pic_name, False)
-
-                # Build submesh on all groups of the mesh
-                mesh_groups = get_group_names(proxy, mesh_name,
-                                              entity, wo_nogroups=True)
-                for group in mesh_groups:
-                    print "Creating submesh on group " + group + "... "
-                    prs = MeshOnGroup(proxy, group)
-                    if prs is None:
-                        print "FAILED"
-                        continue
-                    else:
-                        print "OK"
-                    # Construct image file name
-                    pic_name = picture_dir + group.replace('/', '_') + "." + picture_ext
-
-                    # Show and dump the presentation into a graphics file
-                    process_prs_for_test(prs, view, pic_name, False)
-
-        # Restore the state
-        proxy.Groups = groups
-        proxy.UpdatePipeline()
+            # Build mesh field presentation
+            print "Creating submesh for '" + get_field_short_name(mesh_name) + "' mesh... "
+            prs = MeshOnEntity(proxy, mesh_name, None)
+            if prs is None:
+                print "FAILED"
+                continue
+            else:
+                print "OK"
+            # Construct image file name
+            pic_name = picture_dir + get_field_short_name(mesh_name) + "." + picture_ext
+            
+            # Show and dump the presentation into a graphics file
+            process_prs_for_test(prs, view, pic_name, False)
+
+        # Create Mesh presentation. Build all groups.
+        extGrp = pvs.ExtractGroup()
+        extGrp.UpdatePipelineInformation()
+        if if_possible(proxy, None, None, PrsTypeEnum.MESH, extGrp):
+            for group in get_group_names(extGrp):
+                print "Creating submesh on group " + get_group_short_name(group) + "... "
+                prs = MeshOnGroup(proxy, extGrp, group)
+                if prs is None:
+                    print "FAILED"
+                    continue
+                else:
+                    print "OK"
+                # Construct image file name
+                pic_name = picture_dir + get_group_short_name(group) + "." + picture_ext
+                    
+                # Show and dump the presentation into a graphics file
+                process_prs_for_test(prs, view, pic_name, False)
 
     # Presentations on fields
-    for (i, field_name) in enumerate(field_names):
+    for field in fields_info:
+        field_name = get_field_short_name(field)
+        # Ignore mesh presentation
+        if field_name == get_field_mesh_name(field):
+            continue
+        field_entity = get_field_entity(field)
+        # Clear fields selection state
+        proxy.AllArrays = []
+        proxy.UpdatePipeline()
         # Select only the current field:
         # necessary for getting the right timestamps
-        cell_arrays = proxy.CellArrays.GetData()
-        point_arrays = proxy.PointArrays.GetData()
-        field_entity = None
-        if (i >= nb_on_nodes):
-            field_entity = EntityType.CELL
-            proxy.PointArrays.DeselectAll()
-            proxy.CellArrays = [field_name]
-        else:
-            field_entity = EntityType.NODE
-            proxy.CellArrays.DeselectAll()
-            proxy.PointArrays = [field_name]
+        proxy.AllArrays = field
+        proxy.UpdatePipeline()
 
         # Get timestamps
-        proxy.UpdatePipelineInformation()
+        entity_data_info = proxy.GetCellDataInformation()
         timestamps = proxy.TimestepValues.GetData()
 
-        # Restore fields selection state
-        proxy.CellArrays = cell_arrays
-        proxy.PointArrays = point_arrays
-        proxy.UpdatePipelineInformation()
-
         for prs_type in prs_types:
             # Ignore mesh presentation
             if prs_type == PrsTypeEnum.MESH:
@@ -2569,3 +2657,4 @@ def CreatePrsForProxy(proxy, view, prs_types, picture_dir, picture_ext):
 
                     # Show and dump the presentation into a graphics file
                     process_prs_for_test(prs, view, pic_name)
+    return
index 05b78de4aa5e7f4f6b8ef6384a387bb7467a9c0f..5b408786c45a1f79883852f54d47b7b29553616b 100644 (file)
@@ -32,12 +32,15 @@ import warnings
 from math import sqrt, sin, cos, radians
 from string import upper
 
-import pvsimple as pv
+# Do not use pv as a short name.
+# It is a name of function from numpy and may be redefined implicitly by 'from numpy import *' call.
+# import pvsimple as pv
+import pvsimple as pvs
 #try:
 #    # TODO(MZN): to be removed (issue with Point Sprite texture)
 #    #import paravisSM as sm
 #except:
-#    import paraview.simple as pv
+#    import paraview.simple as pvs
 #    import paraview.servermanager as sm
 
 
@@ -195,7 +198,7 @@ def process_prs_for_test(prs, view, picture_name, show_bar=True):
         os.makedirs(pic_dir)
 
     # Save picture
-    pv.WriteImage(file_name, view=view, Magnification=1)
+    pvs.WriteImage(file_name, view=view, Magnification=1)
 
 
 def reset_view(view=None):
@@ -206,7 +209,7 @@ def reset_view(view=None):
 
     """
     if not view:
-        view = pv.GetRenderView()
+        view = pvs.GetRenderView()
 
     # Camera preferences
     view.CameraFocalPoint = [0.0, 0.0, 0.0]
@@ -221,13 +224,13 @@ def reset_view(view=None):
     view.CameraParallelProjection = 1
 
     view.ResetCamera()
-    pv.Render(view=view)
+    pvs.Render(view=view)
 
 
 def hide_all(view, to_remove=False):
     """Hide all representations in the view."""
     if not view:
-        view = pv.GetRenderView()
+        view = pvs.GetRenderView()
 
     rep_list = view.Representations
     for rep in rep_list:
@@ -235,7 +238,7 @@ def hide_all(view, to_remove=False):
             rep.Visibility = 0
         if to_remove:
             view.Representations.remove(rep)
-    pv.Render(view=view)
+    pvs.Render(view=view)
 
 
 def display_only(prs, view=None):
@@ -243,7 +246,7 @@ def display_only(prs, view=None):
     hide_all(view)
     if (hasattr(prs, 'Visibility') and prs.Visibility != 1):
         prs.Visibility = 1
-    pv.Render(view=view)
+    pvs.Render(view=view)
 
 
 def set_visible_lines(xy_prs, lines):
@@ -672,7 +675,7 @@ def get_calc_magnitude(proxy, array_entity, array_name):
     # Transform vector array to scalar array if possible
     nb_components = get_nb_components(proxy, array_entity, array_name)
     if (nb_components > 1):
-        calculator = pv.Calculator(proxy)
+        calculator = pvs.Calculator(proxy)
         attribute_mode = "Point Data"
         if array_entity != EntityType.NODE:
             attribute_mode = "Cell Data"
@@ -705,7 +708,7 @@ def get_add_component_calc(proxy, array_entity, array_name):
 
     nb_components = get_nb_components(proxy, array_entity, array_name)
     if nb_components == 2:
-        calculator = pv.Calculator(proxy)
+        calculator = pvs.Calculator(proxy)
         attribute_mode = "Point Data"
         if array_entity != EntityType.NODE:
             attribute_mode = "Cell Data"
@@ -830,7 +833,7 @@ def extract_groups_for_field(proxy, field_name, field_entity, force=False):
 
     # Extract groups if necessary
     if force or (len(groups_to_extract) < len(initial_groups)):
-        extract_group = pv.ExtractGroup(proxy)
+        extract_group = pvs.ExtractGroup(proxy)
         extract_group.Groups = groups_to_extract
         extract_group.UpdatePipeline()
         source = extract_group
@@ -867,7 +870,7 @@ def add_scalar_bar(field_name, nb_components,
         title = "\n".join([title, vector_mode])
 
     # Create scalar bar
-    scalar_bar = pv.CreateScalarBar(Enabled=1)
+    scalar_bar = pvs.CreateScalarBar(Enabled=1)
     scalar_bar.Orientation = 'Vertical'
     scalar_bar.Title = title
     scalar_bar.LookupTable = lookup_table
@@ -890,7 +893,7 @@ def add_scalar_bar(field_name, nb_components,
     scalar_bar.LabelShadow = 1
 
     # Add the scalar bar to the view
-    pv.GetRenderView().Representations.append(scalar_bar)
+    pvs.GetRenderView().Representations.append(scalar_bar)
 
     # Reassign the current bar
     _current_bar = scalar_bar
@@ -907,7 +910,7 @@ def get_bar():
 
 def get_lookup_table(field_name, nb_components, vector_mode='Magnitude'):
     """Get lookup table for the given field."""
-    lookup_table = pv.GetLookupTableForArray(field_name, nb_components)
+    lookup_table = pvs.GetLookupTableForArray(field_name, nb_components)
 
     if vector_mode == 'Magnitude':
         lookup_table.VectorMode = vector_mode
@@ -1071,15 +1074,15 @@ def ScalarMapOnField(proxy, entity, field_name, timestamp_nb,
     time_value = get_time(proxy, timestamp_nb)
 
     # Set timestamp
-    pv.GetRenderView().ViewTime = time_value
-    pv.UpdatePipeline(time_value, proxy)
+    pvs.GetRenderView().ViewTime = time_value
+    pvs.UpdatePipeline(time_value, proxy)
 
     # Extract only groups with data for the field
     new_proxy = extract_groups_for_field(proxy, field_name, entity,
                                          force=True)
 
     # Get Scalar Map representation object
-    scalarmap = pv.GetRepresentation(new_proxy)
+    scalarmap = pvs.GetRepresentation(new_proxy)
 
     # Get lookup table
     lookup_table = get_lookup_table(field_name, nb_components, vector_mode)
@@ -1139,11 +1142,11 @@ def CutPlanesOnField(proxy, entity, field_name, timestamp_nb,
     time_value = get_time(proxy, timestamp_nb)
 
     # Set timestamp
-    pv.GetRenderView().ViewTime = time_value
-    pv.UpdatePipeline(time_value, proxy)
+    pvs.GetRenderView().ViewTime = time_value
+    pvs.UpdatePipeline(time_value, proxy)
 
     # Create slice filter
-    slice_filter = pv.Slice(proxy)
+    slice_filter = pvs.Slice(proxy)
     slice_filter.SliceType = "Plane"
 
     # Set cut planes normal
@@ -1157,7 +1160,7 @@ def CutPlanesOnField(proxy, entity, field_name, timestamp_nb,
     slice_filter.SliceOffsetValues = positions
 
     # Get Cut Planes representation object
-    cut_planes = pv.GetRepresentation(slice_filter)
+    cut_planes = pvs.GetRepresentation(slice_filter)
 
     # Get lookup table
     lookup_table = get_lookup_table(field_name, nb_components, vector_mode)
@@ -1229,11 +1232,11 @@ def CutLinesOnField(proxy, entity, field_name, timestamp_nb,
     time_value = get_time(proxy, timestamp_nb)
 
     # Set timestamp
-    pv.GetRenderView().ViewTime = time_value
-    pv.UpdatePipeline(time_value, proxy)
+    pvs.GetRenderView().ViewTime = time_value
+    pvs.UpdatePipeline(time_value, proxy)
 
     # Create base plane
-    base_plane = pv.Slice(proxy)
+    base_plane = pvs.Slice(proxy)
     base_plane.SliceType = "Plane"
 
     # Set base plane normal
@@ -1253,7 +1256,7 @@ def CutLinesOnField(proxy, entity, field_name, timestamp_nb,
         base_plane = proxy
 
     # Create cutting planes
-    cut_planes = pv.Slice(base_plane)
+    cut_planes = pvs.Slice(base_plane)
     cut_planes.SliceType = "Plane"
 
     # Set cutting planes normal and get positions
@@ -1279,9 +1282,9 @@ def CutLinesOnField(proxy, entity, field_name, timestamp_nb,
             point2 = [bounds[1], bounds[3], bounds[5]]
 
             # Create plot over line filter
-            pol = pv.PlotOverLine(cut_planes,
+            pol = pvs.PlotOverLine(cut_planes,
                                   Source="High Resolution Line Source")
-            pv.RenameSource('Y' + str(index), pol)
+            pvs.RenameSource('Y' + str(index), pol)
             pol.Source.Point1 = point1
             pol.Source.Point2 = point2
             pol.UpdatePipeline()
@@ -1293,7 +1296,7 @@ def CutLinesOnField(proxy, entity, field_name, timestamp_nb,
     cut_planes.UpdatePipeline()
 
     # Get Cut Lines representation object
-    cut_lines = pv.GetRepresentation(cut_planes)
+    cut_lines = pvs.GetRepresentation(cut_planes)
 
     # Get lookup table
     lookup_table = get_lookup_table(field_name, nb_components, vector_mode)
@@ -1351,17 +1354,17 @@ def CutSegmentOnField(proxy, entity, field_name, timestamp_nb,
     time_value = get_time(proxy, timestamp_nb)
 
     # Set timestamp
-    pv.GetRenderView().ViewTime = time_value
-    pv.UpdatePipeline(time_value, proxy)
+    pvs.GetRenderView().ViewTime = time_value
+    pvs.UpdatePipeline(time_value, proxy)
 
     # Create plot over line filter
-    pol = pv.PlotOverLine(proxy, Source="High Resolution Line Source")
+    pol = pvs.PlotOverLine(proxy, Source="High Resolution Line Source")
     pol.Source.Point1 = point1
     pol.Source.Point2 = point2
     pol.UpdatePipeline()
 
     # Get Cut Segment representation object
-    cut_segment = pv.GetRepresentation(pol)
+    cut_segment = pvs.GetRepresentation(pol)
 
     # Get lookup table
     lookup_table = get_lookup_table(field_name, nb_components, vector_mode)
@@ -1419,8 +1422,8 @@ def VectorsOnField(proxy, entity, field_name, timestamp_nb,
     time_value = get_time(proxy, timestamp_nb)
 
     # Set timestamp
-    pv.GetRenderView().ViewTime = time_value
-    pv.UpdatePipeline(time_value, proxy)
+    pvs.GetRenderView().ViewTime = time_value
+    pvs.UpdatePipeline(time_value, proxy)
 
     # Extract only groups with data for the field
     new_proxy = extract_groups_for_field(proxy, field_name, entity)
@@ -1428,7 +1431,7 @@ def VectorsOnField(proxy, entity, field_name, timestamp_nb,
 
     # Cell centers
     if is_data_on_cells(proxy, field_name):
-        cell_centers = pv.CellCenters(source)
+        cell_centers = pvs.CellCenters(source)
         cell_centers.VertexCells = 1
         source = cell_centers
 
@@ -1440,7 +1443,7 @@ def VectorsOnField(proxy, entity, field_name, timestamp_nb,
         source = calc
 
     # Glyph
-    glyph = pv.Glyph(source)
+    glyph = pvs.Glyph(source)
     glyph.Vectors = vector_array
     glyph.ScaleMode = 'vector'
     glyph.MaskPoints = 0
@@ -1473,7 +1476,7 @@ def VectorsOnField(proxy, entity, field_name, timestamp_nb,
     glyph.UpdatePipeline()
 
     # Get Vectors representation object
-    vectors = pv.GetRepresentation(glyph)
+    vectors = pvs.GetRepresentation(glyph)
 
     # Get lookup table
     lookup_table = get_lookup_table(field_name, nb_components, vector_mode)
@@ -1539,18 +1542,18 @@ def DeformedShapeOnField(proxy, entity, field_name,
     time_value = get_time(proxy, timestamp_nb)
 
     # Set timestamp
-    pv.GetRenderView().ViewTime = time_value
-    pv.UpdatePipeline(time_value, proxy)
+    pvs.GetRenderView().ViewTime = time_value
+    pvs.UpdatePipeline(time_value, proxy)
 
     # Extract only groups with data for the field
     new_proxy = extract_groups_for_field(proxy, field_name, entity)
 
     # Do merge
-    source = pv.MergeBlocks(new_proxy)
+    source = pvs.MergeBlocks(new_proxy)
 
     # Cell data to point data
     if is_data_on_cells(proxy, field_name):
-        cell_to_point = pv.CellDatatoPointData()
+        cell_to_point = pvs.CellDatatoPointData()
         cell_to_point.PassCellData = 1
         source = cell_to_point
 
@@ -1562,7 +1565,7 @@ def DeformedShapeOnField(proxy, entity, field_name,
         source = calc
 
     # Warp by vector
-    warp_vector = pv.WarpByVector(source)
+    warp_vector = pvs.WarpByVector(source)
     warp_vector.Vectors = [vector_array]
     if scale_factor is not None:
         warp_vector.ScaleFactor = scale_factor
@@ -1572,7 +1575,7 @@ def DeformedShapeOnField(proxy, entity, field_name,
         warp_vector.ScaleFactor = def_scale
 
     # Get Deformed Shape representation object
-    defshape = pv.GetRepresentation(warp_vector)
+    defshape = pvs.GetRepresentation(warp_vector)
 
     # Get lookup table
     lookup_table = get_lookup_table(field_name, nb_components, vector_mode)
@@ -1650,8 +1653,8 @@ def DeformedShapeAndScalarMapOnField(proxy, entity, field_name,
     time_value = get_time(proxy, timestamp_nb)
 
     # Set timestamp
-    pv.GetRenderView().ViewTime = time_value
-    pv.UpdatePipeline(time_value, proxy)
+    pvs.GetRenderView().ViewTime = time_value
+    pvs.UpdatePipeline(time_value, proxy)
 
     # Set scalar field by default
     scalar_field_entity = scalar_entity
@@ -1664,11 +1667,11 @@ def DeformedShapeAndScalarMapOnField(proxy, entity, field_name,
     new_proxy = extract_groups_for_field(proxy, field_name, entity)
 
     # Do merge
-    source = pv.MergeBlocks(new_proxy)
+    source = pvs.MergeBlocks(new_proxy)
 
     # Cell data to point data
     if is_data_on_cells(proxy, field_name):
-        cell_to_point = pv.CellDatatoPointData(source)
+        cell_to_point = pvs.CellDatatoPointData(source)
         cell_to_point.PassCellData = 1
         source = cell_to_point
 
@@ -1680,7 +1683,7 @@ def DeformedShapeAndScalarMapOnField(proxy, entity, field_name,
         source = calc
 
     # Warp by vector
-    warp_vector = pv.WarpByVector(source)
+    warp_vector = pvs.WarpByVector(source)
     warp_vector.Vectors = [vector_array]
     if scale_factor is not None:
         warp_vector.ScaleFactor = scale_factor
@@ -1690,7 +1693,7 @@ def DeformedShapeAndScalarMapOnField(proxy, entity, field_name,
         warp_vector.ScaleFactor = def_scale
 
     # Get Defromed Shape And Scalar Map representation object
-    defshapemap = pv.GetRepresentation(warp_vector)
+    defshapemap = pvs.GetRepresentation(warp_vector)
 
     # Get lookup table
     lookup_table = get_lookup_table(scalar_field, nb_components, vector_mode)
@@ -1764,14 +1767,14 @@ def Plot3DOnField(proxy, entity, field_name, timestamp_nb,
     time_value = get_time(proxy, timestamp_nb)
 
     # Set timestamp
-    pv.GetRenderView().ViewTime = time_value
-    pv.UpdatePipeline(time_value, proxy)
+    pvs.GetRenderView().ViewTime = time_value
+    pvs.UpdatePipeline(time_value, proxy)
 
     # Extract only groups with data for the field
     new_proxy = extract_groups_for_field(proxy, field_name, entity)
 
     # Do merge
-    merge_blocks = pv.MergeBlocks(new_proxy)
+    merge_blocks = pvs.MergeBlocks(new_proxy)
     merge_blocks.UpdatePipeline()
 
     poly_data = None
@@ -1791,7 +1794,7 @@ def Plot3DOnField(proxy, entity, field_name, timestamp_nb,
                                            radians(angle1), radians(angle2))
 
         # Create slice filter
-        slice_filter = pv.Slice(merge_blocks)
+        slice_filter = pvs.Slice(merge_blocks)
         slice_filter.SliceType = "Plane"
 
         # Set cutting plane normal
@@ -1813,7 +1816,7 @@ def Plot3DOnField(proxy, entity, field_name, timestamp_nb,
     use_normal = 0
     # Geometry filter
     if not poly_data or poly_data.GetDataInformation().GetNumberOfCells() == 0:
-        geometry_filter = pv.GeometryFilter(merge_blocks)
+        geometry_filter = pvs.GeometryFilter(merge_blocks)
         poly_data = geometry_filter
         use_normal = 1  # TODO(MZN): workaround
 
@@ -1823,7 +1826,7 @@ def Plot3DOnField(proxy, entity, field_name, timestamp_nb,
 
     if is_data_on_cells(poly_data, field_name):
         # Cell data to point data
-        cell_to_point = pv.CellDatatoPointData(poly_data)
+        cell_to_point = pvs.CellDatatoPointData(poly_data)
         cell_to_point.PassCellData = 1
         source = cell_to_point
 
@@ -1836,7 +1839,7 @@ def Plot3DOnField(proxy, entity, field_name, timestamp_nb,
         source = calc
 
     # Warp by scalar
-    warp_scalar = pv.WarpByScalar(source)
+    warp_scalar = pvs.WarpByScalar(source)
     warp_scalar.Scalars = scalars
     warp_scalar.Normal = normal
     warp_scalar.UseNormal = use_normal
@@ -1852,7 +1855,7 @@ def Plot3DOnField(proxy, entity, field_name, timestamp_nb,
 
     if (is_contour):
         # Contours
-        contour = pv.Contour(warp_scalar)
+        contour = pvs.Contour(warp_scalar)
         contour.PointMergeMethod = "Uniform Binning"
         contour.ContourBy = ['POINTS', field_name]
         scalar_range = get_data_range(proxy, entity,
@@ -1862,7 +1865,7 @@ def Plot3DOnField(proxy, entity, field_name, timestamp_nb,
         source = contour
 
     # Get Plot 3D representation object
-    plot3d = pv.GetRepresentation(source)
+    plot3d = pvs.GetRepresentation(source)
 
     # Get lookup table
     lookup_table = get_lookup_table(field_name, nb_components, vector_mode)
@@ -1924,18 +1927,18 @@ def IsoSurfacesOnField(proxy, entity, field_name, timestamp_nb,
     time_value = get_time(proxy, timestamp_nb)
 
     # Set timestamp
-    pv.GetRenderView().ViewTime = time_value
-    pv.UpdatePipeline(time_value, proxy)
+    pvs.GetRenderView().ViewTime = time_value
+    pvs.UpdatePipeline(time_value, proxy)
 
     # Extract only groups with data for the field
     new_proxy = extract_groups_for_field(proxy, field_name, entity)
 
     # Do merge
-    source = pv.MergeBlocks(new_proxy)
+    source = pvs.MergeBlocks(new_proxy)
 
     # Transform cell data into point data if necessary
     if is_data_on_cells(proxy, field_name):
-        cell_to_point = pv.CellDatatoPointData(source)
+        cell_to_point = pvs.CellDatatoPointData(source)
         cell_to_point.PassCellData = 1
         source = cell_to_point
 
@@ -1948,7 +1951,7 @@ def IsoSurfacesOnField(proxy, entity, field_name, timestamp_nb,
         source = calc
 
     # Contour filter settings
-    contour = pv.Contour(source)
+    contour = pvs.Contour(source)
     contour.ComputeScalars = 1
     contour.ContourBy = contour_by
 
@@ -1965,7 +1968,7 @@ def IsoSurfacesOnField(proxy, entity, field_name, timestamp_nb,
     contour.Isosurfaces = surfaces
 
     # Get Iso Surfaces representation object
-    isosurfaces = pv.GetRepresentation(contour)
+    isosurfaces = pvs.GetRepresentation(contour)
 
     # Get lookup table
     lookup_table = get_lookup_table(field_name, nb_components, vector_mode)
@@ -2046,7 +2049,7 @@ def GaussPointsOnField(proxy, entity, field_name,
     time_value = get_time(proxy, timestamp_nb)
 
     # Set timestamp
-    pv.GetRenderView().ViewTime = time_value
+    pvs.GetRenderView().ViewTime = time_value
     proxy.UpdatePipeline(time=time_value)
 
     # Extract only groups with data for the field
@@ -2057,12 +2060,12 @@ def GaussPointsOnField(proxy, entity, field_name,
 
     # If no quadrature point array is passed, use cell centers
     if field_name in qp_arrays:
-        generate_qp = pv.GenerateQuadraturePoints(source)
+        generate_qp = pvs.GenerateQuadraturePoints(source)
         generate_qp.SelectSourceArray = ['CELLS', 'ELGA_Offset']
         source = generate_qp
     else:
         # Cell centers
-        cell_centers = pv.CellCenters(source)
+        cell_centers = pvs.CellCenters(source)
         cell_centers.VertexCells = 1
         source = cell_centers
 
@@ -2079,7 +2082,7 @@ def GaussPointsOnField(proxy, entity, field_name,
             source = calc
 
         # Warp by vector
-        warp_vector = pv.WarpByVector(source)
+        warp_vector = pvs.WarpByVector(source)
         warp_vector.Vectors = [vector_array]
         if scale_factor is not None:
             warp_vector.ScaleFactor = scale_factor
@@ -2091,7 +2094,7 @@ def GaussPointsOnField(proxy, entity, field_name,
         source = warp_vector
 
     # Get Gauss Points representation object
-    gausspnt = pv.GetRepresentation(source)
+    gausspnt = pvs.GetRepresentation(source)
 
     # Get lookup table
     lookup_table = get_lookup_table(field_name, nb_components, vector_mode)
@@ -2210,15 +2213,15 @@ def GaussPointsOnField1(proxy, entity, field_name,
     time_value = get_time(proxy, timestamp_nb)
 
     # Set timestamp
-    pv.GetRenderView().ViewTime = time_value
+    pvs.GetRenderView().ViewTime = time_value
     proxy.UpdatePipeline(time=time_value)
 
     # Create Gauss Points object
-    source = pv.GaussPoints(proxy)
+    source = pvs.GaussPoints(proxy)
     source.UpdatePipeline()
   
     # Get Gauss Points representation object
-    gausspnt = pv.GetRepresentation(source)
+    gausspnt = pvs.GetRepresentation(source)
 
     # Get lookup table
     entity_data_info = None
@@ -2345,18 +2348,18 @@ def StreamLinesOnField(proxy, entity, field_name, timestamp_nb,
     time_value = get_time(proxy, timestamp_nb)
 
     # Set timestamp
-    pv.GetRenderView().ViewTime = time_value
-    pv.UpdatePipeline(time_value, proxy)
+    pvs.GetRenderView().ViewTime = time_value
+    pvs.UpdatePipeline(time_value, proxy)
 
     # Extract only groups with data for the field
     new_proxy = extract_groups_for_field(proxy, field_name, entity)
 
     # Do merge
-    source = pv.MergeBlocks(new_proxy)
+    source = pvs.MergeBlocks(new_proxy)
 
     # Cell data to point data
     if is_data_on_cells(proxy, field_name):
-        cell_to_point = pv.CellDatatoPointData(source)
+        cell_to_point = pvs.CellDatatoPointData(source)
         cell_to_point.PassCellData = 1
         cell_to_point.UpdatePipeline()
         source = cell_to_point
@@ -2370,7 +2373,7 @@ def StreamLinesOnField(proxy, entity, field_name, timestamp_nb,
         source = calc
 
     # Stream Tracer
-    stream = pv.StreamTracer(source)
+    stream = pvs.StreamTracer(source)
     stream.SeedType = "Point Source"
     stream.Vectors = ['POINTS', vector_array]
     stream.SeedType = "Point Source"
@@ -2381,7 +2384,7 @@ def StreamLinesOnField(proxy, entity, field_name, timestamp_nb,
     # Get Stream Lines representation object
     if is_empty(stream):
         return None
-    streamlines = pv.GetRepresentation(stream)
+    streamlines = pvs.GetRepresentation(stream)
 
     # Get lookup table
     lookup_table = get_lookup_table(field_name, nb_components, vector_mode)
@@ -2436,7 +2439,7 @@ def MeshOnEntity(proxy, mesh_name, entity):
     prs = None
     if (proxy.GetDataInformation().GetNumberOfPoints() or
         proxy.GetDataInformation().GetNumberOfCells()):
-        prs = pv.GetRepresentation(proxy)
+        prs = pvs.GetRepresentation(proxy)
         prs.ColorArrayName = ''
 
     return prs
@@ -2476,7 +2479,7 @@ def MeshOnGroup(proxy, group_name):
             nb_items = proxy.GetDataInformation().GetNumberOfCells()
 
         if nb_items:
-            prs = pv.GetRepresentation(proxy)
+            prs = pvs.GetRepresentation(proxy)
             prs.ColorArrayName = ''
 
     return prs
@@ -2501,7 +2504,7 @@ def CreatePrsForFile(paravis_instance, file_name, prs_types,
 
     try:
         paravis_instance.ImportFile(file_name)
-        proxy = pv.GetActiveSource()
+        proxy = pvs.GetActiveSource()
         if proxy is None:
             print "FAILED"
         else:
@@ -2511,7 +2514,7 @@ def CreatePrsForFile(paravis_instance, file_name, prs_types,
         print "FAILED"
     else:
         # Get view
-        view = pv.GetRenderView()
+        view = pvs.GetRenderView()
 
         # Create required presentations for the proxy
         CreatePrsForProxy(proxy, view, prs_types,
index 299f1cd39a3ccfe921abc1c88a6f01511eac71c1..130e508d3a35238be80fdb08f516ead50b24739b 100644 (file)
@@ -75,8 +75,14 @@ INCLUDE(SalomeSetupPlatform)
 INCLUDE(SalomeMEDConfig)
 FIND_PACKAGE(SalomePython REQUIRED)
 FIND_PACKAGE(SalomeHDF5 REQUIRED)
+FIND_PACKAGE(SalomeMED REQUIRED)
 FIND_PACKAGE(SalomeMEDFile REQUIRED)
 
+# Accumulate environment variables for PARAVIS module
+SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_BINS}
+                                                 ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON})
+SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS}) 
+
 #
 # process all vtk-modules defined in this plugin. This generates the necessary
 # wrappings for all these modules as well.
index a4cd1886c20df81f29619240b93fdb3a7c2d5b1c..c83bdff80f792f42cfa9409262672fd2885eadfb 100644 (file)
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env)
 ADD_TEST(testMEDReader0 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMEDReader0.py)
+SET_TESTS_PROPERTIES(testMEDReader0 PROPERTIES ENVIRONMENT "${tests_env}")
 ADD_TEST(testMEDReader1 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMEDReader1.py)
+SET_TESTS_PROPERTIES(testMEDReader1 PROPERTIES ENVIRONMENT "${tests_env}")
 ADD_TEST(testMEDReader2 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMEDReader2.py)
+SET_TESTS_PROPERTIES(testMEDReader2 PROPERTIES ENVIRONMENT "${tests_env}")
 ADD_TEST(testMEDReader3 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMEDReader3.py)
+SET_TESTS_PROPERTIES(testMEDReader3 PROPERTIES ENVIRONMENT "${tests_env}")
 ADD_TEST(testMEDReader4 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMEDReader4.py)
+SET_TESTS_PROPERTIES(testMEDReader4 PROPERTIES ENVIRONMENT "${tests_env}")
 ADD_TEST(testMEDReader5 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMEDReader5.py)
+SET_TESTS_PROPERTIES(testMEDReader5 PROPERTIES ENVIRONMENT "${tests_env}")
 ADD_TEST(testMEDReader6 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMEDReader6.py)
+SET_TESTS_PROPERTIES(testMEDReader6 PROPERTIES ENVIRONMENT "${tests_env}")
 ADD_TEST(testMEDReader7 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMEDReader7.py)
+SET_TESTS_PROPERTIES(testMEDReader7 PROPERTIES ENVIRONMENT "${tests_env}")
 ADD_TEST(testMEDReader8 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMEDReader8.py)
+SET_TESTS_PROPERTIES(testMEDReader8 PROPERTIES ENVIRONMENT "${tests_env}")
 ADD_TEST(testMEDReader9 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMEDReader9.py)
+SET_TESTS_PROPERTIES(testMEDReader9 PROPERTIES ENVIRONMENT "${tests_env}")
index adeebd65315ae64464e0b2e2a9b8cc68d0862b1f..c7c1100ec3ba914c3681c2c1a150d6d3cf8f781a 100755 (executable)
@@ -37,11 +37,6 @@ aXYPlot.ChartTitle = 'title of XY plot'
 print "Chart title for xyplot ...", aXYPlot.ChartTitle
 
 error = 0
-try:
-    aXYPlot.ShowAxis = [1, 1, 0, 0]
-except:
-    print "Error: ShowAxis property is not avaliable for XYPlotView"
-    error = error + 1
 
 aXYPlot.AxisUseCustomRange = [1, 1, 0, 0]
 
index a22d0903f6daee800ac84a5f164941655c4ecb91..9a4004a471f747926e53758a2b9bc8f9b02b1f8e 100755 (executable)
@@ -48,13 +48,6 @@ Ranges=aXYPlot.LeftAxisRange
 error = error + test_values(Ranges, Etvalue[0:2])
 Ranges=aXYPlot.BottomAxisRange
 error = error + test_values(Ranges, Etvalue[2:4])
-
-try:
-    aXYPlot.ShowAxis = [1, 1, 1, 1]
-except:
-    print "Error: ShowAxis property is not avaliable for XYPlotView"
-    error = error + 1
-
 aXYPlot.AxisUseCustomRange = [1, 1, 1, 1]
 # Left, bottom, right and top axis range
 aXYPlot.LeftAxisRange = [0, 200]
index fe15dc5dabca4186bfad09c4b10c497acce1de81..3591563f7935f9f60565f33862fcddbc12d21882 100644 (file)
@@ -68,7 +68,7 @@ field_name = 'VITESSE'
 my_view = GetRenderView()
 
 print "\nCreating plot3d.......",
-plot3d = Plot3DOnField(proxy, EntityType.CELL, field_name, 1)
+plot3d = Plot3DOnField(proxy, EntityType.NODE, field_name, 1)
 if plot3d is None:
     raise RuntimeError("Error!!! Presentation wasn't created...")
 
index 6fb1a7525a836a1fe82ffd0f5de9eb2165432ae0..447cda5aa5b4185b1cd31096003d1c225e85fecb 100644 (file)
@@ -62,7 +62,7 @@ opacities = [1.0, 0.5, 0.0]
 linewidths = [1.0, 3.0, 10.0]
 compare_prec = 0.00001
 
-field_name = 'vectoriel_field'
+field_name = 'vectoriel field'
 
 print "\nCreating Vectors.......",
 vectors = VectorsOnField(proxy, EntityType.CELL, field_name, 1,
index 8a3bfb4f7b51443c22d04e69d7b2c7a4c01d113d..1dbceb50b135bc61ae96a6086c2a27ae6b9a34df 100644 (file)
@@ -62,7 +62,7 @@ opacities = [1.0, 0.5, 0.0]
 linewidths = [1.0, 3.0, 10.0]
 compare_prec = 0.00001
 
-field_name = 'vectoriel_field'
+field_name = 'vectoriel field'
 
 print "\nCreating stream_lines......."
 stream_lines = StreamLinesOnField(proxy, EntityType.CELL,
index e916b807dabf7a70152b966a2819f1b6fe66e52f..59fe120b31a042bb8e64c6254dc3bfc42f0b1082 100644 (file)
@@ -61,7 +61,7 @@ opacities = [1.0, 0.5, 0.0]
 linewidths = [1.0, 3.0, 10.0]
 compare_prec = 0.00001
 
-field_name = 'scalar_field'
+field_name = 'scalar field'
 
 print "\nCreating cut planes.......",
 cut_planes = CutPlanesOnField(proxy, EntityType.CELL, field_name, 1,
index c24d2b840344a67d5e63fb691460611efebf7739..a6e19b9f9550fd4c734b2cbc39fd43ef590d0a07 100644 (file)
@@ -61,7 +61,7 @@ opacities = [1.0, 0.5, 0.0]
 linewidths = [1.0, 3.0, 10.0]
 compare_prec = 0.00001
 
-field_name = 'scalar_field'
+field_name = 'scalar field'
 
 print "\nCreating cut lines.......",
 cut_lines = CutLinesOnField(proxy, EntityType.CELL, field_name, 1,
index ccedd8801516edb84310bccccbf791f6456878f3..100e89eb91cbc01efd3bf213d22cf95c40d1a043 100644 (file)
@@ -67,7 +67,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...")
 
old mode 100755 (executable)
new mode 100644 (file)
index 67e2824..b9d86fc
@@ -64,9 +64,10 @@ if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # Select only the current field:
-aProxy.CellArrays.DeselectAll()
-aProxy.PointArrays.DeselectAll()
-aProxy.PointArrays = ['vitesse']
+aProxy.AllArrays = []
+aProxy.UpdatePipeline()
+aProxy.AllArrays = ['TS0/dom/ComSup0/vitesse@@][@@P1']
+aProxy.UpdatePipeline()
    
 # Animation creation and saving into set of files into picturedir
 scene = AnimateReader(aProxy,aView,picturedir+"A0_dom."+my_format)
old mode 100755 (executable)
new mode 100644 (file)
index cc0ec9b..571d89e
@@ -64,9 +64,10 @@ if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # Select only the current field:
-aProxy.PointArrays.DeselectAll()
-aProxy.CellArrays.DeselectAll()
-aProxy.CellArrays = ['pression']
+aProxy.AllArrays = []
+aProxy.UpdatePipeline()
+aProxy.AllArrays = ['TS0/dom/ComSup0/pression@@][@@P0']
+aProxy.UpdatePipeline()
    
 # Animation creation and saving into set of files into picturedir
 scene = AnimateReader(aProxy,aView,picturedir+"A2_dom."+my_format)
index cbf6b6777de857c17be3b11e444354942bb7e7f6..e225c4a7575688d15ce40bfb6a692dc9e024cdf3 100644 (file)
@@ -64,9 +64,10 @@ if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # Select only the current field:
-aProxy.PointArrays.DeselectAll()
-aProxy.CellArrays.DeselectAll()
-aProxy.CellArrays = ['pression']
+aProxy.AllArrays = []
+aProxy.UpdatePipeline()
+aProxy.AllArrays = ['TS0/dom/ComSup0/pression@@][@@P0']
+aProxy.UpdatePipeline()
    
 # Animation creation and saving into set of files into picturedir
 scene = AnimateReader(aProxy,aView,picturedir+"A4_dom."+my_format)
index 0bdbac0f8c9579542f64baa66dc37ab8eee2612a..bbd6a384000abdacbafc6de15bccb1c4ad9f2931 100644 (file)
@@ -64,9 +64,10 @@ if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # Select only the current field:
-aProxy.PointArrays.DeselectAll()
-aProxy.CellArrays.DeselectAll()
-aProxy.CellArrays = ['pression']
+aProxy.AllArrays = []
+aProxy.UpdatePipeline()
+aProxy.AllArrays = ['TS0/dom/ComSup0/pression@@][@@P0']
+aProxy.UpdatePipeline()
    
 # Animation creation and saving into set of files into picturedir
 scene = AnimateReader(aProxy,aView,picturedir+"A7_dom."+my_format)
index 4cf32b0c9a27b797a0abb136a23c6b51fe3831fc..49446b13b0ddf68593d4489865df0d3a4bb745f4 100644 (file)
@@ -64,9 +64,10 @@ if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # Select only the current field:
-aProxy.PointArrays.DeselectAll()
-aProxy.CellArrays.DeselectAll()
-aProxy.CellArrays = ['pression']
+aProxy.AllArrays = []
+aProxy.UpdatePipeline()
+aProxy.AllArrays = ['TS0/dom/ComSup0/pression@@][@@P0']
+aProxy.UpdatePipeline()
    
 # Animation creation and saving into set of files into picturedir
 scene = AnimateReader(aProxy,aView,picturedir+"A8_dom."+my_format)
index 13544de8d835bb13c0e41b1dfddf980d18c56964..19d522858dd65466202fcb43d23f7b853b2c648d 100644 (file)
@@ -64,9 +64,10 @@ if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # Select only the current field:
-aProxy.PointArrays.DeselectAll()
-aProxy.CellArrays.DeselectAll()
-aProxy.CellArrays = ['pression']
+aProxy.AllArrays = []
+aProxy.UpdatePipeline()
+aProxy.AllArrays = ['TS0/dom/ComSup0/pression@@][@@P0']
+aProxy.UpdatePipeline()
    
 # Animation creation and saving into set of files into picturedir
 scene = AnimateReader(aProxy,aView,picturedir+"B2_dom."+my_format)
index 5256fd64a625a5d5924944f1949711367a789c0f..7848081ddec7c43a1a7a386a7cdcc45cad4ccf2f 100644 (file)
@@ -64,9 +64,10 @@ if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # Select only the current field:
-aProxy.PointArrays.DeselectAll()
-aProxy.CellArrays.DeselectAll()
-aProxy.CellArrays = ['pression']
+aProxy.AllArrays = []
+aProxy.UpdatePipeline()
+aProxy.AllArrays = ['TS0/dom/ComSup0/pression@@][@@P0']
+aProxy.UpdatePipeline()
    
 # Animation creation and saving into set of files into picturedir
 scene = AnimateReader(aProxy,aView,picturedir+"B5_dom."+my_format)
index d5d9f394c713f2091d54752dd7a2060c876acefd..6669ef320afe639a390d82600577e07073f50925 100644 (file)
@@ -64,9 +64,10 @@ if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # Select only the current field:
-aProxy.PointArrays.DeselectAll()
-aProxy.CellArrays.DeselectAll()
-aProxy.CellArrays = ['pression']
+aProxy.AllArrays = []
+aProxy.UpdatePipeline()
+aProxy.AllArrays = ['TS0/dom/ComSup0/pression@@][@@P0']
+aProxy.UpdatePipeline()
    
 # Animation creation and saving into set of files into picturedir
 scene = AnimateReader(aProxy,aView,picturedir+"B6_dom."+my_format)
index 08319fd80fc5f795911a19304aab94ca511198d9..9672ccbe08078d059e859ed03802f3f1dbd0a84f 100644 (file)
@@ -64,9 +64,10 @@ if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # Select only the current field:
-aProxy.CellArrays.DeselectAll()
-aProxy.PointArrays.DeselectAll()
-aProxy.PointArrays = ['vitesse']
+aProxy.AllArrays = []
+aProxy.UpdatePipeline()
+aProxy.AllArrays = ['TS0/dom/ComSup0/vitesse@@][@@P1']
+aProxy.UpdatePipeline()
    
 # Animation creation and saving into set of files into picturedir
 scene = AnimateReader(aProxy,aView,picturedir+"C0_dom."+my_format)
index d49247989568587e7baaf88dae91cb6ae6fd6849..23d705a7e13a084e9d734652cfa46adde2896d0e 100644 (file)
@@ -64,9 +64,10 @@ if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # Select only the current field:
-aProxy.CellArrays.DeselectAll()
-aProxy.PointArrays.DeselectAll()
-aProxy.PointArrays = ['vitesse']
+aProxy.AllArrays = []
+aProxy.UpdatePipeline()
+aProxy.AllArrays = ['TS0/dom/ComSup0/vitesse@@][@@P1']
+aProxy.UpdatePipeline()
    
 # Animation creation and saving into set of files into picturedir
 scene = AnimateReader(aProxy,aView,picturedir+"C1_dom."+my_format)
index 2cf5b1d5d91bbb13d7627feab17814805edc7667..d852469691b367db14df14500c5e72ac9f3bc866 100644 (file)
@@ -64,9 +64,10 @@ if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # Select only the current field:
-aProxy.CellArrays.DeselectAll()
-aProxy.PointArrays.DeselectAll()
-aProxy.PointArrays = ['vitesse']
+aProxy.AllArrays = []
+aProxy.UpdatePipeline()
+aProxy.AllArrays = ['TS0/dom/ComSup0/vitesse@@][@@P1']
+aProxy.UpdatePipeline()
    
 # Animation creation and saving into set of files into picturedir
 scene = AnimateReader(aProxy,aView,picturedir+"C3_dom."+my_format)
index f3952134561482c4bc7b4820f2cc76b3741d1bd8..84e1229824a12992a6d4107a3c2c940f2dba0a89 100644 (file)
@@ -64,9 +64,10 @@ if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # Select only the current field:
-aProxy.PointArrays.DeselectAll()
-aProxy.CellArrays.DeselectAll()
-aProxy.CellArrays = ['pression']
+aProxy.AllArrays = []
+aProxy.UpdatePipeline()
+aProxy.AllArrays = ['TS0/dom/ComSup0/pression@@][@@P0']
+aProxy.UpdatePipeline()
    
 # Animation creation and saving into set of files into picturedir
 scene = AnimateReader(aProxy,aView,picturedir+"C8_dom."+my_format)
index 13b4455aaeb915df62d81977e80cbb3cb92576f8..3775150124b797fd83817160bde4580b3c126bfc 100644 (file)
@@ -65,9 +65,10 @@ if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # Select only the current field:
-aProxy.PointArrays.DeselectAll()
-aProxy.CellArrays.DeselectAll()
-aProxy.CellArrays = ['pression']
+aProxy.AllArrays = []
+aProxy.UpdatePipeline()
+aProxy.AllArrays = ['TS0/dom/ComSup0/pression@@][@@P0']
+aProxy.UpdatePipeline()
    
 # Animation creation and saving into set of files into picturedir
 scene = AnimateReader(aProxy,aView,picturedir+"D1_dom."+my_format)
index a9e569f64dfa7ee81a67c627d1ba95f9cc76399c..2479645f73d9998d3ee10531b52c1bd65bf001ce 100644 (file)
@@ -64,9 +64,10 @@ if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # Select only the current field:
-aProxy.PointArrays.DeselectAll()
-aProxy.CellArrays.DeselectAll()
-aProxy.CellArrays = ['pression']
+aProxy.AllArrays = []
+aProxy.UpdatePipeline()
+aProxy.AllArrays = ['TS0/dom/ComSup0/pression@@][@@P0']
+aProxy.UpdatePipeline()
    
 # Animation creation and saving into set of files into picturedir
 scene = AnimateReader(aProxy,aView,picturedir+"D2_dom."+my_format)
index 21530cecfd9a7b16ed689edc2a359034c7aa8c93..1f60370065f1de96190121e28161c9b6483e9a74 100644 (file)
@@ -64,9 +64,10 @@ if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # Select only the current field:
-aProxy.PointArrays.DeselectAll()
-aProxy.CellArrays.DeselectAll()
-aProxy.CellArrays = ['pression']
+aProxy.AllArrays = []
+aProxy.UpdatePipeline()
+aProxy.AllArrays = ['TS0/dom/ComSup0/pression@@][@@P0']
+aProxy.UpdatePipeline()
    
 # Animation creation and saving into set of files into picturedir
 scene = AnimateReader(aProxy,aView,picturedir+"D6_dom."+my_format)
index bb697b522ddbd3f268a4998201a8bb8f330a3b7e..eb0b8520b0bdc99f91be8ca4db0d568787b0df50 100644 (file)
@@ -64,9 +64,10 @@ if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # Select only the current field:
-aProxy.PointArrays.DeselectAll()
-aProxy.CellArrays.DeselectAll()
-aProxy.CellArrays = ['pression']
+aProxy.AllArrays = []
+aProxy.UpdatePipeline()
+aProxy.AllArrays = ['TS0/dom/ComSup0/pression@@][@@P0']
+aProxy.UpdatePipeline()
    
 # Animation creation and saving into set of files into picturedir
 scene = AnimateReader(aProxy,aView,picturedir+"D9_dom."+my_format)
index 10e04ae04bd1c8e7da31dd94c58ad026042cfe1a..0e38aa50d89dafdf43b2a0e8b2b1ae2219dc08dd 100644 (file)
@@ -64,9 +64,10 @@ if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # Select only the current field:
-aProxy.PointArrays.DeselectAll()
-aProxy.CellArrays.DeselectAll()
-aProxy.CellArrays = ['pression']
+aProxy.AllArrays = []
+aProxy.UpdatePipeline()
+aProxy.AllArrays = ['TS0/dom/ComSup0/pression@@][@@P0']
+aProxy.UpdatePipeline()
    
 # Animation creation and saving into set of files into picturedir
 scene = AnimateReader(aProxy,aView,picturedir+"E0_dom."+my_format)
index 183bfbb23fedffa3d92463a384da8ba86da5a8eb..5c054144cac542ab60b45b09899da0a98d5517ed 100644 (file)
@@ -64,9 +64,10 @@ if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # Select only the current field:
-aProxy.PointArrays.DeselectAll()
-aProxy.CellArrays.DeselectAll()
-aProxy.CellArrays = ['pression']
+aProxy.AllArrays = []
+aProxy.UpdatePipeline()
+aProxy.AllArrays = ['TS0/dom/ComSup0/pression@@][@@P0']
+aProxy.UpdatePipeline()
    
 # Animation creation and saving into set of files into picturedir
 scene = AnimateReader(aProxy,aView,picturedir+"E4_dom."+my_format)
index 8c81f06d73f96cd034ce03049be09f771b49c57c..df418febe1458422e535ba9e97f403df5da34a05 100644 (file)
@@ -64,9 +64,10 @@ if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # Select only the current field:
-aProxy.PointArrays.DeselectAll()
-aProxy.CellArrays.DeselectAll()
-aProxy.CellArrays = ['pression']
+aProxy.AllArrays = []
+aProxy.UpdatePipeline()
+aProxy.AllArrays = ['TS0/dom/ComSup0/pression@@][@@P0']
+aProxy.UpdatePipeline()
    
 # Animation creation and saving into set of files into picturedir
 scene = AnimateReader(aProxy,aView,picturedir+"E8_dom."+my_format)
index 5c3d72cb72c71af760adb66e7302105550f66faa..4771691ca6e59d80ae51a0e820e3203815a1b037 100644 (file)
@@ -64,9 +64,10 @@ if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # Select only the current field:
-aProxy.CellArrays.DeselectAll()
-aProxy.PointArrays.DeselectAll()
-aProxy.PointArrays = ['vitesse']
+aProxy.AllArrays = []
+aProxy.UpdatePipeline()
+aProxy.AllArrays = ['TS0/dom/ComSup0/vitesse@@][@@P1']
+aProxy.UpdatePipeline()
    
 # Animation creation and saving into set of files into picturedir
 scene = AnimateReader(aProxy,aView,picturedir+"F2_dom."+my_format)
index bc00632469d0f64746c516bbcfa4702c2cecfeb5..d6796f393cd8b122d3e0d82c4d6bdd2d1bbf5fa2 100644 (file)
@@ -64,9 +64,10 @@ if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # Select only the current field:
-aProxy.CellArrays.DeselectAll()
-aProxy.PointArrays.DeselectAll()
-aProxy.PointArrays = ['vitesse']
+aProxy.AllArrays = []
+aProxy.UpdatePipeline()
+aProxy.AllArrays = ['TS0/dom/ComSup0/vitesse@@][@@P1']
+aProxy.UpdatePipeline()
    
 # Animation creation and saving into set of files into picturedir
 scene = AnimateReader(aProxy,aView,picturedir+"F5_dom."+my_format)
index 95c5c8e8f47d14c8b7ac661144dfd22878ec2e59..fcfdf1b6af600fd2c6d72cba3fe7ffda92184262 100644 (file)
@@ -64,9 +64,10 @@ if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # Select only the current field:
-aProxy.CellArrays.DeselectAll()
-aProxy.PointArrays.DeselectAll()
-aProxy.PointArrays = ['vitesse']
+aProxy.AllArrays = []
+aProxy.UpdatePipeline()
+aProxy.AllArrays = ['TS0/dom/ComSup0/vitesse@@][@@P1']
+aProxy.UpdatePipeline()
    
 # Animation creation and saving into set of files into picturedir
 scene = AnimateReader(aProxy,aView,picturedir+"F6_dom."+my_format)
index e880c69c2310e296809c6d37a027aaedf0ac5eb4..558b2d1b0fdb98b0537bb0889ae1b3d980fecec0 100644 (file)
@@ -64,9 +64,10 @@ if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # Select only the current field:
-aProxy.CellArrays.DeselectAll()
-aProxy.PointArrays.DeselectAll()
-aProxy.PointArrays = ['vitesse']
+aProxy.AllArrays = []
+aProxy.UpdatePipeline()
+aProxy.AllArrays = ['TS0/dom/ComSup0/vitesse@@][@@P1']
+aProxy.UpdatePipeline()
    
 # Animation creation and saving into set of files into picturedir
 scene = AnimateReader(aProxy,aView,picturedir+"G0_dom."+my_format)
index df5db2e64d163f3522f421a5dd7c02bd9e077111..6601e1e366add447ee9cd11b6940a066c8aa82aa 100644 (file)
@@ -65,9 +65,10 @@ if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # Select only the current field:
-aProxy.CellArrays.DeselectAll()
-aProxy.PointArrays.DeselectAll()
-aProxy.PointArrays = ['vitesse']
+aProxy.AllArrays = []
+aProxy.UpdatePipeline()
+aProxy.AllArrays = ['TS0/dom/ComSup0/vitesse@@][@@P1']
+aProxy.UpdatePipeline()
    
 # Animation creation and saving into set of files into picturedir
 scene = AnimateReader(aProxy,aView,picturedir+"G3_dom."+my_format)
index 1041c75e245b77d452a7a3ca6dd40f3166b996f4..5dd00d9c0dee8f153248f5129f4c2d2aa8861edc 100644 (file)
@@ -65,9 +65,10 @@ if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # Select only the current field:
-aProxy.CellArrays.DeselectAll()
-aProxy.PointArrays.DeselectAll()
-aProxy.PointArrays = ['vitesse']
+aProxy.AllArrays = []
+aProxy.UpdatePipeline()
+aProxy.AllArrays = ['TS0/dom/ComSup0/vitesse@@][@@P1']
+aProxy.UpdatePipeline()
    
 # Animation creation and saving into set of files into picturedir
 scene = AnimateReader(aProxy,aView,picturedir+"G3_dom."+my_format)
index 3314fbebb46063fa47eb805e03b19970edd8f881..f84f44bf002857837e4026356f8d7ae0720a6e31 100644 (file)
@@ -64,9 +64,10 @@ if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # Select only the current field:
-aProxy.CellArrays.DeselectAll()
-aProxy.PointArrays.DeselectAll()
-aProxy.PointArrays = ['vitesse']
+aProxy.AllArrays = []
+aProxy.UpdatePipeline()
+aProxy.AllArrays = ['TS0/dom/ComSup0/vitesse@@][@@P1']
+aProxy.UpdatePipeline()
    
 # Animation creation and saving into set of files into picturedir
 scene = AnimateReader(aProxy,aView,picturedir+"G8_dom."+my_format)
index cda57079d0dd3950d20f05f17a2f235a74b20033..ce812a4a93abb3aea3cc9cbe4f706612d2d57856 100644 (file)
@@ -64,9 +64,10 @@ if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # Select only the current field:
-aProxy.CellArrays.DeselectAll()
-aProxy.PointArrays.DeselectAll()
-aProxy.PointArrays = ['vitesse']
+aProxy.AllArrays = []
+aProxy.UpdatePipeline()
+aProxy.AllArrays = ['TS0/dom/ComSup0/vitesse@@][@@P1']
+aProxy.UpdatePipeline()
    
 # Animation creation and saving into set of files into picturedir
 scene = AnimateReader(aProxy,aView,picturedir+"H1_dom."+my_format)
index 42174cea2a9225cb72a0441c013e33a4eb95b8ca..8cf81bc921efd1f4cb68a0126b389663a43b6ba9 100644 (file)
@@ -64,9 +64,10 @@ if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # Select only the current field:
-aProxy.CellArrays.DeselectAll()
-aProxy.PointArrays.DeselectAll()
-aProxy.PointArrays = ['vitesse']
+aProxy.AllArrays = []
+aProxy.UpdatePipeline()
+aProxy.AllArrays = ['TS0/dom/ComSup0/vitesse@@][@@P1']
+aProxy.UpdatePipeline()
    
 # Animation creation and saving into set of files into picturedir
 scene = AnimateReader(aProxy,aView,picturedir+"H2_dom."+my_format)
index ebcff0e1f94445f7e1c9b18ace927cebf35ba2e1..417334f9bc4bd1980217d0fd636ffbebe7b8bc8f 100644 (file)
@@ -47,12 +47,8 @@ aView = GetRenderView()
 
 # Create required presentations for the proxy
 # CreatePrsForProxy(aProxy, aView, thePrsTypeList, thePictureDir, thePictureExt, theIsAutoDelete)
-aFieldNames = aProxy.PointArrays.GetData()
-aNbOnNodes = len(aFieldNames)
-aFieldNames.extend(aProxy.CellArrays.GetData())
-aTimeStamps = aProxy.TimestepValues.GetData()
 aFieldEntity = EntityType.NODE
-aFieldName = "MODES_DEPL"
+aFieldName = "MODES___DEPL____________________"
 
 #create Cut Lines presentations for 10 timestamps
 for i in range(1,11):
index cda530327efd3d3f7ccbaaed4aeb707136e5e1bc..c1aafd71008fca0af45bc2ad8c11a9ebd7e06f84 100644 (file)
@@ -47,12 +47,8 @@ aView = GetRenderView()
 
 # Create required presentations for the proxy
 # CreatePrsForProxy(aProxy, aView, thePrsTypeList, thePictureDir, thePictureExt, theIsAutoDelete)
-aFieldNames = aProxy.PointArrays.GetData()
-aNbOnNodes = len(aFieldNames)
-aFieldNames.extend(aProxy.CellArrays.GetData())
-aTimeStamps = aProxy.TimestepValues.GetData()
 aFieldEntity = EntityType.NODE
-aFieldName = "MODES_DEPL"
+aFieldName = "MODES___DEPL____________________"
 
 #create Cut Planes presentations for 10 timestamps
 for i in range(1,11):
index 508a766ee4a9fd8409f9957ec4874d5e8c13fa62..03a0bd5709bfb99a1a3af477c5306f5932b93121 100755 (executable)
@@ -47,7 +47,7 @@ print "**** Stage2: Creating Deformed Shape"
 print "Creating Deformed Shape...............",
 
 cell_entity = EntityType.CELL
-field_name = 'vectoriel_field'
+field_name = 'vectoriel field'
 defshape = DeformedShapeOnField(med_reader, cell_entity, field_name, 1)
 pvsimple.ResetCamera()
 
index 13b74f673ee334291ba8265430b91318aa848af8..8bd72b857c7df34c837025471f3a37bcd8a4efb8 100644 (file)
@@ -47,7 +47,7 @@ print "**** Stage2: Creating Deformed Shape"
 print "Creating Deformed Shape...............",
 
 cell_entity = EntityType.CELL
-field_name = 'vectoriel_field'
+field_name = 'vectoriel field'
 defshape = DeformedShapeOnField(med_reader, cell_entity, field_name, 1)
 pvsimple.ResetCamera()
 
index 923ec3a7cf6e23482e4fece1c718b83e4aaf9049..c294bd09ced70a7ba78ae629c73f46749943886e 100644 (file)
@@ -48,12 +48,8 @@ aView = GetRenderView()
 
 # Create required presentations for the proxy
 # CreatePrsForProxy(aProxy, aView, thePrsTypeList, thePictureDir, thePictureExt, theIsAutoDelete)
-aFieldNames = aProxy.PointArrays.GetData()
-aNbOnNodes = len(aFieldNames)
-aFieldNames.extend(aProxy.CellArrays.GetData())
-aTimeStamps = aProxy.TimestepValues.GetData()
 aFieldEntity = EntityType.NODE
-aFieldName = "MODES_DEPL"
+aFieldName = "MODES___DEPL____________________"
 
 #Creation of a set of non-colored and then colored Deformed Shapes, based on time stamps of MODES_DEP field
 for colored in [False,True]:
index 904adb318420cbd5e63f6951d31298cfbe2eb550..66215d6da65dcbbedd9b180a340932b3db12e5f3 100644 (file)
@@ -37,7 +37,7 @@ if not picturedir.endswith(os.sep):
 # MED file
 file_name = datadir + "hexa_28320_ELEM.med"
 field_name = "pression_elem_dom_pb1"
-timestamp_nb = 1
+timestamp_nb = -1 # last timestamp
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index e7a2c4c0eb263f0f76c19f81585ba710ff342d24..fb4e8234467493fb02f4a0ab41e9cd9cc8aa996e 100644 (file)
@@ -36,8 +36,9 @@ if not picturedir.endswith(os.sep):
     
 # MED file
 file_name = datadir + "pointe.med"
-field_name = "fieldcelldouble"
-timestamp_nb = 1
+field_name = "fieldcelldoublescalar"
+#field_name = "fieldcelldoublevector"
+timestamp_nb = -1 # last timestamp
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index 22d4c2143c583ed36daaa939577551626fff2e4c..e9ce5f9020f730d41cea3199f4418de2d86426f1 100644 (file)
@@ -36,8 +36,8 @@ if not picturedir.endswith(os.sep):
     
 # MED file
 file_name = datadir + "Fields_group3D.med"
-field_name = "scalar_field"
-timestamp_nb = 1
+field_name = "scalar field"
+timestamp_nb = -1 # last timestamp
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index bef3d322e8e17fb6ec4a7fbd724280116e025da6..247447fb402ae55a67dec9ed84d554e39debe525 100644 (file)
@@ -36,8 +36,8 @@ if not picturedir.endswith(os.sep):
     
 # MED file
 file_name = datadir + "Hexa8.med"
-field_name = "scalar_field"
-timestamp_nb = 1
+field_name = "scalar field"
+timestamp_nb = -1 # last timestamp
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index 27ce8f7b8c86da65501cc916e987f598e3261db4..6730d245acbd12b94940742439828b66a813673f 100644 (file)
@@ -36,8 +36,8 @@ if not picturedir.endswith(os.sep):
     
 # MED file
 file_name = datadir + "Penta6.med"
-field_name = "scalar_field"
-timestamp_nb = 1
+field_name = "scalar field"
+timestamp_nb = -1 # last timestamp
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index fe34ed17d020da8d1f04e0d82a1d0e6f4cb0c5b5..530fc331a3913f9ad2a0cc6a44ec9af1c27e45f0 100644 (file)
@@ -36,8 +36,8 @@ if not picturedir.endswith(os.sep):
     
 # MED file
 file_name = datadir + "Tetra4.med"
-field_name = "scalar_field"
-timestamp_nb = 1
+field_name = "scalar field"
+timestamp_nb = -1 # last timestamp
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index 30c51c7e7018933c5343d162ea716a0a4686160d..81afb6193863afe18f3b6624f95f4eef7f2f408d 100644 (file)
@@ -36,8 +36,8 @@ if not picturedir.endswith(os.sep):
     
 # MED file
 file_name = datadir + "Tria3.med"
-field_name = "scalar_field"
-timestamp_nb = 1
+field_name = "scalar field"
+timestamp_nb = -1 # last timestamp
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index a55ea80f90685435b10cbc9911037180efcae1de..f7ddd0afd867abde40d7fc51983f7fdb3f36893b 100644 (file)
@@ -36,8 +36,8 @@ if not picturedir.endswith(os.sep):
     
 # MED file
 file_name = datadir + "Quad4.med"
-field_name = "scalar_field"
-timestamp_nb = 1
+field_name = "scalar field"
+timestamp_nb = -1 # last timestamp
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index 5c438a4f31203e2f069d0ca75d7d9a3b69be77be..3bc4f999fec85a6961769b116b634b72509fcaaa 100644 (file)
@@ -37,7 +37,7 @@ if not picturedir.endswith(os.sep):
 # MED file
 file_name = datadir + "carre_en_quad4_seg2_fields.med"
 field_name = "AREA"
-timestamp_nb = 1
+timestamp_nb = -1 # last timestamp
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index 7ad89f77433d92eef28c424a3f17f6ccc28c3722..d336acf43d7cd28e055ab81f9fff1086910a3d28 100644 (file)
@@ -37,7 +37,7 @@ if not picturedir.endswith(os.sep):
 # MED file
 file_name = datadir + "cube_hexa8_quad4.med"
 field_name = "fieldcelldouble"
-timestamp_nb = 1
+timestamp_nb = -1 # last timestamp
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index aa6cc3eab2d8ec67f4de4982163a44b4dba4d646..c2664bee2ba1eefccbd7f76d676eaf2f7eccc080 100644 (file)
@@ -37,7 +37,7 @@ if not picturedir.endswith(os.sep):
 # MED file
 file_name = datadir + "test_55_solid_concentr_dom.med"
 field_name = "RN_precipite_restr"
-timestamp_nb = 1
+timestamp_nb = -1 # last timestamp
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index 48185d5cfe8250ad4954406efa2917e31f30bc11..c4dace7eb867f9934b54aa28580d2593c9493d54 100644 (file)
@@ -37,7 +37,7 @@ if not picturedir.endswith(os.sep):
 # MED file
 file_name = datadir + "H_COUPLEX1.med"
 field_name = "Head"
-timestamp_nb = 1
+timestamp_nb = -1 # last timestamp
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index 0bbb799de0ed70113bc5dcc7779c6a6af212c040..2835c0c5f281dca196865cc42549e530a92e5809 100644 (file)
@@ -37,7 +37,7 @@ if not picturedir.endswith(os.sep):
 # MED file
 file_name = datadir + "cas2_2d_couplage_chess_castem.med"
 field_name = "pH"
-timestamp_nb = 1
+timestamp_nb = -1 # last timestamp
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index 15e6971e5461af30b3e83f4fd666af29039cbfda..f945ed32ac1e81e92bda8dbf1c06355b75c8a8a9 100644 (file)
@@ -37,7 +37,7 @@ if not picturedir.endswith(os.sep):
 # MED file
 file_name = datadir + "champc.med"
 field_name = "Am241_restriction"
-timestamp_nb = 1
+timestamp_nb = -1 # last timestamp
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index 774e269deb637add0ac3e63eac54b5b933d868bf..d5aa0bc07483515b5d7f8ea13328c967cd5c20fb 100644 (file)
@@ -37,7 +37,7 @@ if not picturedir.endswith(os.sep):
 # MED file
 file_name = datadir + "hydro_sea_alv.med"
 field_name = "Head"
-timestamp_nb = 1
+timestamp_nb = -1 # last timestamp
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index 60fcb2f92feffa5f2e8244a394cfe6bacf1f906c..f7e3dc1032893e2d02dfee1293eddbc43015dc5e 100644 (file)
@@ -37,7 +37,7 @@ if not picturedir.endswith(os.sep):
 # MED file
 file_name = datadir + "toto.med"
 field_name = "erreur"
-timestamp_nb = 1
+timestamp_nb = -1 # last timestamp
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index ab4737d6f86b8c1707d4994895727e6c69f0966b..6c1fd99212bbfa6dd31cb8c5439332578d8c1900 100644 (file)
@@ -36,8 +36,8 @@ if not picturedir.endswith(os.sep):
     
 # MED file
 file_name = datadir + "couplex_alain.med"
-field_name = "Conc._I129"
-timestamp_nb = 1
+field_name = "Conc. I129"
+timestamp_nb = -1 # last timestamp
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index 25720004293994f4163b977de9b588e20caa386d..4797087e09eeb2c2a36d69e00ffb3ea6f3cc90c8 100644 (file)
@@ -37,7 +37,7 @@ if not picturedir.endswith(os.sep):
 # MED file
 file_name = datadir + "KCOUPLEX1.med"
 field_name = "Head"
-timestamp_nb = 1
+timestamp_nb = -1 # last timestamp
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index 2085d27a6fcad5a62b93c9c53cd166a01f1f32ef..a0ee7766f2510ebc378ce8bca2ba3474aa9ff9f1 100644 (file)
@@ -37,7 +37,7 @@ if not picturedir.endswith(os.sep):
 # MED file
 file_name = datadir + "test_hydro.med"
 field_name = "Head"
-timestamp_nb = 1
+timestamp_nb = -1 # last timestamp
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index 1f127f5c9d2d1eb41c86b3d554c77b795670eddb..583d3939810f276f0dd0481931849fbc9cbd39a4 100644 (file)
@@ -37,7 +37,7 @@ if not picturedir.endswith(os.sep):
 # MED file
 file_name = datadir + "ml.med"
 field_name = "head_restriction"
-timestamp_nb = 1
+timestamp_nb = -1 # last timestamp
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index 04581e0513aa1985dcb5c40c8ec0b6e8aaf6aca7..e7c946b3fff079ed11491f553b74b1f17222b1dc 100644 (file)
@@ -36,8 +36,8 @@ if not picturedir.endswith(os.sep):
     
 # MED file
 file_name = datadir + "T_COUPLEX1.med"
-field_name = "Conc._I129"
-timestamp_nb = 1
+field_name = "Conc. I129"
+timestamp_nb = -1 # last timestamp
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index 4326d4a60a81facc9a9ab6dc8002ff6709d7e654..d628fc4ef3ac71c9a54bd85b1dccee3e130a8222 100644 (file)
@@ -37,7 +37,7 @@ if not picturedir.endswith(os.sep):
 # MED file
 file_name = datadir + "test_hydro_darcy4_out.med"
 field_name = "DarcyVelocity"
-timestamp_nb = 1
+timestamp_nb = -1 # last timestamp
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index a8c2348fee4de5c0cffbd45b56e12823c60c8487..9c02d467c1f9984c0322f5ed7c3241a1b1aaf4b8 100644 (file)
@@ -36,8 +36,8 @@ if not picturedir.endswith(os.sep):
 
 # MED file
 file_name = datadir + "UO2_250ans.med"
-field_name = "Concentration_O2(aq)_mol_per_l"
-timestamp_nb = 1
+field_name = "Concentration_O2(aq)_mol per l"
+timestamp_nb = -1 # last timestamp
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index bfe47bee76eed08a9676abef3eefe62407d4370e..80baf8c1f7249cb0023bf698ffa23f51305d8bf4 100644 (file)
@@ -36,8 +36,8 @@ if not picturedir.endswith(os.sep):
 
 # MED file
 file_name = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.3.med"
-field_names = ["REMEUN_ERRE_ELGA_NORE", "REMEZEROERRE_ELGA_NORE"]
-timestamp_nb = 1
+field_names = ["REMEUN__ERRE_ELGA_NORE__________", "REMEZEROERRE_ELGA_NORE__________"]
+timestamp_nb = -1 # last timestamp
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index 6ca4a0804bc5b17621340df520d758a0bf5480d2..2e123c4982a611a0156b99607318bca5437d0950 100644 (file)
@@ -37,7 +37,7 @@ if not picturedir.endswith(os.sep):
 # MED file
 file_name = datadir + "occ4050.med"
 field_name = "champ_reel"
-timestamp_nb = 1
+timestamp_nb = -1 # last timestamp
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index 1490e2b53e18cf84bd0551f06101a50dc6944353..138361d316bfaf48657f818cdd5e5bcfef78393b 100644 (file)
@@ -36,8 +36,8 @@ if not picturedir.endswith(os.sep):
 
 # MED file
 file_name = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.1.med"
-field_names = ["REMEUN_ERRE_ELGA_NORE", "REMEZEROERRE_ELGA_NORE"]
-timestamp_nb = 1
+field_names = ["REMEUN__ERRE_ELGA_NORE__________", "REMEZEROERRE_ELGA_NORE__________"]
+timestamp_nb = -1 # last timestamp
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index c8ecec6eca4926fa3906cd5ed73f6719d5b122c7..00d534aa777db554d4ae735a923e8340856a7b73 100644 (file)
@@ -36,8 +36,8 @@ if not picturedir.endswith(os.sep):
 
 # MED file
 file_name = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.2.med"
-field_names = ["REMEUN_ERRE_ELGA_NORE", "REMEZEROERRE_ELGA_NORE"]
-timestamp_nb = 1
+field_names = ["REMEUN__ERRE_ELGA_NORE__________", "REMEZEROERRE_ELGA_NORE__________"]
+timestamp_nb = -1 # last timestamp
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index a804bffd21ae58e98bd4b37e463ccd999eb2a88e..83d7cbc54b1dc2ca316e4824d82d8f10ba6773b5 100644 (file)
@@ -30,14 +30,15 @@ import pvsimple
 
 
 # Directory for saving snapshots
-picturedir = get_picture_dir(sys.argv[1], "GaussPoints/C8")
+picturedir = get_picture_dir("GaussPoints/C8")
 if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # MED file
 file_name = datadir + "ir.resu.med"
-field_name = "gravit_VARI_ELGA"
-timestamp_nb = 1
+field_name = "gravit__VARI_ELGA"
+#timestamp_nb = 1
+timestamp_nb = 6 # timestamp 1 is empty
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index 61d2e0f21357d336fd96a96265852fe6f7e39638..0426b9a4641c53cb65b724dfa3de1225ac8ff241 100644 (file)
@@ -30,14 +30,14 @@ import pvsimple
 
 
 # Directory for saving snapshots
-picturedir = get_picture_dir(sys.argv[1], "GaussPoints/C9")
+picturedir = get_picture_dir("GaussPoints/C9")
 if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
 # MED file
 file_name = datadir + "petit.rmed"
-field_name = "RESPIL_SIEF_ELGA"
-timestamp_nb = 1
+field_name = "RESPIL__SIEF_ELGA"
+timestamp_nb = -1 # last timestamp
 
 paravis.myParavis.ImportFile(file_name)
 med_reader = pvsimple.GetActiveSource()
index 6f932351c88386d966514949424a78e73fa7eaf8..1b69c1aba7e9bccf98f5c0f274c79fc48949fd50 100644 (file)
@@ -47,21 +47,17 @@ aView = GetRenderView()
 
 # Create required presentations for the proxy
 # CreatePrsForProxy(aProxy, aView, thePrsTypeList, thePictureDir, thePictureExt, theIsAutoDelete)
-aFieldNames = aProxy.PointArrays.GetData()
-aNbOnNodes = len(aFieldNames)
-aFieldNames.extend(aProxy.CellArrays.GetData())
-aTimeStamps = aProxy.TimestepValues.GetData()
 aFieldEntity = EntityType.NODE
-aFieldName = "MODES_DEPL"
+aFieldName = "MODES___DEPL____________________"
 
 #create Iso Surfaces presentations for 10 timestamps
 for i in range(1,11):
-    hide_all(aView, True)
+    #hide_all(aView, True)
     aPrs = IsoSurfacesOnField(aProxy, aFieldEntity,aFieldName , i)
     if aPrs is None:
         raise RuntimeError, "Presentation is None!!!"
     #display only current scalar map
-    aPrs.Visibility=1
+    display_only(aPrs, aView)
     reset_view(aView)
     Render(aView)    
     
index 691dc9fbafe8fe5e8d92cb665a14fdc6308a1cf2..327f90774f35633b420c6bebbd96de6d9db52d00 100755 (executable)
@@ -46,12 +46,8 @@ else: print "OK"
 # Get viewScalarMap
 aView = GetRenderView()
 
-aFieldNames = aProxy.PointArrays.GetData()
-aNbOnNodes = len(aFieldNames)
-aFieldNames.extend(aProxy.CellArrays.GetData())
-aTimeStamps = aProxy.TimestepValues.GetData()
 aFieldEntity = EntityType.NODE
-aFieldName = "MODES_DEPL"
+aFieldName = "MODES___DEPL____________________"
 
 #create Plot 3D presentations for 10 timestamps
 for i in range(1,11):
index b20cae3b846288d3548a92a5b218102309838b65..0d4de63cde505fdc7f50ed3c14427845e5a6d421 100644 (file)
@@ -135,7 +135,7 @@ else:
 print "**** Stage4: Displaying scalar field"
 
 print "Creating Scalar Map.......",
-scalarmap1 = ScalarMapOnField(med_reader1, cell_entity, 'scalar_field', 1)
+scalarmap1 = ScalarMapOnField(med_reader1, cell_entity, 'scalar field', 1)
 if scalarmap1 is None:
     print "FAILED"
 else:
@@ -145,7 +145,7 @@ else:
 view.ResetCamera()
 
 print "Creating Iso Surfaces.....",
-isosurfaces1 = IsoSurfacesOnField(med_reader1, cell_entity, 'scalar_field', 1)
+isosurfaces1 = IsoSurfacesOnField(med_reader1, cell_entity, 'scalar field', 1)
 if isosurfaces1 is None:
     print "FAILED"
 else:
@@ -153,7 +153,7 @@ else:
     print "OK"
 
 print "Creating Cut Planes.......",
-cutplanes1 = CutPlanesOnField(med_reader1, cell_entity, 'scalar_field', 1,
+cutplanes1 = CutPlanesOnField(med_reader1, cell_entity, 'scalar field', 1,
                               orientation=Orientation.YZ)
 if cutplanes1 is None:
     print "FAILED"
@@ -167,7 +167,7 @@ display_only(cutplanes1, view)
 print "Creating Scalar Map On Deformed Shape.......",
 scalarmapondefshape1 = DeformedShapeAndScalarMapOnField(med_reader1,
                                                         cell_entity,
-                                                        'vectoriel_field', 1)
+                                                        'vectoriel field', 1)
 if scalarmapondefshape1 is None:
     print "FAILED"
 else:
index bfbd73ebd404ce0baa6bb346c00d71445aaee013..5bce5b2f9d0f9ff58f94fb59b9af779157a4c2fa 100644 (file)
 # This case corresponds to: /visu/SWIG_scripts/A8 case
 # Create table
 
-import paraview.simple as pv
+# Do not use pv as a short name.
+# It is a name of function from numpy and may be redefined implicitly by 'from numpy import *' call.
+# import paraview.simple as pv
+import paraview.simple as pvs
 import paraview.servermanager as sm
 
 
@@ -58,8 +61,8 @@ for i in xrange(1, nb_cols + 1):
 """
 
 # Creating programmable source (table)
-ps = pv.ProgrammableSource()
+ps = pvs.ProgrammableSource()
 ps.OutputDataSetType = 'vtkTable'
 ps.Script = script
-pv.RenameSource("Very useful data", ps)
+pvs.RenameSource("Very useful data", ps)
 ps.UpdatePipeline()
index 37b57b536127913e4934d20ea9853399dc862270..85cc06efc57f214d4b8a41239a90744358b9fb6d 100644 (file)
@@ -41,24 +41,24 @@ if samples_dir is not None:
     tablesdir = samples_dir + "/Tables/"
 
 # Get view
-view = pv.GetRenderView()
+view = pvs.GetRenderView()
 sleep(DELAY)
 
 # Destroy the view
-pv.Delete(view)
+pvs.Delete(view)
 
 
 # Create view and set background
-view = pv.CreateRenderView()
+view = pvs.CreateRenderView()
 reset_view(view)
 
 color = [0, 0.3, 1]
 view.Background = color
-pv.Render()
+pvs.Render()
 
 # Load MED reader plugin
 pv_root_dir = os.getenv("PARAVIS_ROOT_DIR")
-pv.LoadPlugin(pv_root_dir + "/lib/paraview/libMedReaderPlugin.so")
+pvs.LoadPlugin(pv_root_dir + "/lib/paraview/libMedReaderPlugin.so")
 
 # Import MED file
 med_file = datadir + "pointe.med"
@@ -66,20 +66,20 @@ field_name = "fieldnodedouble"
 entity = EntityType.NODE
 timestamp = 1
 
-med_reader = pv.MEDReader(FileName=med_file)
+med_reader = pvs.MEDReader(FileName=med_file)
 med_reader.UpdatePipeline()
 
 # Create scalar map
 scalarmap = ScalarMapOnField(med_reader, entity, field_name, timestamp)
-pv.Show(scalarmap.Input)
+pvs.Show(scalarmap.Input)
 
 # Set view properties
 print "view.CameraFocalPoint = [0, 0, 0]"
 view.CameraFocalPoint = [0, 0, 0]
 print "view.CameraParallelScale = 2"
 view.CameraParallelScale = 2
-print "pv.ResetCamera(view)"
-pv.ResetCamera(view)
+print "pvs.ResetCamera(view)"
+pvs.ResetCamera(view)
 
 # Play with scalar bar
 bar = get_bar()
@@ -97,22 +97,22 @@ for i in xrange(2, nb_colors):
     y = range_max - delta * i / nb_colors
     lt.RGBPoints[0] = x
     lt.RGBPoints[4] = y
-    pv.Render(view)
+    pvs.Render(view)
     sleep(DELAY / 4.0)
 
 lt.RGBPoints[0] = range_min
 lt.RGBPoints[4] = range_max
 
-print "pv.ResetCamera(view)"
-pv.ResetCamera(view)
+print "pvs.ResetCamera(view)"
+pvs.ResetCamera(view)
 
 # Create another view for cut planes
-view = pv.CreateRenderView()
+view = pvs.CreateRenderView()
 reset_view(view)
 
 color = [0, 0.7, 0]
 view.Background = color
-pv.Render(view)
+pvs.Render(view)
 
 displacement = 0.5
 orient = Orientation.YZ
@@ -129,10 +129,10 @@ cam_pos[0] = cam_pos[0] + 10
 print "Set view.CameraPosition"
 cutplanes.Scale[0] = 3
 cutplanes.Scale[1] = 10
-pv.Render(view)
+pvs.Render(view)
 sleep(DELAY)
 
-pv.ResetCamera(view)
+pvs.ResetCamera(view)
 
 slice_filter = cutplanes.Input
 offset_vals = slice_filter.SliceOffsetValues
@@ -146,7 +146,7 @@ for i in xrange(nb_planes, 1, -1):
     slice_filter.SliceType.Normal = normal
     pos = get_positions(i, normal, bounds, displacement)
     slice_filter.SliceOffsetValues = pos
-    pv.Render(view)
+    pvs.Render(view)
     sleep(DELAY)
 
 nb_planes = 10
@@ -155,26 +155,26 @@ slice_filter.SliceType.Normal = normal
 for i in xrange(1, nb_planes):
     pos = get_positions(i, normal, bounds, displacement)
     slice_filter.SliceOffsetValues = pos
-    pv.Render(view)
+    pvs.Render(view)
     sleep(DELAY)
 
 slice_filter.SliceType.Normal = [0, 0, 1]
 slice_filter.UpdatePipeline()
-print "pv.ResetCamera(view)"
-pv.ResetCamera(view)
+print "pvs.ResetCamera(view)"
+pvs.ResetCamera(view)
 
 # Create one more view for iso surfaces
-view = pv.CreateRenderView()
+view = pvs.CreateRenderView()
 reset_view(view)
 
 color = [1, 0.7, 0]
 view.Background = color
-pv.Render(view)
+pvs.Render(view)
 sleep(DELAY)
 
 isosurf = IsoSurfacesOnField(med_reader, entity, field_name, timestamp)
 display_only(isosurf, view)
-pv.ResetCamera(view)
+pvs.ResetCamera(view)
 print "display_only(isosurf, view)"
 sleep(DELAY)
 
@@ -185,21 +185,21 @@ scalar_range = get_data_range(med_reader, entity, field_name, cut_off=True)
 for i in xrange(2, nb_surfaces):
     contours = get_contours(scalar_range, i)
     contour.Isosurfaces = contours
-    pv.Render(view)
+    pvs.Render(view)
     sleep(DELAY)
 
 contour.Isosurfaces = get_contours(scalar_range, 10)
 contour.UpdatePipeline()
-print "pv.ResetCamera(view)"
-pv.ResetCamera(view)
+print "pvs.ResetCamera(view)"
+pvs.ResetCamera(view)
 
 # Create one more view for cut lines
-view = pv.CreateRenderView()
+view = pvs.CreateRenderView()
 reset_view(view)
 
 color = [0.7, 0.7, 0.7]
 view.Background = color
-pv.Render(view)
+pvs.Render(view)
 sleep(DELAY)
 
 cutlines, curves = CutLinesOnField(med_reader, entity, field_name, timestamp,
@@ -208,19 +208,19 @@ cutlines, curves = CutLinesOnField(med_reader, entity, field_name, timestamp,
                                    generate_curves=True)
 print "CutLinesOnField(...)"
 display_only(cutlines, view)
-pv.ResetCamera(view)
+pvs.ResetCamera(view)
 print "display_only(cutlines, view)"
 sleep(DELAY)
 
-xy_view = pv.CreateXYPlotView()
-print "pv.CreateXYPlotView()"
+xy_view = pvs.CreateXYPlotView()
+print "pvs.CreateXYPlotView()"
 index = 0
 for curve in curves:
-    xyrep = pv.Show(curve, xy_view)
+    xyrep = pvs.Show(curve, xy_view)
     xyrep.AttributeType = 'Point Data'
     xyrep.UseIndexForXAxis = 0
     xyrep.XArrayName = 'arc_length'
-    pv.Render(xy_view)
+    pvs.Render(xy_view)
     set_visible_lines(xyrep, [field_name])
     xyrep.SeriesLabel = [field_name, 'Y' + str(index)]
     r = str(random.random())
@@ -229,16 +229,16 @@ for curve in curves:
     xyrep.SeriesColor = [field_name, r, g, b]
     index += 1
 
-pv.Render(xy_view)
+pvs.Render(xy_view)
 sleep(DELAY)
 
 # Create one more view for cut segment
-view = pv.CreateRenderView()
+view = pvs.CreateRenderView()
 reset_view(view)
 
 color = [0.0, 0.7, 0.3]
 view.Background = color
-pv.Render(view)
+pvs.Render(view)
 sleep(DELAY)
 
 point1 = [0.0, -1.0, 2.5]
@@ -247,23 +247,23 @@ cutsegment = CutSegmentOnField(med_reader, entity, field_name, timestamp,
                                point1, point2)
 print "CutSegmentOnField(...)"
 display_only(cutsegment, view)
-pv.ResetCamera(view)
+pvs.ResetCamera(view)
 print "display_only(cutsegment, view)"
 sleep(DELAY)
 
-xy_view = pv.CreateXYPlotView()
-curve = pv.Show(cutsegment.Input, xy_view)
+xy_view = pvs.CreateXYPlotView()
+curve = pvs.Show(cutsegment.Input, xy_view)
 curve.AttributeType = 'Point Data'
 curve.UseIndexForXAxis = 0
 curve.XArrayName = 'arc_length'
 set_visible_lines(xyrep, [field_name])
 
-pv.Render(xy_view)
+pvs.Render(xy_view)
 sleep(DELAY)
 
 
 # Create one more view for animation
-view = pv.CreateRenderView()
+view = pvs.CreateRenderView()
 reset_view(view)
 
 med_file = datadir + "TimeStamps.med"
@@ -271,10 +271,10 @@ field_name = "vitesse"
 entity = EntityType.NODE
 timestamp = 2
 
-med_reader = pv.MEDReader(FileName=med_file)
+med_reader = pvs.MEDReader(FileName=med_file)
 
 isosurf = IsoSurfacesOnField(med_reader, entity, field_name, timestamp)
-pv.ResetCamera(view)
+pvs.ResetCamera(view)
 
 print "Start Animation"
-pv.AnimateReader(med_reader, view)
+pvs.AnimateReader(med_reader, view)
index 6b49e1a718dd403ee5b52e25e4f1281484a47492..41060746c18e67f9be6ff6c3b182a6d07e76c437 100644 (file)
 # This case corresponds to: /visu/SWIG_scripts/C3 case
 # Create table and display curves
 
-import paraview.simple as pv
+# Do not use pv as a short name.
+# It is a name of function from numpy and may be redefined implicitly by 'from numpy import *' call.
+# import paraview.simple as pv
+import paraview.simple as pvs
 import paraview.servermanager as sm
 
 
@@ -58,43 +61,43 @@ for i in xrange(1, nb_cols + 1):
 """
 
 # Creating programmable source (table)
-ps = pv.ProgrammableSource()
+ps = pvs.ProgrammableSource()
 ps.OutputDataSetType = 'vtkTable'
 ps.Script = script
-pv.RenameSource("Very useful data", ps)
+pvs.RenameSource("Very useful data", ps)
 ps.UpdatePipeline()
 
 # Display table
 # TODO: no possibility to create spreadsheet view
 
 # Display curves
-xy_view = pv.CreateXYPlotView()
+xy_view = pvs.CreateXYPlotView()
 xy_view.ChartTitle = 'Very useful data'
 xy_view.AxisTitle = ['[ Wt ]', 'Frequency [ Hz ]']
 
-xy_rep = pv.Show(ps)
+xy_rep = pvs.Show(ps)
 xy_rep.AttributeType = 'Row Data'
 xy_rep.UseIndexForXAxis = 0
 xy_rep.XArrayName = 'Frequency'
 xy_rep.SeriesVisibility = ['Frequency', '0']
-pv.Render(xy_view)
+pvs.Render(xy_view)
 
 # Hide legend
 xy_view.ShowLegend = 0
-pv.Render(xy_view)
+pvs.Render(xy_view)
 
 # Set logarithmic scaling for X axis
 xy_view.AxisLogScale[1] = 1
-pv.Render(xy_view)
+pvs.Render(xy_view)
 
 # Set linear scaling for X axis
 xy_view.AxisLogScale[1] = 0
-pv.Render(xy_view)
+pvs.Render(xy_view)
 
 # Set logarithmic scaling for X axis
 xy_view.AxisLogScale[0] = 1
-pv.Render(xy_view)
+pvs.Render(xy_view)
 
 # Show legend
 xy_view.ShowLegend = 1
-pv.Render(xy_view)
+pvs.Render(xy_view)
index fbceb5df3cf5e5a9f113332f86c98462084406b6..53de24b32037d935b4d6cf8d844476a7250ffc1d 100644 (file)
@@ -49,10 +49,8 @@ else: print "OK"
 aView = GetRenderView()
 
 
-field_names = proxy.PointArrays.GetData()
-aTimeStamps = proxy.TimestepValues.GetData()
 aFieldEntity = EntityType.NODE
-aFieldName = "MODES_DEPL"
+aFieldName = "MODES___DEPL____________________"
 #create list to store picture files sizes
 sizes=[]
 #create Scalar Map presentations for 10 timestamps
index eff246a5484b6ec04d452c6348dc00ce10f0de1c..8083283ac7c7e1d48b0d938742e3188ae1d44800 100755 (executable)
@@ -291,7 +291,7 @@ def Import_Med_Field(paravis, file, field_names, check_errors=0, prs=[]):
 
     # import MED file
     paravis.ImportFile(file)
-    proxy = presentations.pv.GetActiveSource()
+    proxy = presentations.pvs.GetActiveSource()
     if proxy is None:
        raise RuntimeError, "ERROR!!! Can't import file!!!"  
     
index 57634ffe89d7726f5e9aae5222f56f3f2cd9a623..d2c5ea403faf5f4b4c93f5e0d54be09abf48b2ed 100644 (file)
@@ -48,12 +48,8 @@ aView = GetRenderView()
 
 # Create required presentations for the proxy
 # CreatePrsForProxy(aProxy, aView, thePrsTypeList, thePictureDir, thePictureExt, theIsAutoDelete)
-aFieldNames = aProxy.PointArrays.GetData()
-aNbOnNodes = len(aFieldNames)
-aFieldNames.extend(aProxy.CellArrays.GetData())
-aTimeStamps = aProxy.TimestepValues.GetData()
 aFieldEntity = EntityType.NODE
-aFieldName = "MODES_DEPL"
+aFieldName = "MODES___DEPL____________________"
 
 #Creation of a set of non-colored and then colored Vectors presentations, based on time stamps of MODES_DEP field
 for colored in [False,True]:
index d5252947f833ad86f114b1b22341b49743ec8da3..cdc3922a66197083ba6c191a69db0ea3a450a5a8 100644 (file)
@@ -27,7 +27,8 @@ import paravis
 import pvsimple
 
 my_paravis = paravis.myParavis
-picturedir = get_picture_dir(sys.argv[1], "bugs/A0")
+os.environ["PARAVIS_TEST_PICS"] = sys.argv[1]
+picturedir = get_picture_dir("bugs/A0")
 
 # 1. Import MED file
 print 'Importing "hydro_sea_alv.med"...',
index 6dbb7472864f4ecb6a3511c52ec43a6a8094a8dc..90ff0f7217e709c8e9573b564c2fde1ca75b39b8 100644 (file)
@@ -28,7 +28,8 @@ import paravis
 import pvsimple
 
 my_paravis = paravis.myParavis
-picturedir = get_picture_dir(sys.argv[1], "bugs/A1")
+os.environ["PARAVIS_TEST_PICS"] = sys.argv[1]
+picturedir = get_picture_dir("bugs/A1")
 
 med_file_path = datadir + "fra1.med"
 pic_path = os.path.join(picturedir, "A1." + pictureext)
@@ -57,5 +58,5 @@ view.ResetCamera()
 pvsimple.Render(view)
 
 print "Picure file name is " + pic_path
-pv.WriteImage(pic_path, view=view, Magnification=1)
+pvs.WriteImage(pic_path, view=view, Magnification=1)
 time.sleep(1)
index a1d5c358027d1c482dd185f4fd4766dd677dbcdd..f4f1a6e429a0feb3afd70297adee19ff758cec30 100644 (file)
@@ -28,7 +28,8 @@ import paravis
 import pvsimple
 
 my_paravis = paravis.myParavis
-picturedir = get_picture_dir(sys.argv[1], "bugs/A2")
+os.environ["PARAVIS_TEST_PICS"] = sys.argv[1]
+picturedir = get_picture_dir("bugs/A2")
 
 med_file_path = datadir + "carre_MIXTE_0000_v3.0.6.med"
 pic_path = os.path.join(picturedir, "A2." + pictureext)
@@ -70,5 +71,5 @@ view.CameraParallelScale = 0.1
 pvsimple.Render(view)
 
 print "Picure file name is " + pic_path
-pv.WriteImage(pic_path, view=view, Magnification=1)
+pvs.WriteImage(pic_path, view=view, Magnification=1)
 time.sleep(1)
index 16543b79781b69c950926f8277f66cb50f25d383..1b93507faef4978262d94edc63baf64f32b67101 100644 (file)
@@ -27,7 +27,8 @@ import paravis
 import pvsimple
 
 my_paravis = paravis.myParavis
-picturedir = get_picture_dir(sys.argv[1], "bugs/A6")
+os.environ["PARAVIS_TEST_PICS"] = sys.argv[1]
+picturedir = get_picture_dir("bugs/A6")
 
 med_file_path = datadir + "fra.med"
 
index e815177459723bb232e102246f40f0d866dd2339..3be25493f6e216d0426329148726610d7c9cb37c 100644 (file)
@@ -25,7 +25,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum
 import paravis
 
 my_paravis = paravis.myParavis
-picturedir = get_picture_dir(sys.argv[1], "bugs/A7")
+os.environ["PARAVIS_TEST_PICS"] = sys.argv[1]
+picturedir = get_picture_dir("bugs/A7")
 
 med_file_path = datadir + "hexa_28320_ELEM.med"
 CreatePrsForFile(my_paravis, med_file_path, [PrsTypeEnum.MESH], picturedir, pictureext)
index 5adb3367931631e42a481e260d4bebd62cec5d8a..6e1000eed15bfc4e0aa2584d8a82b094700d8563 100644 (file)
@@ -29,7 +29,8 @@ import pvsimple
 
 my_paravis = paravis.myParavis
 
-picturedir = get_picture_dir(sys.argv[1], "bugs/A9")
+os.environ["PARAVIS_TEST_PICS"] = sys.argv[1]
+picturedir = get_picture_dir("bugs/A9")
 
 # 1. Step1: Import MED file
 print "**** Step1: Importing MED file"
index 8c859245c785401ddd3da82d26a24d1aa9cb4bd7..110429ce3bfdb981e4a9205b1a3d7703855759ed 100644 (file)
@@ -27,7 +27,8 @@ import paravis
 import pvsimple
 
 my_paravis = paravis.myParavis
-picturedir = get_picture_dir(sys.argv[1], "bugs/B1")
+os.environ["PARAVIS_TEST_PICS"] = sys.argv[1]
+picturedir = get_picture_dir("bugs/B1")
 
 # 1. Import MED file
 med_file_path = datadir + "resultat.01.med"
@@ -42,10 +43,9 @@ else:
     print "OK"
 
 # 2. Creation of presentation of each group
-groups_on_cells = get_group_names(med_reader, "MAILLAGE_01_001", EntityType.CELL, wo_nogroups=True)
-groups_on_nodes = get_group_names(med_reader, "MAILLAGE_01_001", EntityType.NODE, wo_nogroups=True)
-
-groups = groups_on_cells + groups_on_nodes
+extGrp = pvs.ExtractGroup()
+extGrp.UpdatePipelineInformation()
+groups = get_group_names(extGrp)
 
 errors = 0
 i = 0
@@ -53,7 +53,7 @@ for group in groups:
     i += 1
     shor_name = group.split('/')[-1]
     print "group: ", shor_name
-    prs = MeshOnGroup(med_reader, group)
+    prs = MeshOnGroup(med_reader, extGrp, group)
     
     if prs is None : 
         print "FAILED!!! Created presentation is None!!!"
index 4785f09f1c130e536e82159fa454488862c626c7..6843eca4e20577e050d40c0085781f747df21192 100644 (file)
@@ -34,7 +34,7 @@ my_paravis.ImportFile(med_file_path)
 med_reader = pvsimple.GetActiveSource()
 
 if med_reader is None:
-    print "FAILED"
+    raise RuntimeError, "MEDfileForStructuredMesh.med was not imported!"
 else:
     print "OK"
 
index 96216c73788727922b5f00a668a3124ee6c0fc39..c5b19279090579785a9a97f538d9035c6fa8b066 100644 (file)
@@ -27,7 +27,8 @@ import paravis
 import pvsimple
 
 my_paravis = paravis.myParavis
-picturedir = get_picture_dir(sys.argv[1], "bugs/C4")
+os.environ["PARAVIS_TEST_PICS"] = sys.argv[1]
+picturedir = get_picture_dir("bugs/C4")
 
 # 1. Import MED file
 med_file_path = datadir + "forma01f.resu.med"
index 97dfbee3c6ed8a69ffbe7f1ddebd8cbdce314604..6c0e811a109c19828c0cf40c2f7e7e9e3a8c0332 100644 (file)
@@ -27,7 +27,8 @@ import paravis
 import pvsimple
 
 my_paravis = paravis.myParavis
-picturedir = get_picture_dir(sys.argv[1], "bugs/C6")
+os.environ["PARAVIS_TEST_PICS"] = sys.argv[1]
+picturedir = get_picture_dir("bugs/C6")
 
 # 1. Import MED file
 med_file_path = datadir + "relachement_brutal_sans_dudg_gauss.med"
@@ -43,7 +44,7 @@ else:
 
 # 2. Creation of GaussPoints presentations
 mesh_name = "Maillage"
-field_name = "Result_EQUI_ELGA_SIGM"
+field_name = "Result__EQUI_ELGA_SIGM__________"
 timestamp_list = range(1, 5)
 
 for timestamp in timestamp_list:
index b55d346ee4134d64bdd20b8156be2f7179a138a0..4e2feead93b22dd13da07a3ff587cfce785f70c2 100644 (file)
@@ -27,7 +27,8 @@ import paravis
 import pvsimple
 
 my_paravis = paravis.myParavis
-picturedir = get_picture_dir(sys.argv[1], "bugs/C7")
+os.environ["PARAVIS_TEST_PICS"] = sys.argv[1]
+picturedir = get_picture_dir("bugs/C7")
 
 # 1. Import MED file
 med_file_path = datadir + "Bug583-Quadratique.resu.med"
index 3c1240d0e47c0eca99c105b3f75e4a8b0249afd6..d4f9ce05f3e669b2e67e2cb53f81aacefb489a0a 100644 (file)
@@ -28,7 +28,8 @@ import paravis
 import pvsimple
 
 my_paravis = paravis.myParavis
-picturedir = get_picture_dir(sys.argv[1], "bugs/D0")
+os.environ["PARAVIS_TEST_PICS"] = sys.argv[1]
+picturedir = get_picture_dir("bugs/D0")
 
 # Aux method
 def get_group_full_name(source, group_name):
index 34343dd98a4ab6f7708c4bf10320952845668d2a..9521a5c3986f647b27dda305de478af162dea2ae 100644 (file)
@@ -27,7 +27,8 @@ import paravis
 import pvsimple
 
 my_paravis = paravis.myParavis
-picturedir = get_picture_dir(sys.argv[1], "bugs/D1")
+os.environ["PARAVIS_TEST_PICS"] = sys.argv[1]
+picturedir = get_picture_dir("bugs/D1")
 
 # 1. Import of the "Bug829_resu_mode.med" file at first time
 med_file_path = datadir + "Bug829_resu_mode.med"
@@ -41,7 +42,7 @@ errors=0
 sizes=[]
 
 for i in range(1,11):
-    presentation = DeformedShapeAndScalarMapOnField(med_reader1, EntityType.NODE, "MODES_DEPL", i)
+    presentation = DeformedShapeAndScalarMapOnField(med_reader1, EntityType.NODE, "MODES___DEPL____________________", i)
     if presentation is None : 
         raise RuntimeError, "Presentation is None!!!"
 
@@ -69,7 +70,7 @@ errors = 0
 sizes=[]
 
 for i in range(1,11):
-    presentation = DeformedShapeAndScalarMapOnField(med_reader2, EntityType.NODE, "MODES_DEPL", 11-i)
+    presentation = DeformedShapeAndScalarMapOnField(med_reader2, EntityType.NODE, "MODES___DEPL____________________", 11-i)
     if presentation is None : 
         raise RuntimeError, "Presentation is None!!!"
 
index 598efa02e0651b4edf0aed9a04814ef9393664d4..1b5e33bb6ef914ca0ceafb837cd8fc9cac475ff8 100644 (file)
@@ -36,7 +36,7 @@ if med_reader is None:
 view = pvsimple.GetRenderView()
 
 # Creation of colored "DeformedShape" presentations, based on time stamps of "RESU_DEPL" field
-presentation = DeformedShapeOnField(med_reader, EntityType.NODE, 'RESU_DEPL', 1, is_colored=True)
+presentation = DeformedShapeOnField(med_reader, EntityType.NODE, 'RESU____DEPL____________________', 1, is_colored=True)
 if presentation is None : 
     raise RuntimeError, "DeformedShapeOnField Presentation is None!!!"
 
@@ -44,7 +44,7 @@ display_only(presentation, view)
 reset_view(view)
   
 # Creation of colored "Vectors" presentations, based on time stamps of "RESU_DEPL" field
-presentation = VectorsOnField(med_reader, EntityType.NODE, 'RESU_DEPL', 1, is_colored=True)
+presentation = VectorsOnField(med_reader, EntityType.NODE, 'RESU____DEPL____________________', 1, is_colored=True)
 if presentation is None : 
     raise RuntimeError, "Vectors Presentation is None!!!"
 
@@ -52,7 +52,7 @@ display_only(presentation, view)
 reset_view(view)
 
 # Creation of colored "DeformedShapeAndScalarMap" presentations, based on time stamps of "RESU_DEPL" field
-presentation = DeformedShapeAndScalarMapOnField(med_reader, EntityType.NODE, 'RESU_DEPL', 1)
+presentation = DeformedShapeAndScalarMapOnField(med_reader, EntityType.NODE, 'RESU____DEPL____________________', 1)
 if presentation is None : 
     raise RuntimeError, "DeformedShapeAndScalarMap Presentation is None!!!"
 
@@ -60,7 +60,7 @@ display_only(presentation, view)
 reset_view(view)
 
 # Creation of colored "CutPlanes" presentations, based on time stamps of "RESU_DEPL" field
-presentation = CutPlanesOnField(med_reader, EntityType.NODE, 'RESU_DEPL', 1)
+presentation = CutPlanesOnField(med_reader, EntityType.NODE, 'RESU____DEPL____________________', 1)
 if presentation is None : 
     raise RuntimeError, "CutPlanes Presentation is None!!!"
 
index 1bf2eec4e69cbf217030384b393ee19ca2d41f9b..26cd2dec5c4b6ea6f09a32334ca1e7aeaa80c955 100644 (file)
@@ -55,13 +55,13 @@ if cut_segment2 == None:
 #       (spreadsheet view in terms of ParaViS) from in Python script
 
 # 5. Creation of curve based on Table
-xy_view = pv.CreateXYPlotView()
+xy_view = pvs.CreateXYPlotView()
 
-curve1 = pv.Show(cut_segment1.Input, xy_view)
+curve1 = pvs.Show(cut_segment1.Input, xy_view)
 if curve1 == None:
    raise RuntimeError, " ERROR!!! Curve based on the first CutSegment is not built!"
 
-curve2 = pv.Show(cut_segment2.Input, xy_view)
+curve2 = pvs.Show(cut_segment2.Input, xy_view)
 if curve2 == None:
    raise RuntimeError, " ERROR!!! Curve based on the second CutSegment is not built!"
 
index cb00a40ecb211c63bed1b688e66f373cd92d1205..7d6a3e93db7e6c3647da6facd91de55b73fce9f5 100644 (file)
@@ -49,7 +49,7 @@ else:
 # 2. Displaying scalar field
 print "Creating Scalar Map.......",
 
-scalarmap = ScalarMapOnField(med_reader, EntityType.CELL, 'scalar_field', 1)
+scalarmap = ScalarMapOnField(med_reader, EntityType.CELL, 'scalar field', 1)
 if scalarmap is None:
     print "FAILED"
 else:
index 6eb2f2510f329594fe533ec7a8f4be284f71d03d..d3ba872d077d49c4f48f4aa417223999659574d0 100644 (file)
@@ -59,7 +59,7 @@ calc = get_add_component_calc(source, EntityType.NODE, field_name)
 vector_array = calc.ResultArrayName
 calc.UpdatePipeline()
 source = calc
-stream = pv.StreamTracer(source)
+stream = pvs.StreamTracer(source)
 
 # 3. Apply settings
 RenameSource(settings['name'], stream)
index 17e8808edd25bd9216d5fc451a95c2927d41ebf6..a6acef9e694eb4dc33d11b112722c3d11a1f10de 100644 (file)
@@ -27,8 +27,7 @@ import paravis
 import pvsimple
 
 my_paravis = paravis.myParavis
-picturedir = get_picture_dir(sys.argv[1], "imps/A1")
-
+picturedir = get_picture_dir("imps/A1")
 
 def set_prs_colored(prs, proxy, entity, field_name, vector_mode, timestamp_nb):
     # Get time value
@@ -71,29 +70,31 @@ view = pvsimple.GetRenderView()
 
 # 2. Creation of "CutPlanes" presentation, based on time stamp of "scalar field" field
 print 'Creation of "CutPlanes" presentation, based on time stamp of "scalar field" field....'
-cutplanes = CutPlanesOnField(med_reader, EntityType.CELL, "scalar_field", 1)
+cutplanes = CutPlanesOnField(med_reader, EntityType.CELL, "scalar field", 1)
 if cutplanes is None : 
     raise RuntimeError, "Presentation is None!!!"
 else:
     print "OK"
 
+select_cells_with_data(med_reader, on_cells=["scalar field", "vectoriel field"])
+
 print "Setting of deformation:"
 warp_vector = pvsimple.WarpByVector(cutplanes.Input)
-warp_vector.Vectors = ["vectoriel_field"]
+warp_vector.Vectors = ["vectoriel field"]
 warp_vector.ScaleFactor = 5.0
 
 print "Got scale     : ", warp_vector.ScaleFactor
 print "Got field name: ", warp_vector.Vectors
 
 presentation = pvsimple.GetRepresentation(warp_vector)
-set_prs_colored(presentation, med_reader, EntityType.CELL, "scalar_field", 'Magnitude', 1)
+set_prs_colored(presentation, med_reader, EntityType.CELL, "scalar field", 'Magnitude', 1)
 
 pic_path = os.path.join(picturedir, "deformed_cut_planes_scalar" + "." + pictureext)
 process_prs_for_test(presentation, view, pic_path)
 
 # 3. Creation of "CutPlanes" presentation, based on time stamp of "vectoriel field" field
 print 'Creation of "CutPlanes" presentation, based on time stamp of "vectoriel field" field....'
-cutplanes = CutPlanesOnField(med_reader, EntityType.CELL, "vectoriel_field", 1)
+cutplanes = CutPlanesOnField(med_reader, EntityType.CELL, "vectoriel field", 1)
 
 if cutplanes is None : 
     raise RuntimeError, "Presentation is None!!!"
@@ -102,14 +103,14 @@ else:
 
 print "Setting of deformation:"
 warp_vector = pvsimple.WarpByVector(cutplanes.Input)
-warp_vector.Vectors = ["vectoriel_field"]
+warp_vector.Vectors = ["vectoriel field"]
 warp_vector.ScaleFactor = 5.0
 
 print "Got scale     : ", warp_vector.ScaleFactor
 print "Got field name: ", warp_vector.Vectors
 
 presentation = pvsimple.GetRepresentation(warp_vector)
-set_prs_colored(presentation, med_reader, EntityType.CELL, "vectoriel_field", 'Magnitude', 1)
+set_prs_colored(presentation, med_reader, EntityType.CELL, "vectoriel field", 'Magnitude', 1)
 
 pic_path = os.path.join(picturedir, "deformed_cut_planes_vectorial" + "." + pictureext)
 process_prs_for_test(presentation, view, pic_path)
index af83e6f99f953e1e9f5b79d549d3bacb29593b8f..117d36a1d322506d4260a56753497f351f31298c 100644 (file)
@@ -37,7 +37,7 @@ if med_reader is None:
     error = error+1
 
 # Create Scalar Map
-scalarmap = ScalarMapOnField(med_reader, EntityType.NODE, 'RESUMECAEQUI_ELGA_SIGM', 1)
+scalarmap = ScalarMapOnField(med_reader, EntityType.NODE, 'RESUMECAEQUI_ELGA_SIGM__________', 1)
 if scalarmap is None:
     print "Error!!! ScalarMap is not created"
     error = error+1
index a9b1bf398f2ee4d4dff6277adc9ac2a3e8e76e75..6c89329485e2b818d20eb3d77c200afbb921621b 100644 (file)
@@ -120,7 +120,7 @@ else:
 print "**** Step4: Displaying scalar field"
 
 print "Creating Scalar Map.......",
-scalarmap1 = ScalarMapOnField(med_reader1, cell_entity, 'scalar_field', 1)
+scalarmap1 = ScalarMapOnField(med_reader1, cell_entity, 'scalar field', 1)
 if scalarmap1 is None:
     print "FAILED"
 else:
@@ -130,7 +130,7 @@ else:
 reset_view(view)
 
 print "Creating Iso Surfaces.....",
-isosurfaces1 = IsoSurfacesOnField(med_reader1, cell_entity, 'scalar_field', 1)
+isosurfaces1 = IsoSurfacesOnField(med_reader1, cell_entity, 'scalar field', 1)
 if isosurfaces1 is None:
     print "FAILED"
 else:
@@ -138,7 +138,7 @@ else:
     print "OK"
 
 print "Creating Cut Planes.......",
-cutplanes1 = CutPlanesOnField(med_reader1, cell_entity, 'scalar_field', 1,
+cutplanes1 = CutPlanesOnField(med_reader1, cell_entity, 'scalar field', 1,
                               orientation=Orientation.YZ)
 if cutplanes1 is None:
     print "FAILED"
index cf369ab46b79c9807a540b683c4178d551dd7ae6..5a32a6654107b0ce31807d9311bfe824bf58d7c2 100644 (file)
@@ -43,8 +43,8 @@ else:
     print "OK"
 
 mesh_name1 = 'Maillage_MED_HEXA8'
-scalar_field = 'scalar_field'
-vectoriel_field = 'vectoriel_field'
+scalar_field = 'scalar field'
+vectoriel_field = 'vectoriel field'
 view = pvsimple.GetRenderView()
 
 print "Creating Scalar Map...................",