Porting (new API) to PV4.2 the tests.

diff --git a/src/Plugins/MEDReader/Test/testMEDReader11.py b/src/Plugins/MEDReader/Test/testMEDReader11.py
index 5b5db779d7e46e9844eb5b38221d707f989061de..95a7b258199c164708aab8a69621efe9b8b6c154 100644 (file)
--- a/src/Plugins/MEDReader/Test/testMEDReader11.py
+++ b/src/Plugins/MEDReader/Test/testMEDReader11.py
@@ -155,9 +155,8 @@ a1_ENTHALPIE_PiecewiseFunction = CreatePiecewiseFunction( Points=[1278022.919558
 
 DataRepresentation1.Representation = 'Wireframe'
 DataRepresentation1.ScalarOpacityFunction = a1_ENTHALPIE_PiecewiseFunction
-DataRepresentation1.ColorArrayName = ('CELL_DATA', 'ENTHALPIE')
+DataRepresentation1.ColorArrayName = ('CELLS', 'ENTHALPIE')
 DataRepresentation1.LookupTable = a1_ENTHALPIE_PVLookupTable
-DataRepresentation1.ColorAttributeType = 'CELL_DATA'
 
 testMEDReader11_med = MEDReader( FileName=fname )
 
@@ -178,9 +177,8 @@ a1_VITESSEX_PVLookupTable = GetLookupTableForArray( "VITESSE X", 1, RGBPoints=[0
 a1_VITESSEX_PiecewiseFunction = CreatePiecewiseFunction( Points=[0.0, 0.0, 0.5, 0.0, 1e-16, 1.0, 0.5, 0.0] )
 
 DataRepresentation2.ScalarOpacityFunction = a1_VITESSEX_PiecewiseFunction
-DataRepresentation2.ColorArrayName = ('CELL_DATA', 'VITESSE X')
+DataRepresentation2.ColorArrayName = ('CELLS', 'VITESSE X')
 DataRepresentation2.LookupTable = a1_VITESSEX_PVLookupTable
-DataRepresentation2.ColorAttributeType = 'CELL_DATA'
 
 a1_VITESSEX_PVLookupTable.RGBPoints = [-0.04176214531137861, 0.23, 0.299, 0.754, 0.35689831830849095, 0.865, 0.865, 0.865, 0.7555587819283606, 0.706, 0.016, 0.15]
 a1_VITESSEX_PVLookupTable.ScalarOpacityFunction = a1_VITESSEX_PiecewiseFunction

diff --git a/src/Plugins/MEDReader/Test/testMEDReader12.py b/src/Plugins/MEDReader/Test/testMEDReader12.py
index 5c700b60b779ac9cb6baae280ca18530a41e4c86..d2fb01797b3c3fdc358c9b9abe469352d51aae32 100644 (file)
--- a/src/Plugins/MEDReader/Test/testMEDReader12.py
+++ b/src/Plugins/MEDReader/Test/testMEDReader12.py
@@ -86,9 +86,8 @@ a1_POROSITE_PVLookupTable = GetLookupTableForArray( "POROSITE", 1, RGBPoints=[0.
 a1_POROSITE_PiecewiseFunction = CreatePiecewiseFunction( Points=[0.4734426322438599, 0.0, 0.5, 0.0, 0.5814307903048255, 1.0, 0.5, 0.0] )
 
 DataRepresentation2.ScalarOpacityFunction = a1_POROSITE_PiecewiseFunction
-DataRepresentation2.ColorArrayName = ('CELL_DATA', 'POROSITE')
+DataRepresentation2.ColorArrayName = ('CELLS', 'POROSITE')
 DataRepresentation2.LookupTable = a1_POROSITE_PVLookupTable
-DataRepresentation2.ColorAttributeType = 'CELL_DATA'
 
 Render()
 RenderView1.ViewSize =[300,300]

diff --git a/src/Plugins/MEDReader/Test/testMEDReader2.py b/src/Plugins/MEDReader/Test/testMEDReader2.py
index bc3e24c51ecfdeba0fd0b2ed1016a693d1c9e449..460e8ed71084fe313e481a2aa5ff9b42ab06dd7b 100644 (file)
--- a/src/Plugins/MEDReader/Test/testMEDReader2.py
+++ b/src/Plugins/MEDReader/Test/testMEDReader2.py
@@ -94,9 +94,8 @@ a2_ACellField_PVLookupTable=GetLookupTableForArray( "ACellField", 2, RGBPoints=[
 a2_ACellField_PiecewiseFunction=CreatePiecewiseFunction( Points=[0.0, 0.0, 0.5, 0.0, 1.0, 1.0, 0.5, 0.0] )
 a2_ACellField_PVLookupTable.ScalarOpacityFunction = a2_ACellField_PiecewiseFunction
 DataRepresentation5.ScalarOpacityFunction = a2_ACellField_PiecewiseFunction
-DataRepresentation5.ColorArrayName = 'ACellField'
 DataRepresentation5.LookupTable = a2_ACellField_PVLookupTable
-DataRepresentation5.ColorAttributeType = 'CELL_DATA'
+DataRepresentation5.ColorArrayName = ("CELLS", "ACellField")
 
 RenderView1 = GetRenderView()
 RenderView1.CenterOfRotation = [3.0, 3.0, 3.0]

diff --git a/src/Plugins/MEDReader/Test/testMEDReader4.py b/src/Plugins/MEDReader/Test/testMEDReader4.py
index 6aec3369cbd6de92f5507623583d88fe1c5fe013..6857b14183873cc164f1fccac74b1d2de5127048 100644 (file)
--- a/src/Plugins/MEDReader/Test/testMEDReader4.py
+++ b/src/Plugins/MEDReader/Test/testMEDReader4.py
@@ -68,9 +68,9 @@ testMEDReader4_med=MEDReader(FileName=fname)
 testMEDReader4_med.AllArrays=['TS0/mesh/ComSup0/f0NoPfl@@][@@P1','TS0/mesh/ComSup0/mesh@@][@@P1']
 #testMEDReader4_med.AllTimeSteps=['0000']
 
-Glyph1=Glyph(GlyphType="Sphere",GlyphTransform="Transform2" )
+Glyph1=Glyph(Input=testMEDReader4_med,GlyphType='Sphere')
 Glyph1.Scalars=['POINTS','f0NoPfl']
-Glyph1.SetScaleFactor=0.3
+Glyph1.ScaleFactor=0.3
 Glyph1.Vectors=['POINTS', '']
 Glyph1.GlyphTransform="Transform2"
 

diff --git a/src/Plugins/MEDReader/Test/testMEDReader5.py b/src/Plugins/MEDReader/Test/testMEDReader5.py
index 0f211a2f006c356355e1cfe27fd7afa18d1ce3e7..0e1c62a49766d141e4e617ebe8a9d1c0b9adf07f 100644 (file)
--- a/src/Plugins/MEDReader/Test/testMEDReader5.py
+++ b/src/Plugins/MEDReader/Test/testMEDReader5.py
@@ -106,9 +106,8 @@ DataRepresentation2.EdgeColor = [0.0, 0.0, 0.5000076295109483]
 DataRepresentation2.ScalarOpacityUnitDistance = 1.5768745057161244
 DataRepresentation2.ExtractedBlockIndex = 1
 DataRepresentation2.ScaleFactor = 0.4
-DataRepresentation2.ColorArrayName='fNode'
+DataRepresentation2.ColorArrayName=('POINTS','fNode')
 DataRepresentation2.LookupTable=LookupTable
-DataRepresentation2.ColorAttributeType='POINT_DATA'
 
 
 RenderView1.ViewSize=[300,300]

diff --git a/src/Plugins/MEDReader/Test/testMEDReader6.py b/src/Plugins/MEDReader/Test/testMEDReader6.py
index a576f67d8c77a491f00ae75ab7380df94411c9d5..ec4680f1b765192fec078c7cf16d040983deb0c6 100644 (file)
--- a/src/Plugins/MEDReader/Test/testMEDReader6.py
+++ b/src/Plugins/MEDReader/Test/testMEDReader6.py
@@ -71,7 +71,7 @@ GaussPoints1.SelectSourceArray = ['CELLS','ELGA@0']
 Glyph1 = Glyph( Input=GaussPoints1, GlyphType="Sphere", GlyphTransform="Transform2" )
 Glyph1.GlyphType = "Sphere"
 Glyph1.Vectors = ['POINTS', '']
-Glyph1.SetScaleFactor = 0.29
+Glyph1.ScaleFactor = 0.29
 
 RenderView1 = GetRenderView()
 RenderView1.CameraFocalPoint = [1.5, 1.5, 0.0]