From 3e194173e979e42463ab4ee462b44529b962d680 Mon Sep 17 00:00:00 2001
From: vtn <vtn@opencascade.com>
Date: Fri, 1 Mar 2013 16:28:34 +0000
Subject: [PATCH] Porting to Paraview 3.98.1

---
 src/PV_SWIG/presentations.py                  |  4 +-
 test/VisuPrs/2D_viewer/CMakeLists.txt         |  2 +-
 test/VisuPrs/3D_viewer/CMakeLists.txt         |  2 +-
 test/VisuPrs/Animation/CMakeLists.txt         |  2 +-
 test/VisuPrs/CutLines/CMakeLists.txt          |  3 +-
 test/VisuPrs/CutLines/F0.py                   | 39 ------------------
 test/VisuPrs/CutPlanes/CMakeLists.txt         |  3 +-
 test/VisuPrs/CutPlanes/F0.py                  | 39 ------------------
 test/VisuPrs/DeformedShape/CMakeLists.txt     |  3 +-
 test/VisuPrs/DeformedShape/F0.py              | 39 ------------------
 test/VisuPrs/GaussPoints/CMakeLists.txt       |  2 +-
 test/VisuPrs/IsoSurfaces/CMakeLists.txt       |  3 +-
 test/VisuPrs/IsoSurfaces/F0.py                | 39 ------------------
 test/VisuPrs/MeshPresentation/CMakeLists.txt  |  3 +-
 test/VisuPrs/Plot3D/CMakeLists.txt            |  3 +-
 test/VisuPrs/Plot3D/F0.py                     | 39 ------------------
 test/VisuPrs/SWIG_scripts/CMakeLists.txt      |  2 +-
 test/VisuPrs/ScalarMap/CMakeLists.txt         |  3 +-
 test/VisuPrs/ScalarMap/F0.py                  | 39 ------------------
 .../ScalarMap_On_DeformedShape/CMakeLists.txt |  5 +--
 test/VisuPrs/ScalarMap_On_DeformedShape/F0.py | 39 ------------------
 test/VisuPrs/StreamLines/CMakeLists.txt       |  3 +-
 test/VisuPrs/StreamLines/F0.py                | 41 -------------------
 test/VisuPrs/Tables/CMakeLists.txt            |  2 +-
 test/VisuPrs/Vectors/CMakeLists.txt           |  3 +-
 test/VisuPrs/Vectors/F0.py                    | 39 ------------------
 26 files changed, 19 insertions(+), 382 deletions(-)
 delete mode 100644 test/VisuPrs/CutLines/F0.py
 delete mode 100644 test/VisuPrs/CutPlanes/F0.py
 delete mode 100755 test/VisuPrs/DeformedShape/F0.py
 delete mode 100644 test/VisuPrs/IsoSurfaces/F0.py
 delete mode 100644 test/VisuPrs/Plot3D/F0.py
 delete mode 100755 test/VisuPrs/ScalarMap/F0.py
 delete mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/F0.py
 delete mode 100644 test/VisuPrs/StreamLines/F0.py
 delete mode 100644 test/VisuPrs/Vectors/F0.py

diff --git a/src/PV_SWIG/presentations.py b/src/PV_SWIG/presentations.py
index a9f26e14..d5ead463 100644
--- a/src/PV_SWIG/presentations.py
+++ b/src/PV_SWIG/presentations.py
@@ -706,9 +706,9 @@ 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)
-        attribute_mode = "point_data"
+        attribute_mode = "Point Data"
         if array_entity != EntityType.NODE:
-            attribute_mode = "cell_data"
+            attribute_mode = "Cell Data"
         calculator.AttributeMode = attribute_mode
         expression = "iHat * " + array_name + "_X + jHat * " + array_name + "_Y + kHat * 0"
         calculator.Function = expression
diff --git a/test/VisuPrs/2D_viewer/CMakeLists.txt b/test/VisuPrs/2D_viewer/CMakeLists.txt
index cec60468..1cd89cfd 100644
--- a/test/VisuPrs/2D_viewer/CMakeLists.txt
+++ b/test/VisuPrs/2D_viewer/CMakeLists.txt
@@ -22,7 +22,7 @@ IF (PYTHON_EXECUTABLE)
       A0
       A1
       )
-    SET(TIMEOUT 1500)
+    SET(TIMEOUT 10000)
     ADD_TEST(2DVIEWER_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
     SET_TESTS_PROPERTIES(2DVIEWER_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
   ENDFOREACH( tfile )
diff --git a/test/VisuPrs/3D_viewer/CMakeLists.txt b/test/VisuPrs/3D_viewer/CMakeLists.txt
index 3bac165b..6ed01853 100755
--- a/test/VisuPrs/3D_viewer/CMakeLists.txt
+++ b/test/VisuPrs/3D_viewer/CMakeLists.txt
@@ -31,7 +31,7 @@ IF (PYTHON_EXECUTABLE)
       B0
       B2
       )
-    SET(TIMEOUT 1500)
+    SET(TIMEOUT 10000)
     ADD_TEST(3DVIEWER_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
     SET_TESTS_PROPERTIES(3DVIEWER_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
   ENDFOREACH( tfile )
diff --git a/test/VisuPrs/Animation/CMakeLists.txt b/test/VisuPrs/Animation/CMakeLists.txt
index 98ae1def..52d6ae74 100755
--- a/test/VisuPrs/Animation/CMakeLists.txt
+++ b/test/VisuPrs/Animation/CMakeLists.txt
@@ -49,7 +49,7 @@ IF (PYTHON_EXECUTABLE)
       H1
       H2
       )
-    SET(TIMEOUT 1500)
+    SET(TIMEOUT 10000)
     ADD_TEST(ANIMATION_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
     SET_TESTS_PROPERTIES(ANIMATION_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
   ENDFOREACH( tfile )
diff --git a/test/VisuPrs/CutLines/CMakeLists.txt b/test/VisuPrs/CutLines/CMakeLists.txt
index d99c8342..6b0a33c5 100644
--- a/test/VisuPrs/CutLines/CMakeLists.txt
+++ b/test/VisuPrs/CutLines/CMakeLists.txt
@@ -43,7 +43,6 @@ IF (PYTHON_EXECUTABLE)
       E7
       E8
       E9
-      F0
       F1
       F2
       F3
@@ -57,7 +56,7 @@ IF (PYTHON_EXECUTABLE)
       G1
       G2      
       )
-    SET(TIMEOUT 1500)
+    SET(TIMEOUT 10000)
     ADD_TEST(CUTLINES_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
     SET_TESTS_PROPERTIES(CUTLINES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
   ENDFOREACH( tfile )
diff --git a/test/VisuPrs/CutLines/F0.py b/test/VisuPrs/CutLines/F0.py
deleted file mode 100644
index a889d294..00000000
--- a/test/VisuPrs/CutLines/F0.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (C) 2010-2012  CEA/DEN, EDF R&D
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-# This case corresponds to: /visu/CutLines/F0 case
-# Create Cut Lines for all data of the given MED file
-
-import sys
-from paravistest import datadir, pictureext, get_picture_dir
-from presentations import CreatePrsForFile, PrsTypeEnum
-import paravis
-
-# Create presentations 
-myParavis = paravis.myParavis
-
-# Directory for saving snapshots
-picturedir = get_picture_dir(sys.argv[1],"CutLines/F0") 
-
-file = datadir + "gro5couches.med"
-print " --------------------------------- "
-print "file ", file
-print " --------------------------------- "
-print "CreatePrsForFile..."
-CreatePrsForFile(myParavis, file, [PrsTypeEnum.CUTLINES], picturedir, pictureext)
diff --git a/test/VisuPrs/CutPlanes/CMakeLists.txt b/test/VisuPrs/CutPlanes/CMakeLists.txt
index 93591e9e..90e32367 100644
--- a/test/VisuPrs/CutPlanes/CMakeLists.txt
+++ b/test/VisuPrs/CutPlanes/CMakeLists.txt
@@ -43,7 +43,6 @@ IF (PYTHON_EXECUTABLE)
       E7
       E8
       E9
-      F0
       F1
       F2
       F3
@@ -57,7 +56,7 @@ IF (PYTHON_EXECUTABLE)
       G1
       G2           
       )
-    SET(TIMEOUT 1500)
+    SET(TIMEOUT 10000)
     ADD_TEST(CUTPLANES_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
     SET_TESTS_PROPERTIES(CUTPLANES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
   ENDFOREACH( tfile )
diff --git a/test/VisuPrs/CutPlanes/F0.py b/test/VisuPrs/CutPlanes/F0.py
deleted file mode 100644
index 22b378c8..00000000
--- a/test/VisuPrs/CutPlanes/F0.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (C) 2010-2012  CEA/DEN, EDF R&D
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-# This case corresponds to: /visu/CutPlanes/F0 case
-# Create Cut Planes for all data of the given MED file
-
-import sys
-from paravistest import datadir, pictureext, get_picture_dir
-from presentations import CreatePrsForFile, PrsTypeEnum
-import paravis
-
-# Create presentations 
-myParavis = paravis.myParavis
-
-# Directory for saving snapshots
-picturedir = get_picture_dir(sys.argv[1],"CutPlanes/F0") 
-
-file = datadir + "gro5couches.med"
-print " --------------------------------- "
-print "file ", file
-print " --------------------------------- "
-print "CreatePrsForFile..."
-CreatePrsForFile(myParavis, file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext)
diff --git a/test/VisuPrs/DeformedShape/CMakeLists.txt b/test/VisuPrs/DeformedShape/CMakeLists.txt
index b50dca0c..c244b487 100644
--- a/test/VisuPrs/DeformedShape/CMakeLists.txt
+++ b/test/VisuPrs/DeformedShape/CMakeLists.txt
@@ -44,7 +44,6 @@ IF (PYTHON_EXECUTABLE)
       E7
       E8
       E9
-      F0
       F1
       F2
       F3
@@ -55,7 +54,7 @@ IF (PYTHON_EXECUTABLE)
       F8
       F9
       )
-    SET(TIMEOUT 1500)
+    SET(TIMEOUT 10000)
     ADD_TEST(DEFORMEDSHAPE_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
     SET_TESTS_PROPERTIES(DEFORMEDSHAPE_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
   ENDFOREACH( tfile )
diff --git a/test/VisuPrs/DeformedShape/F0.py b/test/VisuPrs/DeformedShape/F0.py
deleted file mode 100755
index 470606d1..00000000
--- a/test/VisuPrs/DeformedShape/F0.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (C) 2010-2012  CEA/DEN, EDF R&D
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-# This case corresponds to: /visu/DeformedShape/F0 case
-# Create Deformed Shape for all data of the given MED file
-
-import sys
-from paravistest import datadir, pictureext, get_picture_dir
-from presentations import CreatePrsForFile, PrsTypeEnum
-import paravis
-
-# Create presentations 
-myParavis = paravis.myParavis
-
-# Directory for saving snapshots
-picturedir = get_picture_dir(sys.argv[1],"DeformedShape/F0") 
-
-file = datadir + "gro5couches.med"
-print " --------------------------------- "
-print "file ", file
-print " --------------------------------- "
-print "CreatePrsForFile..."
-CreatePrsForFile(myParavis, file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext)
diff --git a/test/VisuPrs/GaussPoints/CMakeLists.txt b/test/VisuPrs/GaussPoints/CMakeLists.txt
index 4a95dfd1..caa1ccf3 100644
--- a/test/VisuPrs/GaussPoints/CMakeLists.txt
+++ b/test/VisuPrs/GaussPoints/CMakeLists.txt
@@ -47,7 +47,7 @@ IF (PYTHON_EXECUTABLE)
       C6
       C7
       )
-    SET(TIMEOUT 1500)
+    SET(TIMEOUT 10000)
     ADD_TEST(GAUSSPOINTS_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
     SET_TESTS_PROPERTIES(GAUSSPOINTS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
   ENDFOREACH( tfile )
diff --git a/test/VisuPrs/IsoSurfaces/CMakeLists.txt b/test/VisuPrs/IsoSurfaces/CMakeLists.txt
index eee46f4d..987c1d86 100755
--- a/test/VisuPrs/IsoSurfaces/CMakeLists.txt
+++ b/test/VisuPrs/IsoSurfaces/CMakeLists.txt
@@ -42,7 +42,6 @@ IF (PYTHON_EXECUTABLE)
       E7
       E8
       E9
-      F0
       F1
       F2
       F3
@@ -56,7 +55,7 @@ IF (PYTHON_EXECUTABLE)
       G1
       G2           
       )
-    SET(TIMEOUT 1500)
+    SET(TIMEOUT 10000)
     ADD_TEST(ISOSURFACES_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
     SET_TESTS_PROPERTIES(ISOSURFACES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
   ENDFOREACH( tfile )
diff --git a/test/VisuPrs/IsoSurfaces/F0.py b/test/VisuPrs/IsoSurfaces/F0.py
deleted file mode 100644
index 49a88130..00000000
--- a/test/VisuPrs/IsoSurfaces/F0.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (C) 2010-2012  CEA/DEN, EDF R&D
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-# This case corresponds to: /visu/IsoSurfaces/F0 case
-# Create Iso Surface for all data of the given MED file
-
-import sys
-from paravistest import datadir, pictureext, get_picture_dir
-from presentations import CreatePrsForFile, PrsTypeEnum
-import paravis
-
-# Create presentations 
-myParavis = paravis.myParavis
-
-# Directory for saving snapshots
-picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/F0") 
-
-file = datadir + "gro5couches.med"
-print " --------------------------------- "
-print "file ", file
-print " --------------------------------- "
-print "CreatePrsForFile..."
-CreatePrsForFile(myParavis, file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext)
diff --git a/test/VisuPrs/MeshPresentation/CMakeLists.txt b/test/VisuPrs/MeshPresentation/CMakeLists.txt
index ec144f37..293ce9b2 100644
--- a/test/VisuPrs/MeshPresentation/CMakeLists.txt
+++ b/test/VisuPrs/MeshPresentation/CMakeLists.txt
@@ -42,7 +42,6 @@ IF (PYTHON_EXECUTABLE)
       E7
       E8
       E9
-      F0
       F1
       F2
       F3
@@ -104,7 +103,7 @@ IF (PYTHON_EXECUTABLE)
       L0
       L1
       )
-    SET(TIMEOUT 1500)
+    SET(TIMEOUT 10000)
     ADD_TEST(MESH_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
     SET_TESTS_PROPERTIES(MESH_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
   ENDFOREACH( tfile )
diff --git a/test/VisuPrs/Plot3D/CMakeLists.txt b/test/VisuPrs/Plot3D/CMakeLists.txt
index 5cb35646..a55b00d2 100755
--- a/test/VisuPrs/Plot3D/CMakeLists.txt
+++ b/test/VisuPrs/Plot3D/CMakeLists.txt
@@ -42,7 +42,6 @@ IF (PYTHON_EXECUTABLE)
       E7
       E8
       E9
-      F0
       F1
       F2
       F3
@@ -56,7 +55,7 @@ IF (PYTHON_EXECUTABLE)
       G1
       G2           
       )
-    SET(TIMEOUT 1500)
+    SET(TIMEOUT 10000)
     ADD_TEST(PLOT3D_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
     SET_TESTS_PROPERTIES(PLOT3D_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
   ENDFOREACH( tfile )
diff --git a/test/VisuPrs/Plot3D/F0.py b/test/VisuPrs/Plot3D/F0.py
deleted file mode 100644
index 30c625c0..00000000
--- a/test/VisuPrs/Plot3D/F0.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (C) 2010-2012  CEA/DEN, EDF R&D
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-# This case corresponds to: /visu/Plot3D/F0 case
-# Create Plot3D for all data of the given MED file
-
-import sys
-from paravistest import datadir, pictureext, get_picture_dir
-from presentations import CreatePrsForFile, PrsTypeEnum
-import paravis
-
-# Create presentations 
-myParavis = paravis.myParavis
-
-# Directory for saving snapshots
-picturedir = get_picture_dir(sys.argv[1],"Plot3D/F0") 
-
-file = datadir + "gro5couches.med"
-print " --------------------------------- "
-print "file ", file
-print " --------------------------------- "
-print "CreatePrsForFile..."
-CreatePrsForFile(myParavis, file, [PrsTypeEnum.PLOT3D], picturedir, pictureext)
diff --git a/test/VisuPrs/SWIG_scripts/CMakeLists.txt b/test/VisuPrs/SWIG_scripts/CMakeLists.txt
index e180475c..e5a21f60 100644
--- a/test/VisuPrs/SWIG_scripts/CMakeLists.txt
+++ b/test/VisuPrs/SWIG_scripts/CMakeLists.txt
@@ -37,7 +37,7 @@ IF (PYTHON_EXECUTABLE)
       C3
       C7
       )
-    SET(TIMEOUT 1500)
+    SET(TIMEOUT 10000)
     ADD_TEST(SWIGSCRIPTS_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
     SET_TESTS_PROPERTIES(SWIGSCRIPTS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
   ENDFOREACH( tfile )
diff --git a/test/VisuPrs/ScalarMap/CMakeLists.txt b/test/VisuPrs/ScalarMap/CMakeLists.txt
index 836e08fa..66ca2737 100644
--- a/test/VisuPrs/ScalarMap/CMakeLists.txt
+++ b/test/VisuPrs/ScalarMap/CMakeLists.txt
@@ -42,7 +42,6 @@ IF (PYTHON_EXECUTABLE)
       E7
       E8
       E9
-      F0      
       F1
       F2
       F3
@@ -56,7 +55,7 @@ IF (PYTHON_EXECUTABLE)
       G1
       G2
       )
-    SET(TIMEOUT 1500)
+    SET(TIMEOUT 10000)
     ADD_TEST(SCALARMAP_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
     SET_TESTS_PROPERTIES(SCALARMAP_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
   ENDFOREACH( tfile )
diff --git a/test/VisuPrs/ScalarMap/F0.py b/test/VisuPrs/ScalarMap/F0.py
deleted file mode 100755
index e7adff96..00000000
--- a/test/VisuPrs/ScalarMap/F0.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (C) 2010-2012  CEA/DEN, EDF R&D
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-# This case corresponds to: /visu/ScalarMap/F0 case
-# Create Scalar Map for all data of the given MED file
-
-import sys
-from paravistest import datadir, pictureext, get_picture_dir
-from presentations import CreatePrsForFile, PrsTypeEnum
-import paravis
-
-# Create presentations 
-myParavis = paravis.myParavis
-
-# Directory for saving snapshots
-picturedir = get_picture_dir(sys.argv[1],"ScalarMap/F0") 
-
-file = datadir + "gro5couches.med"
-print " --------------------------------- "
-print "file ", file
-print " --------------------------------- "
-print "CreatePrsForFile..."
-CreatePrsForFile(myParavis, file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext)
diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt b/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt
index 728a686b..2d7c0373 100644
--- a/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt
+++ b/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt
@@ -43,7 +43,6 @@ IF (PYTHON_EXECUTABLE)
       E7
       E8
       E9 
-      F0     
       F1
       F2
       F3
@@ -53,8 +52,8 @@ IF (PYTHON_EXECUTABLE)
       F7
       F8               
       )
-    SET(TIMEOUT 1500)
-    ADD_TEST(DEFORMEDSHAPESCALARMAP_${tfile} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
+    SET(TIMEOUT 10000)
+    ADD_TEST(DEFORMEDSHAPESCALARMAP_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
     SET_TESTS_PROPERTIES(DEFORMEDSHAPESCALARMAP_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
   ENDFOREACH( tfile )
 ENDIF (PYTHON_EXECUTABLE)
diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/F0.py b/test/VisuPrs/ScalarMap_On_DeformedShape/F0.py
deleted file mode 100755
index b6da2bae..00000000
--- a/test/VisuPrs/ScalarMap_On_DeformedShape/F0.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (C) 2010-2012  CEA/DEN, EDF R&D
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-# This case corresponds to: /visu/ScalarMap_On_DeformedShape/F0 case
-# Create Scalar Map on Deformed Shape for all data of the given MED file
-
-import sys
-from paravistest import datadir, pictureext, get_picture_dir
-from presentations import CreatePrsForFile, PrsTypeEnum
-import paravis
-
-# Create presentations 
-myParavis = paravis.myParavis
-
-# Directory for saving snapshots
-picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/F0") 
-
-file = datadir + "gro5couches.med"
-print " --------------------------------- "
-print "file ", file
-print " --------------------------------- "
-print "CreatePrsForFile..."
-CreatePrsForFile(myParavis, file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext)
diff --git a/test/VisuPrs/StreamLines/CMakeLists.txt b/test/VisuPrs/StreamLines/CMakeLists.txt
index 74e40cc8..b45ba033 100644
--- a/test/VisuPrs/StreamLines/CMakeLists.txt
+++ b/test/VisuPrs/StreamLines/CMakeLists.txt
@@ -42,7 +42,6 @@ IF (PYTHON_EXECUTABLE)
       E7
       E8
       E9
-      F0
       F1
       F2
       F3
@@ -53,7 +52,7 @@ IF (PYTHON_EXECUTABLE)
       F8
       F9
       )
-    SET(TIMEOUT 1500)
+    SET(TIMEOUT 10000)
     ADD_TEST(STREAMLINES_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
     SET_TESTS_PROPERTIES(STREAMLINES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
   ENDFOREACH( tfile )
diff --git a/test/VisuPrs/StreamLines/F0.py b/test/VisuPrs/StreamLines/F0.py
deleted file mode 100644
index 797fd878..00000000
--- a/test/VisuPrs/StreamLines/F0.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright (C) 2010-2012  CEA/DEN, EDF R&D
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-# This case corresponds to: /visu/StreamLines/F0 case
-# Create Stream Lines for all fields of the the given MED file
-
-import sys
-
-from paravistest import datadir, pictureext, get_picture_dir
-from presentations import CreatePrsForFile, PrsTypeEnum
-import paravis
-
-
-# Directory for saving snapshots
-picturedir = get_picture_dir(sys.argv[1], "StreamLines/F0")
-
-# Create presentations
-myParavis = paravis.myParavis
-
-file = datadir +  "gro5couches.med"
-print " --------------------------------- "
-print "file ", file
-print " --------------------------------- "
-print "\nCreatePrsForFile..."
-CreatePrsForFile(myParavis, file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext)
diff --git a/test/VisuPrs/Tables/CMakeLists.txt b/test/VisuPrs/Tables/CMakeLists.txt
index 53da6970..4bd18d20 100644
--- a/test/VisuPrs/Tables/CMakeLists.txt
+++ b/test/VisuPrs/Tables/CMakeLists.txt
@@ -22,7 +22,7 @@ IF (PYTHON_EXECUTABLE)
       A0
       A2
       )
-    SET(TIMEOUT 1500)
+    SET(TIMEOUT 10000)
     ADD_TEST(TABLES_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
     SET_TESTS_PROPERTIES(TABLES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
   ENDFOREACH( tfile )
diff --git a/test/VisuPrs/Vectors/CMakeLists.txt b/test/VisuPrs/Vectors/CMakeLists.txt
index 257da3b3..e23a0aba 100644
--- a/test/VisuPrs/Vectors/CMakeLists.txt
+++ b/test/VisuPrs/Vectors/CMakeLists.txt
@@ -43,7 +43,6 @@ IF (PYTHON_EXECUTABLE)
       E7
       E8
       E9
-      F0
       F1
       F2
       F3
@@ -54,7 +53,7 @@ IF (PYTHON_EXECUTABLE)
       F8
       F9
       )
-    SET(TIMEOUT 1500)
+    SET(TIMEOUT 10000)
     ADD_TEST(VECTORS_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
     SET_TESTS_PROPERTIES(VECTORS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
   ENDFOREACH( tfile )
diff --git a/test/VisuPrs/Vectors/F0.py b/test/VisuPrs/Vectors/F0.py
deleted file mode 100644
index 87db6bf6..00000000
--- a/test/VisuPrs/Vectors/F0.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (C) 2010-2012  CEA/DEN, EDF R&D
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-# This case corresponds to: /visu/Vectors/F0 case
-# Create Vectors for all data of the given MED file
-
-import sys
-from paravistest import datadir, pictureext, get_picture_dir
-from presentations import CreatePrsForFile, PrsTypeEnum
-import paravis
-
-# Create presentations 
-myParavis = paravis.myParavis
-
-# Directory for saving snapshots
-picturedir = get_picture_dir(sys.argv[1],"Vectors/F0") 
-
-file = datadir + "gro5couches.med"
-print " --------------------------------- "
-print "file ", file
-print " --------------------------------- "
-print "CreatePrsForFile..."
-CreatePrsForFile(myParavis, file, [PrsTypeEnum.VECTORS], picturedir, pictureext)
-- 
2.39.2