Ready for new Glyph API

diff --git a/src/Plugins/MEDReader/Test/testMEDReader15.py b/src/Plugins/MEDReader/Test/testMEDReader15.py
index 1af02442f66700b1982a42fdcd38df5c9ec62d6f..4fca70a0ddd3db266056ab4c9748bf8babaa5994 100644 (file)
--- a/src/Plugins/MEDReader/Test/testMEDReader15.py
+++ b/src/Plugins/MEDReader/Test/testMEDReader15.py
@@ -49,7 +49,7 @@ ExpectedEntries=['TS0/zeName/ComSup0/zeName@@][@@P1','TS0/zeName/ComSup0/MESH@ze
 assert(reader.GetProperty("FieldsTreeInfo")[::2]==ExpectedEntries)
 
 #
-glyph1=Glyph(Input=reader,GlyphType='Arrow',Scalars='FamilyIdNode',Vectors='zeName',GlyphMode='All Points',ScaleFactor=0.1,GlyphTransform='Transform2')
+glyph1=Glyph(Input=reader,GlyphType='Arrow',ScaleArray='FamilyIdNode',OrientationArray='zeName',GlyphMode='All Points',MaximumGlyphSize=0.1,GlyphTransform='Transform2')
 
 renderView1=GetActiveViewOrCreate('RenderView')
 renderView1.InteractionMode='3D'

diff --git a/src/Plugins/MEDReader/Test/testMEDReader21.py b/src/Plugins/MEDReader/Test/testMEDReader21.py
index 0db517752f3a8c78e9f73c01ce12c4990f521405..187d27200b7f3fd3fc04361bffef0df839308a53 100644 (file)
--- a/src/Plugins/MEDReader/Test/testMEDReader21.py
+++ b/src/Plugins/MEDReader/Test/testMEDReader21.py
@@ -119,14 +119,14 @@ eLNOMesh1Display.SetScalarBarVisibility(renderView1, False)
 # create a new 'Glyph'
 glyph1 = Glyph(Input=eLNOMesh1,
     GlyphType='Arrow')
-glyph1.Scalars = ['POINTS', 'MyField']
-glyph1.Vectors = ['POINTS', 'None']
-glyph1.ScaleFactor = 0.15000000000000002
+glyph1.ScaleArray = ['POINTS', 'MyField']
+glyph1.OrientationArray = ['POINTS', 'No orientation array']
+glyph1.MaximumGlyphSize = 0.15000000000000002
 glyph1.GlyphTransform = 'Transform2'
 
 # Properties modified on glyph1
 glyph1.GlyphType = 'Sphere'
-glyph1.ScaleFactor = 0.15
+glyph1.MaximumGlyphSize = 0.15
 
 # show data in view
 glyph1Display = Show(glyph1, renderView1)

diff --git a/src/Plugins/MEDReader/Test/testMEDReader4.py b/src/Plugins/MEDReader/Test/testMEDReader4.py
index 59c0948f9181a72239c05d4d96f4d5f536b45a06..bdeb3e95674b820936179000d42dd88560748f26 100644 (file)
--- a/src/Plugins/MEDReader/Test/testMEDReader4.py
+++ b/src/Plugins/MEDReader/Test/testMEDReader4.py
@@ -69,9 +69,9 @@ testMEDReader4_med.AllArrays=['TS0/mesh/ComSup0/f0NoPfl@@][@@P1','TS0/mesh/ComSu
 #testMEDReader4_med.AllTimeSteps=['0000']
 
 Glyph1=Glyph(Input=testMEDReader4_med,GlyphType='Sphere')
-Glyph1.Scalars=['POINTS','f0NoPfl']
-Glyph1.ScaleFactor=0.3
-Glyph1.Vectors=['POINTS', '']
+Glyph1.ScaleArray=['POINTS','f0NoPfl']
+Glyph1.MaximumGlyphSize=0.3
+Glyph1.OrientationArray = ['POINTS', 'No orientation array']
 Glyph1.GlyphTransform="Transform2"
 
 DataRepresentation1 = Show()

diff --git a/src/Plugins/MEDReader/Test/testMEDReader6.py b/src/Plugins/MEDReader/Test/testMEDReader6.py
index 4027790ca1a42f4b58dc3ba526236642fe837665..2aa3a1f88cc34b30dd6823d63d7c99f495bcf854 100644 (file)
--- a/src/Plugins/MEDReader/Test/testMEDReader6.py
+++ b/src/Plugins/MEDReader/Test/testMEDReader6.py
@@ -70,8 +70,8 @@ ELGAfieldToPointGaussian1.SelectSourceArray = ['CELLS','ELGA@0']
 
 Glyph1 = Glyph( Input=ELGAfieldToPointGaussian1, GlyphType="Sphere", GlyphTransform="Transform2" )
 Glyph1.GlyphType = "Sphere"
-Glyph1.Vectors = ['POINTS', '']
-Glyph1.ScaleFactor = 0.29
+Glyph1.OrientationArray = ['POINTS', 'No orientation array']
+Glyph1.MaximumGlyphSize = 0.29
 
 RenderView1 = GetRenderView()
 RenderView1.CameraFocalPoint = [1.5, 1.5, 0.0]