From: akl <akl@opencascade.com>
Date: Fri, 21 Mar 2014 09:56:29 +0000 (+0400)
Subject: Removing of unused functionality and correction of field name.
X-Git-Tag: V7_4_0a1~2^2~1^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=427ab403af425a949b9956b2eebe4b08cd2c5295;p=modules%2Fparavis.git

Removing of unused functionality and correction of field name.
---

diff --git a/test/VisuPrs/CutLines/G2.py b/test/VisuPrs/CutLines/G2.py
index ebcff0e1..417334f9 100644
--- a/test/VisuPrs/CutLines/G2.py
+++ b/test/VisuPrs/CutLines/G2.py
@@ -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):
diff --git a/test/VisuPrs/CutPlanes/G2.py b/test/VisuPrs/CutPlanes/G2.py
index cda53032..c1aafd71 100644
--- a/test/VisuPrs/CutPlanes/G2.py
+++ b/test/VisuPrs/CutPlanes/G2.py
@@ -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):
diff --git a/test/VisuPrs/DeformedShape/F9.py b/test/VisuPrs/DeformedShape/F9.py
index 923ec3a7..c294bd09 100644
--- a/test/VisuPrs/DeformedShape/F9.py
+++ b/test/VisuPrs/DeformedShape/F9.py
@@ -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]:
diff --git a/test/VisuPrs/IsoSurfaces/G2.py b/test/VisuPrs/IsoSurfaces/G2.py
index 6f932351..1b69c1ab 100644
--- a/test/VisuPrs/IsoSurfaces/G2.py
+++ b/test/VisuPrs/IsoSurfaces/G2.py
@@ -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)    
     
diff --git a/test/VisuPrs/Plot3D/G2.py b/test/VisuPrs/Plot3D/G2.py
index 691dc9fb..327f9077 100755
--- a/test/VisuPrs/Plot3D/G2.py
+++ b/test/VisuPrs/Plot3D/G2.py
@@ -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):
diff --git a/test/VisuPrs/ScalarMap/G2.py b/test/VisuPrs/ScalarMap/G2.py
index fbceb5df..53de24b3 100644
--- a/test/VisuPrs/ScalarMap/G2.py
+++ b/test/VisuPrs/ScalarMap/G2.py
@@ -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
diff --git a/test/VisuPrs/Vectors/F9.py b/test/VisuPrs/Vectors/F9.py
index 57634ffe..d2c5ea40 100644
--- a/test/VisuPrs/Vectors/F9.py
+++ b/test/VisuPrs/Vectors/F9.py
@@ -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]: