Merge branch 'V7_dev'

[modules/paravis.git] / test / VisuPrs / Animation / C1.py

diff --git a/test/VisuPrs/Animation/C1.py b/test/VisuPrs/Animation/C1.py
index 23d705a7e13a084e9d734652cfa46adde2896d0e..23f659663211b105a4bcd7dbf1ffecc4fd1105c0 100644 (file)
--- a/test/VisuPrs/Animation/C1.py
+++ b/test/VisuPrs/Animation/C1.py
@@ -1,9 +1,9 @@
-# Copyright (C) 2010-2013  CEA/DEN, EDF R&D
+# Copyright (C) 2010-2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,13 +22,9 @@
 
 import sys
 import os
-from paravistest import * 
+from paravistest import *
 from presentations import *
 from pvsimple import *
-import paravis
-
-#import file
-myParavis = paravis.myParavis
 
 # Directory for saving snapshots
 picturedir = get_picture_dir("Animation/C1")
@@ -38,10 +34,10 @@ print " --------------------------------- "
 print "file ", theFileName
 print " --------------------------------- "
 
-myParavis.ImportFile(theFileName)
+OpenDataFile(theFileName)
 aProxy = GetActiveSource()
 if aProxy is None:
-       raise RuntimeError, "Error: can't import file."
+        raise RuntimeError, "Error: can't import file."
 else: print "OK"
 
 print "Creating a Viewer.........................",
@@ -68,22 +64,22 @@ 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)
 nb_frames = len(scene.TimeKeeper.TimestepValues)
 
-pics = os.listdir(picturedir) 
+pics = os.listdir(picturedir)
 if len(pics) != nb_frames:
    print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames
-    
+
 for pic in pics:
-    os.remove(picturedir+pic)    
-    
-# Prepare animation  performance    
+    os.remove(picturedir+pic)
+
+# Prepare animation  performance
 scene.PlayMode = 1 #  set RealTime mode for animation performance
 # set period
-scene.Duration = 30 # correspond to set the speed of animation in VISU 
+scene.Duration = 30 # correspond to set the speed of animation in VISU
 scene.GoToFirst()
 print "Animation.................................",
 scene.Play()