Salome HOME
Merge branch 'agy/PV55'
authorAnthony Geay <anthony.geay@edf.fr>
Mon, 9 Jul 2018 11:04:44 +0000 (13:04 +0200)
committerAnthony Geay <anthony.geay@edf.fr>
Mon, 9 Jul 2018 11:04:44 +0000 (13:04 +0200)
1  2 
src/Plugins/MEDReader/Test/testMEDReader0.py
src/Plugins/MEDReader/Test/testMEDReader13.py
src/Plugins/MEDReader/Test/testMEDReader14.py
src/Plugins/MEDReader/Test/testMEDReader6.py

index a5e31ec00279b9bccee38fa202a12c55ada3a322,82af39049bd78aecc230d5926e0fbded840e64f0..214ab1986e12c1f0bcd26933473f5827e38cbb75
@@@ -105,8 -105,8 +105,8 @@@ DataRepresentation3.ColorArrayName = 'S
  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]
@@@ -130,6 -130,7 +130,7 @@@ except
    exit(1)
  baseline_file = os.path.join(baselinePath, "testMEDReader0.png")
  import vtk.test.Testing
+ from vtk.util.misc import vtkGetTempDir
  vtk.test.Testing.VTK_TEMP_DIR = vtk.util.misc.vtkGetTempDir()
  vtk.test.Testing.compareImage(GetActiveView().GetRenderWindow(), baseline_file,
                                                              threshold=1)
index 58a7a9c508431bc7f935a5d400ed9882be11c64c,8f580390c0fc6493689de95ba62aea7e8516a0b4..38920c58766066b9464c9ab79df2e8dd4624023c
@@@ -56,7 -56,7 +56,7 @@@ ELNOfieldToSurface3 = ELNOfieldToSurfac
  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']
@@@ -87,6 -87,7 +87,7 @@@ except
    exit(1)
  baseline_file = os.path.join(baselinePath, "testMEDReader13.png")
  import vtk.test.Testing
+ from vtk.util.misc import vtkGetTempDir
  vtk.test.Testing.VTK_TEMP_DIR = vtk.util.misc.vtkGetTempDir()
  vtk.test.Testing.compareImage(GetActiveView().GetRenderWindow(), baseline_file,
                                                              threshold=1)
index 83549cb8259a819e95b8fe9737c65ebf9fecb84b,3d4b785cc6b754dfc488796330ea3f3acce5f7d2..4939d1726a19de0de0561e991840de94932718d4
@@@ -133,7 -133,7 +133,7 @@@ renderView1=GetActiveViewOrCreate('Rend
  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
@@@ -170,6 -170,7 +170,7 @@@ except
    exit(1)
  baseline_file = os.path.join(baselinePath, "testMEDReader14.png")
  import vtk.test.Testing
+ from vtk.util.misc import vtkGetTempDir
  vtk.test.Testing.VTK_TEMP_DIR = vtk.util.misc.vtkGetTempDir()
  vtk.test.Testing.compareImage(renderView1.GetRenderWindow(), baseline_file,
                                                              threshold=1)
index ca6f636d6a3a215d7d68efbe982c79ac7cbb606a,fa24b7b89a958fc94162d844dddfc6e2ed766705..4027790ca1a42f4b58dc3ba526236642fe837665
@@@ -22,7 -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 +65,10 @@@ ExtractGroup1 = ExtractGroup(Input=myMe
  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
@@@ -106,6 -106,7 +106,7 @@@ except
    exit(1)
  baseline_file = os.path.join(baselinePath, "testMEDReader6.png")
  import vtk.test.Testing
+ from vtk.util.misc import vtkGetTempDir
  vtk.test.Testing.VTK_TEMP_DIR = vtk.util.misc.vtkGetTempDir()
  vtk.test.Testing.compareImage(GetActiveView().GetRenderWindow(), baseline_file,
                                                              threshold=1)