From ce448fed20e5463fb941deba689d286ee63b9b0a Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Tue, 4 Apr 2017 17:23:54 +0200 Subject: [PATCH] Renaming validated by C. Bourcier and A. Geay --- .../Resources/MEDReaderServer.xml | 8 ++--- src/Plugins/MEDReader/Test/testMEDReader0.py | 8 ++--- src/Plugins/MEDReader/Test/testMEDReader13.py | 2 +- src/Plugins/MEDReader/Test/testMEDReader14.py | 2 +- src/Plugins/MEDReader/Test/testMEDReader16.py | 30 +++++++++---------- src/Plugins/MEDReader/Test/testMEDReader17.py | 10 +++---- src/Plugins/MEDReader/Test/testMEDReader21.py | 2 +- src/Plugins/MEDReader/Test/testMEDReader6.py | 8 ++--- 8 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/Plugins/MEDReader/ParaViewPlugin/Resources/MEDReaderServer.xml b/src/Plugins/MEDReader/ParaViewPlugin/Resources/MEDReaderServer.xml index 23a46a39..314ece42 100644 --- a/src/Plugins/MEDReader/ParaViewPlugin/Resources/MEDReaderServer.xml +++ b/src/Plugins/MEDReader/ParaViewPlugin/Resources/MEDReaderServer.xml @@ -241,7 +241,7 @@ - + @@ -273,7 +273,7 @@ - + @@ -318,7 +318,7 @@ - + @@ -380,7 +380,7 @@ - + diff --git a/src/Plugins/MEDReader/Test/testMEDReader0.py b/src/Plugins/MEDReader/Test/testMEDReader0.py index d6c59d5b..98636d79 100644 --- a/src/Plugins/MEDReader/Test/testMEDReader0.py +++ b/src/Plugins/MEDReader/Test/testMEDReader0.py @@ -86,8 +86,8 @@ arr_name_with_dis=[elt.split("/")[-1] for elt in keys] arr_name=[elt.split(myMedReader.GetProperty("Separator").GetData())[0] for elt in arr_name_with_dis] myMedReader.AllArrays=keys RenderView1 = GetRenderView() -ELNOMesh1=ELNOMesh(Input=myMedReader) -ExtractGroup1=ExtractGroup(Input=ELNOMesh1) +ELNOfieldToSurface1=ELNOfieldToSurface(Input=myMedReader) +ExtractGroup1=ExtractGroup(Input=ELNOfieldToSurface1) ExtractGroup1.UpdatePipelineInformation() ExtractGroup1.AllGroups=['GRP_ba2','GRP_to1','GRP_web'] assert(isinstance(ExtractGroup1.GetProperty("MeshName")[0],str)) @@ -105,8 +105,8 @@ DataRepresentation3.ColorArrayName = 'SolutionSIEQ_ELNO' DataRepresentation3.LookupTable = a2_SolutionSIEQ_ELNO_PVLookupTable DataRepresentation3.Visibility = 1 # -GaussPoints1=GaussPoints(Input=ELNOMesh1) -GaussPoints1.SelectSourceArray=['CELLS','ELGA@0'] +ELGAfieldToPointSprite1=ELGAfieldToPointSprite(Input=ELNOfieldToSurface1) +ELGAfieldToPointSprite1.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 d19a774d..8ec827f5 100644 --- a/src/Plugins/MEDReader/Test/testMEDReader13.py +++ b/src/Plugins/MEDReader/Test/testMEDReader13.py @@ -51,7 +51,7 @@ RenderView1.CameraPosition = [1.0, 0.5, 10000.0] RenderView1.CameraPosition = [1.0, 0.5, 4.319751617610021] -ELNOMesh3 = ELNOMesh(Input=testMEDReader13_med) +ELNOfieldToSurface3 = ELNOfieldToSurface(Input=testMEDReader13_med) DataRepresentation2 = Show() #DataRepresentation2.ConstantRadius = 1.9999333620071411 diff --git a/src/Plugins/MEDReader/Test/testMEDReader14.py b/src/Plugins/MEDReader/Test/testMEDReader14.py index 6412f059..7cab54a4 100644 --- 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=GaussPoints(Input=reader) + gaussPoints=ELGAfieldToPointSprite(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 0252cb99..db2357c1 100644 --- 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 ELNOMesh and ELNOPoints do not behave correctly after the call of ExtractGroup""" +""" 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""" fname="testMEDReader16.med" @@ -50,11 +50,11 @@ reader.AllArrays=['TS0/Mesh/ComSup0/MyField@@][@@GSSNE'] ExtractGroup1 = ExtractGroup(Input=reader) ExtractGroup1.UpdatePipelineInformation() ExtractGroup1.AllGroups=["GRP_grp1"] -ELNOMesh1=ELNOMesh(Input=ExtractGroup1) -ELNOPoints1=ELNOPoints(Input=ExtractGroup1) -ELNOPoints1.SelectSourceArray=['ELNO@MyField'] -for elt in [ELNOMesh1,ELNOPoints1]: - elnoMesh=servermanager.Fetch(ELNOPoints1,0) +ELNOfieldToSurface1=ELNOfieldToSurface(Input=ExtractGroup1) +ELNOfieldToPointSprite1=ELNOfieldToPointSprite(Input=ExtractGroup1) +ELNOfieldToPointSprite1.SelectSourceArray=['ELNO@MyField'] +for elt in [ELNOfieldToSurface1,ELNOfieldToPointSprite1]: + elnoMesh=servermanager.Fetch(ELNOfieldToPointSprite1,0) vtkArrToTest=elnoMesh.GetBlock(0).GetPointData().GetArray("MyField") assert(vtkArrToTest.GetNumberOfTuples()==8) assert(vtkArrToTest.GetNumberOfComponents()==2) @@ -65,8 +65,8 @@ for elt in [ELNOMesh1,ELNOPoints1]: pass # ExtractGroup1.AllGroups=["GRP_grp2"] -for elt in [ELNOMesh1,ELNOPoints1]: - elnoMesh=servermanager.Fetch(ELNOMesh1) +for elt in [ELNOfieldToSurface1,ELNOfieldToPointSprite1]: + elnoMesh=servermanager.Fetch(ELNOfieldToSurface1) vtkArrToTest=elnoMesh.GetBlock(0).GetPointData().GetArray("MyField") assert(vtkArrToTest.GetNumberOfTuples()==8) assert(vtkArrToTest.GetNumberOfComponents()==2) @@ -77,8 +77,8 @@ for elt in [ELNOMesh1,ELNOPoints1]: 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 [ELNOMesh1,ELNOPoints1]: - elnoMesh=servermanager.Fetch(ELNOMesh1) +for elt in [ELNOfieldToSurface1,ELNOfieldToPointSprite1]: + elnoMesh=servermanager.Fetch(ELNOfieldToSurface1) vtkArrToTest=elnoMesh.GetBlock(0).GetPointData().GetArray("MyField") assert(vtkArrToTest.GetNumberOfTuples()==16) assert(vtkArrToTest.GetNumberOfComponents()==2) @@ -87,11 +87,11 @@ for elt in [ELNOMesh1,ELNOPoints1]: vals=[vtkArrToTest.GetValue(i) for i in xrange(32)] assert(arr2.isEqualWithoutConsideringStr(DataArrayDouble(vals,16,2),1e-12)) pass -ELNOMesh1=ELNOMesh(Input=reader) -ELNOPoints1=ELNOPoints(Input=reader) -ELNOPoints1.SelectSourceArray=['ELNO@MyField'] -for elt in [ELNOMesh1,ELNOPoints1]: - elnoMesh=servermanager.Fetch(ELNOMesh1) +ELNOfieldToSurface1=ELNOfieldToSurface(Input=reader) +ELNOfieldToPointSprite1=ELNOfieldToPointSprite(Input=reader) +ELNOfieldToPointSprite1.SelectSourceArray=['ELNO@MyField'] +for elt in [ELNOfieldToSurface1,ELNOfieldToPointSprite1]: + elnoMesh=servermanager.Fetch(ELNOfieldToSurface1) vtkArrToTest=elnoMesh.GetBlock(0).GetPointData().GetArray("MyField") assert(vtkArrToTest.GetNumberOfTuples()==16) assert(vtkArrToTest.GetNumberOfComponents()==2) diff --git a/src/Plugins/MEDReader/Test/testMEDReader17.py b/src/Plugins/MEDReader/Test/testMEDReader17.py index e1564ba5..0cef2423 100644 --- 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"] -ELNOPoints1=ELNOPoints(Input=ExtractGroup1) -ELNOPoints1.SelectSourceArray=['ELNO@MyField'] +ELNOfieldToPointSprite1=ELNOfieldToPointSprite(Input=ExtractGroup1) +ELNOfieldToPointSprite1.SelectSourceArray=['ELNO@MyField'] # -ELNOPoints1=ELNOPoints(Input=reader) -ELNOPoints1.SelectSourceArray=['ELNO@MyField'] -ExtractGroup1 = ExtractGroup(Input=ELNOPoints1) +ELNOfieldToPointSprite1=ELNOfieldToPointSprite(Input=reader) +ELNOfieldToPointSprite1.SelectSourceArray=['ELNO@MyField'] +ExtractGroup1 = ExtractGroup(Input=ELNOfieldToPointSprite1) ExtractGroup1.UpdatePipelineInformation() ExtractGroup1.AllGroups=["GRP_grp1"] ExtractGroup1.UpdatePipeline() diff --git a/src/Plugins/MEDReader/Test/testMEDReader21.py b/src/Plugins/MEDReader/Test/testMEDReader21.py index 1d9aa0b7..3b1ef16e 100644 --- a/src/Plugins/MEDReader/Test/testMEDReader21.py +++ b/src/Plugins/MEDReader/Test/testMEDReader21.py @@ -77,7 +77,7 @@ vtkBlockColorsLUT = GetColorTransferFunction('vtkBlockColors') vtkBlockColorsPWF = GetOpacityTransferFunction('vtkBlockColors') # create a new 'ELNO Mesh' -eLNOMesh1 = ELNOMesh(Input=testTotomed) +eLNOMesh1 = ELNOfieldToSurface(Input=testTotomed) # Properties modified on eLNOMesh1 eLNOMesh1.ShrinkFactor = 0.5 # <- test is here !!!!!!!! diff --git a/src/Plugins/MEDReader/Test/testMEDReader6.py b/src/Plugins/MEDReader/Test/testMEDReader6.py index 9b73ce29..35869ae4 100644 --- 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 GaussPoints +The aim of this test is to check that the ExtractGroup works well for ELGAfieldToPointSprite """ fname="testMEDReader6.med" @@ -65,10 +65,10 @@ ExtractGroup1 = ExtractGroup(Input=myMedReader) ExtractGroup1.UpdatePipelineInformation() ExtractGroup1.AllGroups = ['GRP_grp0'] -GaussPoints1 = GaussPoints(Input=ExtractGroup1) -GaussPoints1.SelectSourceArray = ['CELLS','ELGA@0'] +ELGAfieldToPointSprite1 = ELGAfieldToPointSprite(Input=ExtractGroup1) +ELGAfieldToPointSprite1.SelectSourceArray = ['CELLS','ELGA@0'] -Glyph1 = Glyph( Input=GaussPoints1, GlyphType="Sphere", GlyphTransform="Transform2" ) +Glyph1 = Glyph( Input=ELGAfieldToPointSprite1, GlyphType="Sphere", GlyphTransform="Transform2" ) Glyph1.GlyphType = "Sphere" Glyph1.Vectors = ['POINTS', ''] Glyph1.ScaleFactor = 0.29 -- 2.39.2