Point Sprite representation does not exist anymore -> Rename it Point Gaussian

diff --git a/src/Plugins/MEDReader/ParaViewPlugin/Resources/MEDReaderServer.xml b/src/Plugins/MEDReader/ParaViewPlugin/Resources/MEDReaderServer.xml
index 314ece421359c819fabc699ee71b491933af596e..807df5382d80977551fddb75c96dc9545307dcce 100644 (file)
--- a/src/Plugins/MEDReader/ParaViewPlugin/Resources/MEDReaderServer.xml
+++ b/src/Plugins/MEDReader/ParaViewPlugin/Resources/MEDReaderServer.xml
@@ -318,7 +318,7 @@
       </Hints>
     </SourceProxy>
 
-    <SourceProxy name="GaussPoints" class="vtkMEDQuadraturePointsGenerator" label="ELGA field To Point Sprite">
+    <SourceProxy name="GaussPoints" class="vtkMEDQuadraturePointsGenerator" label="ELGA field To Point Gaussian">
       <Documentation
         long_help="Create a point set with data at Gauss points."
         short_help="Create a point set with data at Gauss points.">
@@ -380,7 +380,7 @@
 
     </SourceProxy>
 
-    <SourceProxy name="ELNOPoints" class="vtkELNOFilter" label="ELNO field To Point Sprite">
+    <SourceProxy name="ELNOPoints" class="vtkELNOFilter" label="ELNO field To Point Gaussian">
       <Documentation
         long_help="Create a point set with data at ELNO points. Cells are shrinked by a given factor towards the cell center."
         short_help="Create a point set with data at ELNO points. Cells are shrinked by a given factor towards the cell center.">

diff --git a/src/Plugins/MEDReader/Test/testMEDReader0.py b/src/Plugins/MEDReader/Test/testMEDReader0.py
index edb3167673c7ee553a8b01c3f62c0502d6647596..a5e31ec00279b9bccee38fa202a12c55ada3a322 100644 (file)
--- a/src/Plugins/MEDReader/Test/testMEDReader0.py
+++ b/src/Plugins/MEDReader/Test/testMEDReader0.py
@@ -105,8 +105,8 @@ DataRepresentation3.ColorArrayName = 'SolutionSIEQ_ELNO'
 DataRepresentation3.LookupTable = a2_SolutionSIEQ_ELNO_PVLookupTable
 DataRepresentation3.Visibility = 1
 #
-ELGAfieldToPointSprite1=ELGAfieldToPointSprite(Input=ELNOfieldToSurface1)
-ELGAfieldToPointSprite1.SelectSourceArray=['CELLS','ELGA@0']
+ELGAfieldToPointGaussian1=ELGAfieldToPointGaussian(Input=ELNOfieldToSurface1)
+ELGAfieldToPointGaussian1.SelectSourceArray=['CELLS','ELGA@0']
 DataRepresentation4 = Show()
 DataRepresentation4.ScaleFactor = 0.008999999705702066
 DataRepresentation4.EdgeColor = [0.0, 0.0, 0.5000076295109483]

diff --git a/src/Plugins/MEDReader/Test/testMEDReader13.py b/src/Plugins/MEDReader/Test/testMEDReader13.py
index 01828c39072f52d6e7609f5fb0b7cbe69939088a..58a7a9c508431bc7f935a5d400ed9882be11c64c 100644 (file)
--- a/src/Plugins/MEDReader/Test/testMEDReader13.py
+++ b/src/Plugins/MEDReader/Test/testMEDReader13.py
@@ -56,7 +56,7 @@ ELNOfieldToSurface3 = ELNOfieldToSurface(Input=testMEDReader13_med)
 DataRepresentation2 = Show()
 #DataRepresentation2.ConstantRadius = 1.9999333620071411
 DataRepresentation2.EdgeColor = [0.0, 0.0, 0.5000076295109483]
-#DataRepresentation2.PointSpriteDefaultsInitialized = 1
+#DataRepresentation2.PointGaussianDefaultsInitialized = 1
 DataRepresentation2.SelectionPointFieldDataArrayName = 'fieldELNO'
 DataRepresentation2.SelectionCellFieldDataArrayName = 'FamilyIdCell'
 #DataRepresentation2.SelectInputVectors = ['POINTS', 'fieldELNO_Vector']

diff --git a/src/Plugins/MEDReader/Test/testMEDReader14.py b/src/Plugins/MEDReader/Test/testMEDReader14.py
index b9f2aaafa5d0d3ffb7922af3cacee60df3f13355..83549cb8259a819e95b8fe9737c65ebf9fecb84b 100644 (file)
--- a/src/Plugins/MEDReader/Test/testMEDReader14.py
+++ b/src/Plugins/MEDReader/Test/testMEDReader14.py
@@ -133,7 +133,7 @@ renderView1=GetActiveViewOrCreate('RenderView')
 for entry in [[ExpectedEntries[0]],[ExpectedEntries[1]],[ExpectedEntries[2],ExpectedEntries[3]],[ExpectedEntries[4]]]:
     reader=MEDReader(FileName=fname)
     reader.AllArrays=entry
-    gaussPoints=ELGAfieldToPointSprite(Input=reader)
+    gaussPoints=ELGAfieldToPointGaussian(Input=reader)
     gaussPoints.SelectSourceArray="ELGA@0"
     Show(gaussPoints,renderView1)
     pass

diff --git a/src/Plugins/MEDReader/Test/testMEDReader16.py b/src/Plugins/MEDReader/Test/testMEDReader16.py
index 68564261a1bb0c9ede38225de817d9dbec251f5c..fb9219c47d860925d44e722b712b56ebd178fd1d 100644 (file)
--- a/src/Plugins/MEDReader/Test/testMEDReader16.py
+++ b/src/Plugins/MEDReader/Test/testMEDReader16.py
@@ -21,7 +21,7 @@
 
 from MEDLoader import *
 
-""" This test is a non regression test of EDF8662 : This bug revealed that ELNOfieldToSurface and ELNOfieldToPointSprite do not behave correctly after the call of ExtractGroup"""
+""" This test is a non regression test of EDF8662 : This bug revealed that ELNOfieldToSurface and ELNOfieldToPointGaussian do not behave correctly after the call of ExtractGroup"""
 
 fname="testMEDReader16.med"
 
@@ -51,10 +51,10 @@ ExtractGroup1 = ExtractGroup(Input=reader)
 ExtractGroup1.UpdatePipelineInformation()
 ExtractGroup1.AllGroups=["GRP_grp1"]
 ELNOfieldToSurface1=ELNOfieldToSurface(Input=ExtractGroup1)
-ELNOfieldToPointSprite1=ELNOfieldToPointSprite(Input=ExtractGroup1)
-ELNOfieldToPointSprite1.SelectSourceArray=['ELNO@MyField']
-for elt in [ELNOfieldToSurface1,ELNOfieldToPointSprite1]:
-    elnoMesh=servermanager.Fetch(ELNOfieldToPointSprite1,0)
+ELNOfieldToPointGaussian1=ELNOfieldToPointGaussian(Input=ExtractGroup1)
+ELNOfieldToPointGaussian1.SelectSourceArray=['ELNO@MyField']
+for elt in [ELNOfieldToSurface1,ELNOfieldToPointGaussian1]:
+    elnoMesh=servermanager.Fetch(ELNOfieldToPointGaussian1,0)
     vtkArrToTest=elnoMesh.GetBlock(0).GetPointData().GetArray("MyField")
     assert(vtkArrToTest.GetNumberOfTuples()==8)
     assert(vtkArrToTest.GetNumberOfComponents()==2)
@@ -65,7 +65,7 @@ for elt in [ELNOfieldToSurface1,ELNOfieldToPointSprite1]:
     pass
 #
 ExtractGroup1.AllGroups=["GRP_grp2"]
-for elt in [ELNOfieldToSurface1,ELNOfieldToPointSprite1]:
+for elt in [ELNOfieldToSurface1,ELNOfieldToPointGaussian1]:
     elnoMesh=servermanager.Fetch(ELNOfieldToSurface1)
     vtkArrToTest=elnoMesh.GetBlock(0).GetPointData().GetArray("MyField")
     assert(vtkArrToTest.GetNumberOfTuples()==8)
@@ -77,7 +77,7 @@ for elt in [ELNOfieldToSurface1,ELNOfieldToPointSprite1]:
     pass
 # important to check that if all the field is present that it is OK (check of the optimization)
 ExtractGroup1.AllGroups=["GRP_grp3"]
-for elt in [ELNOfieldToSurface1,ELNOfieldToPointSprite1]:
+for elt in [ELNOfieldToSurface1,ELNOfieldToPointGaussian1]:
     elnoMesh=servermanager.Fetch(ELNOfieldToSurface1)
     vtkArrToTest=elnoMesh.GetBlock(0).GetPointData().GetArray("MyField")
     assert(vtkArrToTest.GetNumberOfTuples()==16)
@@ -88,9 +88,9 @@ for elt in [ELNOfieldToSurface1,ELNOfieldToPointSprite1]:
     assert(arr2.isEqualWithoutConsideringStr(DataArrayDouble(vals,16,2),1e-12))
     pass
 ELNOfieldToSurface1=ELNOfieldToSurface(Input=reader)
-ELNOfieldToPointSprite1=ELNOfieldToPointSprite(Input=reader)
-ELNOfieldToPointSprite1.SelectSourceArray=['ELNO@MyField']
-for elt in [ELNOfieldToSurface1,ELNOfieldToPointSprite1]:
+ELNOfieldToPointGaussian1=ELNOfieldToPointGaussian(Input=reader)
+ELNOfieldToPointGaussian1.SelectSourceArray=['ELNO@MyField']
+for elt in [ELNOfieldToSurface1,ELNOfieldToPointGaussian1]:
     elnoMesh=servermanager.Fetch(ELNOfieldToSurface1)
     vtkArrToTest=elnoMesh.GetBlock(0).GetPointData().GetArray("MyField")
     assert(vtkArrToTest.GetNumberOfTuples()==16)

diff --git a/src/Plugins/MEDReader/Test/testMEDReader17.py b/src/Plugins/MEDReader/Test/testMEDReader17.py
index fcd1f1d8b4911d936525cecf04fee0739bcb900f..7668e4d7fdd841628d9a04324358ca38fd833219 100644 (file)
--- a/src/Plugins/MEDReader/Test/testMEDReader17.py
+++ b/src/Plugins/MEDReader/Test/testMEDReader17.py
@@ -50,12 +50,12 @@ reader.AllArrays=['TS0/Mesh/ComSup0/MyField@@][@@GSSNE']
 ExtractGroup1 = ExtractGroup(Input=reader)
 ExtractGroup1.UpdatePipelineInformation()
 ExtractGroup1.AllGroups=["GRP_grp1"]
-ELNOfieldToPointSprite1=ELNOfieldToPointSprite(Input=ExtractGroup1)
-ELNOfieldToPointSprite1.SelectSourceArray=['ELNO@MyField']
+ELNOfieldToPointGaussian1=ELNOfieldToPointGaussian(Input=ExtractGroup1)
+ELNOfieldToPointGaussian1.SelectSourceArray=['ELNO@MyField']
 #
-ELNOfieldToPointSprite1=ELNOfieldToPointSprite(Input=reader)
-ELNOfieldToPointSprite1.SelectSourceArray=['ELNO@MyField']
-ExtractGroup1 = ExtractGroup(Input=ELNOfieldToPointSprite1)
+ELNOfieldToPointGaussian1=ELNOfieldToPointGaussian(Input=reader)
+ELNOfieldToPointGaussian1.SelectSourceArray=['ELNO@MyField']
+ExtractGroup1 = ExtractGroup(Input=ELNOfieldToPointGaussian1)
 ExtractGroup1.UpdatePipelineInformation()
 ExtractGroup1.AllGroups=["GRP_grp1"]
 ExtractGroup1.UpdatePipeline()

diff --git a/src/Plugins/MEDReader/Test/testMEDReader6.py b/src/Plugins/MEDReader/Test/testMEDReader6.py
index d5a9d0465c67d0c7da15ac813b94b7f3e9b54a5a..ca6f636d6a3a215d7d68efbe982c79ac7cbb606a 100644 (file)
--- a/src/Plugins/MEDReader/Test/testMEDReader6.py
+++ b/src/Plugins/MEDReader/Test/testMEDReader6.py
@@ -22,7 +22,7 @@
 from MEDLoader import *
 
 """ This test generate a GaussPoint field on a mesh with groups.
-The aim of this test is to check that the ExtractGroup works well for ELGAfieldToPointSprite
+The aim of this test is to check that the ExtractGroup works well for ELGAfieldToPointGaussian
 """
 
 fname="testMEDReader6.med"
@@ -65,10 +65,10 @@ ExtractGroup1 = ExtractGroup(Input=myMedReader)
 ExtractGroup1.UpdatePipelineInformation()
 ExtractGroup1.AllGroups = ['GRP_grp0']
 
-ELGAfieldToPointSprite1 = ELGAfieldToPointSprite(Input=ExtractGroup1)
-ELGAfieldToPointSprite1.SelectSourceArray = ['CELLS','ELGA@0']
+ELGAfieldToPointGaussian1 = ELGAfieldToPointGaussian(Input=ExtractGroup1)
+ELGAfieldToPointGaussian1.SelectSourceArray = ['CELLS','ELGA@0']
 
-Glyph1 = Glyph( Input=ELGAfieldToPointSprite1, GlyphType="Sphere", GlyphTransform="Transform2" )
+Glyph1 = Glyph( Input=ELGAfieldToPointGaussian1, GlyphType="Sphere", GlyphTransform="Transform2" )
 Glyph1.GlyphType = "Sphere"
 Glyph1.Vectors = ['POINTS', '']
 Glyph1.ScaleFactor = 0.29