Merge branch 'master' of ssh://git.salome-platform.org/modules/paravis

[modules/paravis.git] / test / VisuPrs / ScalarMap / G2.py

diff --git a/test/VisuPrs/ScalarMap/G2.py b/test/VisuPrs/ScalarMap/G2.py
index 767f9affc884b99c7bb77f6cd2b8307bbd8aaaad..9a3bc7f8aafd9fe5dbd02b31966f2a4aa463040e 100644 (file)
--- a/test/VisuPrs/ScalarMap/G2.py
+++ b/test/VisuPrs/ScalarMap/G2.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2014  CEA/DEN, EDF R&D
+# Copyright (C) 2010-2015  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -23,27 +23,22 @@
 import sys
 import os
 from paravistest import datadir, pictureext, get_picture_dir
-import pvserver as paravis
-from pvsimple import GetActiveSource, GetRenderView, Render
+from pvsimple import GetActiveSource, GetRenderView, Render, OpenDataFile
 from presentations import ScalarMapOnField, hide_all, EntityType, PrsTypeEnum,reset_view,process_prs_for_test
 
-
-# Create presentations
-myParavis = paravis.myParavis
-
 picturedir = get_picture_dir("ScalarMap/G2")
 
 theFileName = datadir +  "Bug829_resu_mode.med"
 print " --------------------------------- "
 print "file ", theFileName
 print " --------------------------------- "
-    
+
 """Build presentations of the given types for all fields of the given file."""
 #print "Import %s..." % theFileName.split('/')[-1],
-result = myParavis.ImportFile(theFileName)
+result = OpenDataFile(theFileName)
 proxy = GetActiveSource()
 if proxy is None:
-       raise RuntimeError, "Error: can't import file."
+        raise RuntimeError, "Error: can't import file."
 else: print "OK"
 # Get view
 aView = GetRenderView()
@@ -62,27 +57,27 @@ for i in range(1,11):
     #display only current scalar map
     aPrs.Visibility=1
     reset_view(aView)
-    Render(aView)    
-    
+    Render(aView)
+
     # Add path separator to the end of picture path if necessery
     if not picturedir.endswith(os.sep):
             picturedir += os.sep
     prs_type = PrsTypeEnum.SCALARMAP
-            
+
     # Get name of presentation type
-    prs_name = PrsTypeEnum.get_name(prs_type)    
+    prs_name = PrsTypeEnum.get_name(prs_type)
     f_prs_type = prs_name.replace(' ', '').upper()
     # Construct image file name
     pic_name = picturedir + aFieldName + "_" + str(i) + "_" + f_prs_type + "." + pictureext
-    
+
     # Show and record the presentation
     process_prs_for_test(aPrs, aView, pic_name)
     sizes.append(os.path.getsize(pic_name))
 
-# check sizes of pictures      
+# check sizes of pictures
 if abs(max(sizes)-min(sizes)) > 0.01*max(sizes):
-    print "<b>WARNING!!! Pictures have different sizes!!!</b>"; 
+    print "<b>WARNING!!! Pictures have different sizes!!!</b>";
     for i in range(1,11):
         picture_name = "time_stamp_"+str(i)+"."+pictureext
-        print "Picture: "+picture_name+"; size: "+str(sizes[i-1]) 
-    raise RuntimeError 
+        print "Picture: "+picture_name+"; size: "+str(sizes[i-1])
+    raise RuntimeError