From 1db2d030906722076cc5ca1ee03a0ef65e4e7e60 Mon Sep 17 00:00:00 2001 From: Christophe Bourcier Date: Tue, 20 Oct 2020 16:32:23 +0200 Subject: [PATCH] Fix ELNO field treatment --- src/MEDCalc/cmp/MEDPresentation.cxx | 2 +- src/MEDCalc/test/tui/CMakeLists.txt | 1 + src/MEDCalc/test/tui/elno_field.py | 36 ++++++++++++++++++ .../test/tui/medfiles/portico_elno.med | Bin 0 -> 12586 bytes src/MEDCalc/test/tui/tests.set | 3 ++ 5 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 src/MEDCalc/test/tui/elno_field.py create mode 100644 src/MEDCalc/test/tui/medfiles/portico_elno.med diff --git a/src/MEDCalc/cmp/MEDPresentation.cxx b/src/MEDCalc/cmp/MEDPresentation.cxx index 2018c7aa2..0a82cffd4 100644 --- a/src/MEDCalc/cmp/MEDPresentation.cxx +++ b/src/MEDCalc/cmp/MEDPresentation.cxx @@ -333,7 +333,7 @@ MEDPresentation::createSource() { std::ostringstream oss, oss2; oss2 << "__srcObj" << GeneratePythonId(); - oss << oss2.str() << " = pvs.ELNOMesh(Input=" << _srcObjVar << ");"; + oss << oss2.str() << " = pvs.ELNOfieldToSurface(Input=" << _srcObjVar << ");"; pushAndExecPyLine(oss.str()); oss.str(""); // Now the source becomes the result of the CellDatatoPointData: _srcObjVar = oss2.str(); diff --git a/src/MEDCalc/test/tui/CMakeLists.txt b/src/MEDCalc/test/tui/CMakeLists.txt index bcc02a6f6..fbcb7c105 100644 --- a/src/MEDCalc/test/tui/CMakeLists.txt +++ b/src/MEDCalc/test/tui/CMakeLists.txt @@ -23,6 +23,7 @@ SET(_test_files medfiles/smooth_surface_and_field.med medfiles/agitateur.med medfiles/deplacements.med + medfiles/portico_elno.med ) SET(TEST_INSTALL_DIRECTORY ${SALOME_FIELDS_INSTALL_TEST}/MEDCalc/tui) diff --git a/src/MEDCalc/test/tui/elno_field.py b/src/MEDCalc/test/tui/elno_field.py new file mode 100644 index 000000000..69b6b7d1f --- /dev/null +++ b/src/MEDCalc/test/tui/elno_field.py @@ -0,0 +1,36 @@ +# Copyright (C) 2016-2020 CEA/DEN, EDF R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +import os +from time import sleep + +import medcalc +medcalc.medconsole.setConsoleGlobals(globals()) +import MEDCALC +from medcalc.medconsole import accessField + +from medcalc_testutils import GetMEDFileDirTUI + +datafile = os.path.join(GetMEDFileDirTUI(), "portico_elno.med") +source_id = medcalc.LoadDataSource(datafile) + +presentation_id = medcalc.MakeScalarMap(accessField(0), MEDCALC.VIEW_MODE_REPLACE, colorMap=MEDCALC.COLOR_MAP_BLUE_TO_RED_RAINBOW) +sleep(1) +medcalc.RemovePresentation(presentation_id) +sleep(1) diff --git a/src/MEDCalc/test/tui/medfiles/portico_elno.med b/src/MEDCalc/test/tui/medfiles/portico_elno.med new file mode 100644 index 0000000000000000000000000000000000000000..22d772523735999cf00d18de42ff3f8499e71d39 GIT binary patch literal 12586 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 Qbtw;5b}pTxKoJ!950X-T>;M1& literal 0 HcmV?d00001 diff --git a/src/MEDCalc/test/tui/tests.set b/src/MEDCalc/test/tui/tests.set index 03267553f..430ac9a64 100644 --- a/src/MEDCalc/test/tui/tests.set +++ b/src/MEDCalc/test/tui/tests.set @@ -21,6 +21,8 @@ SET(TEST_NAMES access_API load_file import_pvsimple +## These tests need a display to open a render window (paraview calls from python) +## Uncomment these lines to add the tests to the test suite and run them manually # scalar_map # contour # slices @@ -28,4 +30,5 @@ SET(TEST_NAMES # point_sprite # vector_field # deflection_shape +# elno_field ) -- 2.30.2