From: eap Date: Mon, 6 Aug 2018 12:04:04 +0000 (+0300) Subject: 23582: [CEA] Rename MED module to FIELDS X-Git-Tag: V9_2_0a2~4 X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fmed.git;a=commitdiff_plain;h=a1c6c7c23dfa9ee3eed102b7b85b8183c3ee86e8;hp=8cf67f405062312f2544099554edd6991b39fd05 23582: [CEA] Rename MED module to FIELDS --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 119c07e55..787629c14 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR) INCLUDE(CMakeDependentOption) -PROJECT(SalomeMED C CXX) +PROJECT(SalomeFIELDS C CXX) # Ensure a proper linker behavior: CMAKE_POLICY(SET CMP0003 NEW) @@ -77,13 +77,13 @@ FIND_PACKAGE(SalomeOmniORB REQUIRED) # User options # ============ INCLUDE(CMakeDependentOption) -OPTION(SALOME_MED_ENABLE_PYTHON "Build PYTHON bindings." ON) -OPTION(SALOME_MED_WITH_FILE_EXAMPLES "Install examples of files containing meshes and fields of different formats." ON) -OPTION(SALOME_MED_WITH_QTTESTING "Build MED with QtTesting support." OFF) -OPTION(SALOME_USE_MPI "(Use MPI containers) - For MED this triggers the build of ParaMEDMEM." ${_default_MPI}) -OPTION(SALOME_BUILD_GUI "Build GUI of MED." ON) -OPTION(SALOME_BUILD_TESTS "Build MED tests." ON) -OPTION(SALOME_BUILD_DOC "Build MED doc." ON) +OPTION(SALOME_FIELDS_ENABLE_PYTHON "Build PYTHON bindings." ON) +OPTION(SALOME_FIELDS_WITH_FILE_EXAMPLES "Install examples of files containing meshes and fields of different formats." ON) +OPTION(SALOME_FIELDS_WITH_QTTESTING "Build FIELDS with QtTesting support." OFF) +OPTION(SALOME_USE_MPI "(Use MPI containers) - For FIELDS this triggers the build of ParaMEDMEM." ${_default_MPI}) +OPTION(SALOME_BUILD_GUI "Build GUI of FIELDS." ON) +OPTION(SALOME_BUILD_TESTS "Build FIELDS tests." ON) +OPTION(SALOME_BUILD_DOC "Build FIELDS doc." ON) # Find MEDCoupling (required) # ========================== @@ -125,16 +125,16 @@ IF(SALOME_BUILD_GUI) ENDIF() ENDIF(SALOME_BUILD_GUI) -IF(SALOME_MED_ENABLE_PYTHON) +IF(SALOME_FIELDS_ENABLE_PYTHON) FIND_PACKAGE(SalomePythonInterp) FIND_PACKAGE(SalomePythonLibs) FIND_PACKAGE(SalomeNumPySciPy) FIND_PACKAGE(SalomeSWIG) - SALOME_LOG_OPTIONAL_PACKAGE(PythonInterp SALOME_MED_ENABLE_PYTHON) - SALOME_LOG_OPTIONAL_PACKAGE(PythonLibs SALOME_MED_ENABLE_PYTHON) - SALOME_LOG_OPTIONAL_PACKAGE(SWIG SALOME_MED_ENABLE_PYTHON) + SALOME_LOG_OPTIONAL_PACKAGE(PythonInterp SALOME_FIELDS_ENABLE_PYTHON) + SALOME_LOG_OPTIONAL_PACKAGE(PythonLibs SALOME_FIELDS_ENABLE_PYTHON) + SALOME_LOG_OPTIONAL_PACKAGE(SWIG SALOME_FIELDS_ENABLE_PYTHON) FIND_PACKAGE(SalomeOmniORBPy REQUIRED) -ENDIF(SALOME_MED_ENABLE_PYTHON) +ENDIF(SALOME_FIELDS_ENABLE_PYTHON) IF(SALOME_BUILD_TESTS) ENABLE_TESTING() @@ -182,31 +182,31 @@ SET(SALOME_INSTALL_CMAKE salome_adm/cmake_files CACHE PATH "Install path: SALOME SET(SALOME_INSTALL_CMAKE_LOCAL adm_local/cmake_files CACHE PATH "Install path: local SALOME CMake files") -IF(SALOME_MED_ENABLE_PYTHON) +IF(SALOME_FIELDS_ENABLE_PYTHON) SET(_pydir lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) SET(SALOME_INSTALL_PYTHON ${_pydir}/salome CACHE PATH "Install path: SALOME Python stuff") SET(SALOME_INSTALL_PYTHON_SHARED ${SALOME_INSTALL_PYTHON}/shared_modules CACHE PATH "Install path: SALOME Python shared modules") -ENDIF(SALOME_MED_ENABLE_PYTHON) +ENDIF(SALOME_FIELDS_ENABLE_PYTHON) SET(SALOME_INSTALL_RES share/salome/resources CACHE PATH "Install path: SALOME resources") SET(SALOME_INSTALL_DOC share/doc/salome CACHE PATH "Install path: SALOME documentation") # Med specific: -SET(SALOME_MED_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/med" CACHE PATH "Install path: SALOME MED specific data") -SET(SALOME_MED_INSTALL_RES_SCRIPTS "${SALOME_INSTALL_RES}/med" CACHE PATH "Install path: SALOME MED specific scripts") -SET(SALOME_MED_INSTALL_TEST ${SALOME_INSTALL_BINS}/test) +SET(SALOME_FIELDS_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/fields" CACHE PATH "Install path: SALOME MED specific data") +SET(SALOME_FIELDS_INSTALL_RES_SCRIPTS "${SALOME_INSTALL_RES}/fields" CACHE PATH "Install path: SALOME MED specific scripts") +SET(SALOME_FIELDS_INSTALL_TEST ${SALOME_INSTALL_BINS}/test) MARK_AS_ADVANCED(SALOME_INSTALL_BINS SALOME_INSTALL_LIBS SALOME_INSTALL_IDLS SALOME_INSTALL_HEADERS) MARK_AS_ADVANCED(SALOME_INSTALL_SCRIPT_SCRIPTS SALOME_INSTALL_SCRIPT_DATA SALOME_INSTALL_SCRIPT_PYTHON) MARK_AS_ADVANCED(SALOME_INSTALL_APPLISKEL_SCRIPTS SALOME_INSTALL_APPLISKEL_PYTHON SALOME_INSTALL_CMAKE SALOME_INSTALL_CMAKE_LOCAL SALOME_INSTALL_RES) -MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED SALOME_MED_INSTALL_RES_DATA SALOME_MED_INSTALL_RES_SCRIPTS SALOME_INSTALL_DOC) +MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED SALOME_FIELDS_INSTALL_RES_DATA SALOME_FIELDS_INSTALL_RES_SCRIPTS SALOME_INSTALL_DOC) # Header configuration # ==================== SALOME_XVERSION(${PROJECT_NAME}) -SALOME_CONFIGURE_FILE(MED_version.h.in MED_version.h INSTALL ${SALOME_INSTALL_HEADERS}) +SALOME_CONFIGURE_FILE(FIELDS_version.h.in FIELDS_version.h INSTALL ${SALOME_INSTALL_HEADERS}) SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS}) # Accumulate environment variables for MED module @@ -233,7 +233,7 @@ ADD_SUBDIRECTORY(resources) # Application tests # ================= -INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${SALOME_MED_INSTALL_TEST} RENAME CTestTestfile.cmake) +INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${SALOME_FIELDS_INSTALL_TEST} RENAME CTestTestfile.cmake) # Configuration export # ==================== @@ -248,8 +248,8 @@ IF(SALOME_USE_MPI) ENDIF() LIST(APPEND _${PROJECT_NAME}_exposed_targets - medcouplingcorba medcouplingclient medcalculator MEDEngineCommon MEDFactoryEngine MEDEngine) -IF(SALOME_MED_ENABLE_PYTHON) + medcouplingcorba medcouplingclient medcalculator MEDEngineCommon MEDFactoryEngine FIELDSEngine) +IF(SALOME_FIELDS_ENABLE_PYTHON) LIST(APPEND _${PROJECT_NAME}_exposed_targets medcalculatorspython) ENDIF() diff --git a/FIELDS_version.h.in b/FIELDS_version.h.in new file mode 100644 index 000000000..06f8046ed --- /dev/null +++ b/FIELDS_version.h.in @@ -0,0 +1,48 @@ +// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// 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 +// + +// File : MED_version.h +// Author : Vadim SANDLER +// Module : SALOME +// +#if !defined(__FIELDS_VERSION_H__) +#define __FIELDS_VERSION_H__ + +/*! + Specify version of SALOME FIELDS module, as follows + + SALOMEFIELDS_VERSION_MAJOR : (integer) number identifying major version + SALOMEFIELDS_VERSION_MINOR : (integer) number identifying minor version + SALOMEFIELDS_VERSION_MAINTENANCE : (integer) number identifying maintenance version + SALOMEFIELDS_VERSION_STR : (string) complete version number "major.minor.maintenance" + SALOMEFIELDS_VERSION : (hex) complete version number (major << 16) + (minor << 8) + maintenance + SALOMEFIELDS_DEVELOPMENT : (integer) indicates development version when set to 1 +*/ + +#define SALOMEFIELDS_VERSION_MAJOR @SALOMEFIELDS_MAJOR_VERSION@ +#define SALOMEFIELDS_VERSION_MINOR @SALOMEFIELDS_MINOR_VERSION@ +#define SALOMEFIELDS_VERSION_MAINTENANCE @SALOMEFIELDS_PATCH_VERSION@ +#define SALOMEFIELDS_VERSION_STR "@SALOMEFIELDS_VERSION@" +#define SALOMEFIELDS_VERSION @SALOMEFIELDS_XVERSION@ +#define SALOMEFIELDS_DEVELOPMENT @SALOMEFIELDS_VERSION_DEV@ + +#endif // __FIELDS_VERSION_H__ diff --git a/MED_version.h.in b/MED_version.h.in deleted file mode 100644 index 1a0d10ecb..000000000 --- a/MED_version.h.in +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE -// -// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// 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 -// - -// File : MED_version.h -// Author : Vadim SANDLER -// Module : SALOME -// -#if !defined(__MED_VERSION_H__) -#define __MED_VERSION_H__ - -/*! - Specify version of SALOME MED module, as follows - - SALOMEMED_VERSION_MAJOR : (integer) number identifying major version - SALOMEMED_VERSION_MINOR : (integer) number identifying minor version - SALOMEMED_VERSION_MAINTENANCE : (integer) number identifying maintenance version - SALOMEMED_VERSION_STR : (string) complete version number "major.minor.maintenance" - SALOMEMED_VERSION : (hex) complete version number (major << 16) + (minor << 8) + maintenance - SALOMEMED_DEVELOPMENT : (integer) indicates development version when set to 1 -*/ - -#define SALOMEMED_VERSION_MAJOR @SALOMEMED_MAJOR_VERSION@ -#define SALOMEMED_VERSION_MINOR @SALOMEMED_MINOR_VERSION@ -#define SALOMEMED_VERSION_MAINTENANCE @SALOMEMED_PATCH_VERSION@ -#define SALOMEMED_VERSION_STR "@SALOMEMED_VERSION@" -#define SALOMEMED_VERSION @SALOMEMED_XVERSION@ -#define SALOMEMED_DEVELOPMENT @SALOMEMED_VERSION_DEV@ - -#endif // __MED_VERSION_H__ diff --git a/SalomeFIELDSConfig.cmake.in b/SalomeFIELDSConfig.cmake.in new file mode 100644 index 000000000..3fd0f6045 --- /dev/null +++ b/SalomeFIELDSConfig.cmake.in @@ -0,0 +1,140 @@ +# - Config file for the @PROJECT_NAME@ package +# It defines the following variables. +# Specific to the package @PROJECT_NAME@ itself: +# @PROJECT_NAME_UC@_ROOT_DIR_EXP - the root path of the installation providing this CMake file +# + +############################################################### +# Copyright (C) 2013-2016 CEA/DEN, EDF R&D, OPEN CASCADE +# +# 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 +# + +### Initialisation performed by CONFIGURE_PACKAGE_CONFIG_FILE: +@PACKAGE_INIT@ + +# Load the dependencies for the libraries of @PROJECT_NAME@ +# (contains definitions for IMPORTED targets). This is only +# imported if we are not built as a subproject (in this case targets are already there) +IF(NOT TARGET MEDFactoryEngine AND NOT @PROJECT_NAME@_BINARY_DIR) + INCLUDE("@PACKAGE_SALOME_INSTALL_CMAKE_LOCAL@/@PROJECT_NAME@Targets.cmake") +ENDIF() + +# Package root dir: +SET_AND_CHECK(FIELDS_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@") + +# Include directories and definitions +SET_AND_CHECK(FIELDS_INCLUDE_DIRS "${FIELDS_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@") +SET(FIELDS_INCLUDE_DIRS "${FIELDS_INCLUDE_DIRS};@_SalomeFIELDS_EXTRA_HEADERS@") +SET(FIELDS_DEFINITIONS) + +# Package specific environment variables +@_SalomeFIELDS_EXTRA_ENV_FULL@ + +#### Now the specificities + +# Options exported by the package: +SET(SALOME_FIELDS_ENABLE_PYTHON @SALOME_FIELDS_ENABLE_PYTHON@) +SET(SALOME_USE_MPI @SALOME_USE_MPI@) +SET(SALOME_FIELDS_BUILD_DOC @SALOME_BUILD_DOC@) +SET(SALOME_FIELDS_BUILD_TESTS @SALOME_BUILD_TESTS@) +SET(SALOME_FIELDS_BUILD_GUI @SALOME_BUILD_GUI@) + +# Advanced options + +# Level 1 prerequisites: + +# Optional level 1 prerequisites: +SET_AND_CHECK(KERNEL_ROOT_DIR_EXP "@PACKAGE_KERNEL_ROOT_DIR@") +LIST(APPEND FIELDS_DEFINITIONS "@KERNEL_DEFINITIONS@") +IF(SALOME_FIELDS_BUILD_GUI) + SET_AND_CHECK(GUI_ROOT_DIR_EXP "@PACKAGE_GUI_ROOT_DIR@") + LIST(APPEND FIELDS_DEFINITIONS "@GUI_DEFINITIONS@") +ENDIF(SALOME_FIELDS_BUILD_GUI) + +# For all prerequisites, load the corresponding targets if the package was used +# in CONFIG mode. This ensures dependent projects link correctly +# without having to set LD_LIBRARY_PATH: +SET(_PREREQ_@PROJECT_NAME@ @_PREREQ_LIST@) +SET(_PREREQ_@PROJECT_NAME@_CONFIG_DIR @_PREREQ_DIR_LIST@) +SET(_PREREQ_@PROJECT_NAME@_COMPONENTS "@_PREREQ_COMPO_LIST@") +LIST(LENGTH _PREREQ_@PROJECT_NAME@_CONFIG_DIR _list_len_@PROJECT_NAME@) +IF(NOT _list_len_@PROJECT_NAME@ EQUAL 0) + # Another CMake stupidity - FOREACH(... RANGE r) generates r+1 numbers ... + MATH(EXPR _range_@PROJECT_NAME@ "${_list_len_@PROJECT_NAME@}-1") + FOREACH(_p_@PROJECT_NAME@ RANGE ${_range_@PROJECT_NAME@}) + LIST(GET _PREREQ_@PROJECT_NAME@ ${_p_@PROJECT_NAME@} _pkg_@PROJECT_NAME@ ) + LIST(GET _PREREQ_@PROJECT_NAME@_CONFIG_DIR ${_p_@PROJECT_NAME@} _pkg_dir_@PROJECT_NAME@) + LIST(GET _PREREQ_@PROJECT_NAME@_COMPONENTS ${_p_@PROJECT_NAME@} _pkg_compo_@PROJECT_NAME@) + IF(NOT OMIT_DETECT_PACKAGE_${_pkg_@PROJECT_NAME@}) + MESSAGE(STATUS "===> Reloading targets from ${_pkg_@PROJECT_NAME@} ...") + IF(NOT _pkg_compo_@PROJECT_NAME@) + FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE + PATHS "${_pkg_dir_@PROJECT_NAME@}" + NO_DEFAULT_PATH) + ELSE() + STRING(REPLACE "," ";" _compo_lst_@PROJECT_NAME@ "${_pkg_compo_@PROJECT_NAME@}") + MESSAGE(STATUS "===> (components: ${_pkg_compo_@PROJECT_NAME@})") + FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE + COMPONENTS ${_compo_lst_@PROJECT_NAME@} + PATHS "${_pkg_dir_@PROJECT_NAME@}" + NO_DEFAULT_PATH) + ENDIF() + ENDIF() + ENDFOREACH() +ENDIF() + +# Installation directories +SET(SALOME_INSTALL_BINS "@SALOME_INSTALL_BINS@") +SET(SALOME_INSTALL_LIBS "@SALOME_INSTALL_LIBS@") +SET(SALOME_INSTALL_IDLS "@SALOME_INSTALL_IDLS@") +SET(SALOME_INSTALL_HEADERS "@SALOME_INSTALL_HEADERS@") +SET(SALOME_INSTALL_SCRIPT_SCRIPTS "@SALOME_INSTALL_SCRIPT_SCRIPTS@") +SET(SALOME_INSTALL_SCRIPT_DATA "@SALOME_INSTALL_SCRIPT_DATA@") +SET(SALOME_INSTALL_SCRIPT_PYTHON "@SALOME_INSTALL_SCRIPT_PYTHON@") +SET(SALOME_INSTALL_APPLISKEL_SCRIPTS "@SALOME_INSTALL_APPLISKEL_SCRIPTS@") +SET(SALOME_INSTALL_APPLISKEL_PYTHON "@SALOME_INSTALL_APPLISKEL_PYTHON@") +SET(SALOME_INSTALL_CMAKE "@SALOME_INSTALL_CMAKE@") +SET(SALOME_INSTALL_CMAKE_LOCAL "@SALOME_INSTALL_CMAKE_LOCAL@") +SET(SALOME_INSTALL_PYTHON "@SALOME_INSTALL_PYTHON@") +SET(SALOME_INSTALL_PYTHON_SHARED "@SALOME_INSTALL_PYTHON_SHARED@") +SET(SALOME_INSTALL_RES "@SALOME_INSTALL_RES@") + +IF(SALOME_FIELDS_BUILD_GUI) + # Include GUI targets if they were not already loaded: + INCLUDE("${GUI_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE_LOCAL}/SalomeGUITargets.cmake") +ELSE(SALOME_FIELDS_BUILD_GUI) + # Include KERNEL targets if they were not already loaded: + IF(NOT (TARGET SALOMEBasics)) + INCLUDE("${KERNEL_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeKERNELTargets.cmake") + ENDIF() +ENDIF(SALOME_FIELDS_BUILD_GUI) + +# Exposed FIELDS targets: +SET(FIELDS_paramedcouplingcorba paramedcouplingcorba) +SET(FIELDS_paramedmemcompo paramedmemcompo) +SET(FIELDS_SalomeIDLMED SalomeIDLMED) +SET(FIELDS_SalomeIDLMEDTests SalomeIDLMEDTests) +SET(FIELDS_medcouplingcorba medcouplingcorba) +SET(FIELDS_medcouplingclient medcouplingclient) +SET(FIELDS_medcalculator medcalculator) +SET(FIELDS_medcalculatorspython medcalculatorspython) +SET(FIELDS_MEDEngineCommon MEDEngineCommon) +SET(FIELDS_MEDFactoryEngine MEDFactoryEngine) +SET(FIELDS_FIELDSEngine FIELDSEngine) +SET(FIELDS_MEDCALCGUI_dialogs MEDCALCGUI_dialogs) +SET(FIELDS_MEDCALCGUI MEDCALCGUI) diff --git a/SalomeMEDConfig.cmake.in b/SalomeMEDConfig.cmake.in deleted file mode 100644 index 400c014d4..000000000 --- a/SalomeMEDConfig.cmake.in +++ /dev/null @@ -1,140 +0,0 @@ -# - Config file for the @PROJECT_NAME@ package -# It defines the following variables. -# Specific to the package @PROJECT_NAME@ itself: -# @PROJECT_NAME_UC@_ROOT_DIR_EXP - the root path of the installation providing this CMake file -# - -############################################################### -# Copyright (C) 2013-2016 CEA/DEN, EDF R&D, OPEN CASCADE -# -# 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 -# - -### Initialisation performed by CONFIGURE_PACKAGE_CONFIG_FILE: -@PACKAGE_INIT@ - -# Load the dependencies for the libraries of @PROJECT_NAME@ -# (contains definitions for IMPORTED targets). This is only -# imported if we are not built as a subproject (in this case targets are already there) -IF(NOT TARGET MEDFactoryEngine AND NOT @PROJECT_NAME@_BINARY_DIR) - INCLUDE("@PACKAGE_SALOME_INSTALL_CMAKE_LOCAL@/@PROJECT_NAME@Targets.cmake") -ENDIF() - -# Package root dir: -SET_AND_CHECK(MED_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@") - -# Include directories and definitions -SET_AND_CHECK(MED_INCLUDE_DIRS "${MED_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@") -SET(MED_INCLUDE_DIRS "${MED_INCLUDE_DIRS};@_SalomeMED_EXTRA_HEADERS@") -SET(MED_DEFINITIONS) - -# Package specific environment variables -@_SalomeMED_EXTRA_ENV_FULL@ - -#### Now the specificities - -# Options exported by the package: -SET(SALOME_MED_ENABLE_PYTHON @SALOME_MED_ENABLE_PYTHON@) -SET(SALOME_USE_MPI @SALOME_USE_MPI@) -SET(SALOME_MED_BUILD_DOC @SALOME_BUILD_DOC@) -SET(SALOME_MED_BUILD_TESTS @SALOME_BUILD_TESTS@) -SET(SALOME_MED_BUILD_GUI @SALOME_BUILD_GUI@) - -# Advanced options - -# Level 1 prerequisites: - -# Optional level 1 prerequisites: -SET_AND_CHECK(KERNEL_ROOT_DIR_EXP "@PACKAGE_KERNEL_ROOT_DIR@") -LIST(APPEND MED_DEFINITIONS "@KERNEL_DEFINITIONS@") -IF(SALOME_MED_BUILD_GUI) - SET_AND_CHECK(GUI_ROOT_DIR_EXP "@PACKAGE_GUI_ROOT_DIR@") - LIST(APPEND MED_DEFINITIONS "@GUI_DEFINITIONS@") -ENDIF(SALOME_MED_BUILD_GUI) - -# For all prerequisites, load the corresponding targets if the package was used -# in CONFIG mode. This ensures dependent projects link correctly -# without having to set LD_LIBRARY_PATH: -SET(_PREREQ_@PROJECT_NAME@ @_PREREQ_LIST@) -SET(_PREREQ_@PROJECT_NAME@_CONFIG_DIR @_PREREQ_DIR_LIST@) -SET(_PREREQ_@PROJECT_NAME@_COMPONENTS "@_PREREQ_COMPO_LIST@") -LIST(LENGTH _PREREQ_@PROJECT_NAME@_CONFIG_DIR _list_len_@PROJECT_NAME@) -IF(NOT _list_len_@PROJECT_NAME@ EQUAL 0) - # Another CMake stupidity - FOREACH(... RANGE r) generates r+1 numbers ... - MATH(EXPR _range_@PROJECT_NAME@ "${_list_len_@PROJECT_NAME@}-1") - FOREACH(_p_@PROJECT_NAME@ RANGE ${_range_@PROJECT_NAME@}) - LIST(GET _PREREQ_@PROJECT_NAME@ ${_p_@PROJECT_NAME@} _pkg_@PROJECT_NAME@ ) - LIST(GET _PREREQ_@PROJECT_NAME@_CONFIG_DIR ${_p_@PROJECT_NAME@} _pkg_dir_@PROJECT_NAME@) - LIST(GET _PREREQ_@PROJECT_NAME@_COMPONENTS ${_p_@PROJECT_NAME@} _pkg_compo_@PROJECT_NAME@) - IF(NOT OMIT_DETECT_PACKAGE_${_pkg_@PROJECT_NAME@}) - MESSAGE(STATUS "===> Reloading targets from ${_pkg_@PROJECT_NAME@} ...") - IF(NOT _pkg_compo_@PROJECT_NAME@) - FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE - PATHS "${_pkg_dir_@PROJECT_NAME@}" - NO_DEFAULT_PATH) - ELSE() - STRING(REPLACE "," ";" _compo_lst_@PROJECT_NAME@ "${_pkg_compo_@PROJECT_NAME@}") - MESSAGE(STATUS "===> (components: ${_pkg_compo_@PROJECT_NAME@})") - FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE - COMPONENTS ${_compo_lst_@PROJECT_NAME@} - PATHS "${_pkg_dir_@PROJECT_NAME@}" - NO_DEFAULT_PATH) - ENDIF() - ENDIF() - ENDFOREACH() -ENDIF() - -# Installation directories -SET(SALOME_INSTALL_BINS "@SALOME_INSTALL_BINS@") -SET(SALOME_INSTALL_LIBS "@SALOME_INSTALL_LIBS@") -SET(SALOME_INSTALL_IDLS "@SALOME_INSTALL_IDLS@") -SET(SALOME_INSTALL_HEADERS "@SALOME_INSTALL_HEADERS@") -SET(SALOME_INSTALL_SCRIPT_SCRIPTS "@SALOME_INSTALL_SCRIPT_SCRIPTS@") -SET(SALOME_INSTALL_SCRIPT_DATA "@SALOME_INSTALL_SCRIPT_DATA@") -SET(SALOME_INSTALL_SCRIPT_PYTHON "@SALOME_INSTALL_SCRIPT_PYTHON@") -SET(SALOME_INSTALL_APPLISKEL_SCRIPTS "@SALOME_INSTALL_APPLISKEL_SCRIPTS@") -SET(SALOME_INSTALL_APPLISKEL_PYTHON "@SALOME_INSTALL_APPLISKEL_PYTHON@") -SET(SALOME_INSTALL_CMAKE "@SALOME_INSTALL_CMAKE@") -SET(SALOME_INSTALL_CMAKE_LOCAL "@SALOME_INSTALL_CMAKE_LOCAL@") -SET(SALOME_INSTALL_PYTHON "@SALOME_INSTALL_PYTHON@") -SET(SALOME_INSTALL_PYTHON_SHARED "@SALOME_INSTALL_PYTHON_SHARED@") -SET(SALOME_INSTALL_RES "@SALOME_INSTALL_RES@") - -IF(SALOME_MED_BUILD_GUI) - # Include GUI targets if they were not already loaded: - INCLUDE("${GUI_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE_LOCAL}/SalomeGUITargets.cmake") -ELSE(SALOME_MED_BUILD_GUI) - # Include KERNEL targets if they were not already loaded: - IF(NOT (TARGET SALOMEBasics)) - INCLUDE("${KERNEL_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeKERNELTargets.cmake") - ENDIF() -ENDIF(SALOME_MED_BUILD_GUI) - -# Exposed MED targets: -SET(MED_paramedcouplingcorba paramedcouplingcorba) -SET(MED_paramedmemcompo paramedmemcompo) -SET(MED_SalomeIDLMED SalomeIDLMED) -SET(MED_SalomeIDLMEDTests SalomeIDLMEDTests) -SET(MED_medcouplingcorba medcouplingcorba) -SET(MED_medcouplingclient medcouplingclient) -SET(MED_medcalculator medcalculator) -SET(MED_medcalculatorspython medcalculatorspython) -SET(MED_MEDEngineCommon MEDEngineCommon) -SET(MED_MEDFactoryEngine MEDFactoryEngine) -SET(MED_MEDEngine MEDEngine) -SET(MED_MEDCALCGUI_dialogs MEDCALCGUI_dialogs) -SET(MED_MEDCALCGUI MEDCALCGUI) diff --git a/VERSION.in b/VERSION.in index 2d9a4e3fa..5a8446247 100755 --- a/VERSION.in +++ b/VERSION.in @@ -1,3 +1,3 @@ -[SALOME MED] : @SALOMEMED_VERSION@ -[DEVELOPMENT] : @SALOMEMED_VERSION_DEV@ -[DESCRIPTION] : SALOME Med module +[SALOME FIELDS] : @SALOMEFIELDS_VERSION@ +[DEVELOPMENT] : @SALOMEFIELDS_VERSION_DEV@ +[DESCRIPTION] : SALOME FIELDS module diff --git a/doc/dev/sphinx/CMakeLists.txt b/doc/dev/sphinx/CMakeLists.txt index 6dded64fd..65c418da7 100644 --- a/doc/dev/sphinx/CMakeLists.txt +++ b/doc/dev/sphinx/CMakeLists.txt @@ -25,7 +25,7 @@ SALOME_GENERATE_ENVIRONMENT_SCRIPT(_cmd env_script "${SPHINX_EXECUTABLE}" "${_cm ADD_CUSTOM_TARGET(dev_docs ALL COMMAND ${_cmd}) #INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target dev_docs)") -INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ DESTINATION ${SALOME_INSTALL_DOC}/dev/MED) +INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ DESTINATION ${SALOME_INSTALL_DOC}/dev/FIELDS) SET(make_clean_files html doctrees) SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${make_clean_files}") diff --git a/doc/dev/sphinx/conf.py.in b/doc/dev/sphinx/conf.py.in index acbf1ff2d..ae9b6d7e0 100644 --- a/doc/dev/sphinx/conf.py.in +++ b/doc/dev/sphinx/conf.py.in @@ -47,7 +47,7 @@ source_encoding = 'utf-8' master_doc = 'index' # General information about the project. -project = 'MED, Manipulation de champs dans SALOME' +project = 'FIELDS, Manipulation de champs dans SALOME' copyright = '2010-2017 CEA/DEN, EDF R&D, OPEN CASCADE, G. Boulant, A. Geay' # The version info for the project you're documenting, acts as replacement for @@ -55,9 +55,9 @@ copyright = '2010-2017 CEA/DEN, EDF R&D, OPEN CASCADE, G. Boulant, A. Geay' # built documents. # # The short X.Y version. -version = '@SALOMEMED_VERSION@' +version = '@SALOMEFIELDS_VERSION@' # The full version, including alpha/beta/rc tags. -release = '@SALOMEMED_VERSION@' +release = '@SALOMEFIELDS_VERSION@' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -194,10 +194,10 @@ latex_elements = { # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, document class [howto/manual]). latex_documents = [ - ('index', 'medcalc-alldoc.tex', 'Documentation du module MED', 'G. Boulant', 'manual'), - ('medcalc-specifications', 'medcalc-specifications.tex', 'Module MED - Specifications', 'G. Boulant', 'manual'), - ('medcalc-develguide', 'medcalc-develguide.tex', 'Module MED - Guide de developpement', 'G. Boulant', 'manual'), - ('medcalc-userguide-gui', 'medcalc-userguide-gui.tex', 'Module MED - Guide d\'utilisation de l\'interface graphique', 'G. Boulant', 'howto'), + ('index', 'medcalc-alldoc.tex', 'Documentation du module FIELDS', 'G. Boulant', 'manual'), + ('medcalc-specifications', 'medcalc-specifications.tex', 'Module FIELDS - Specifications', 'G. Boulant', 'manual'), + ('medcalc-develguide', 'medcalc-develguide.tex', 'Module FIELDS - Guide de developpement', 'G. Boulant', 'manual'), + ('medcalc-userguide-gui', 'medcalc-userguide-gui.tex', 'Module FIELDS - Guide d\'utilisation de l\'interface graphique', 'G. Boulant', 'howto'), ('medcalc-userguide-api', 'medcalc-userguide-api.tex', 'MEDMEM library - Starter guide for users', 'G. Boulant', 'howto') ] diff --git a/doc/dev/sphinx/fr/index.rst b/doc/dev/sphinx/fr/index.rst index 8d2939d2e..4f4ef14f1 100644 --- a/doc/dev/sphinx/fr/index.rst +++ b/doc/dev/sphinx/fr/index.rst @@ -1,9 +1,9 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%% - Documentation du module MED + Documentation du module FIELDS %%%%%%%%%%%%%%%%%%%%%%%%%%%% -Le module SALOME MED (pour Modèle d'Echange de Données) fournit la +Le module SALOME FIELDS (pour Modèle d'Echange de Données) fournit la bibliothèque MEDCoupling (bibliothèque C++ dédiée à la manipulation de maillages et de champs conformes au modèle MED), ainsi qu'une interface graphique pour la réalisation des opérations de manipulation diff --git a/doc/dev/sphinx/fr/medcalc-develguide.rst b/doc/dev/sphinx/fr/medcalc-develguide.rst index 42289dc84..dc1019cd6 100644 --- a/doc/dev/sphinx/fr/medcalc-develguide.rst +++ b/doc/dev/sphinx/fr/medcalc-develguide.rst @@ -5,14 +5,14 @@ .. include:: medcalc-definitions.rst %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -Module MED: Guide de développement du composant MEDCalc +Module FIELDS: Guide de développement du composant MEDCalc %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -Le composant logiciel MEDCalc est un élément du module MED. Il fournit +Le composant logiciel MEDCalc est un élément du module FIELDS. Il fournit une interface utilisateur pour la manipulation de maillages et de champs, composée d'une interface texte (TUI) et d'une interface graphique (GUI). L'interface graphique constitue l'interface graphique -du module MED. +du module FIELDS. Ce document est la documentation technique du composant MEDCalc. Il fournit les instructions à suivre pour installer le composant en vue @@ -28,10 +28,10 @@ Mise en place de l'espace de développement Gestion de configuration du composant MEDCalc --------------------------------------------- -Le composant logiciel MEDCalc est un package du module SALOME MED, +Le composant logiciel MEDCalc est un package du module SALOME FIELDS, hébergé dans l'espace source au niveau du sous-répertoire `src/MEDCalc`. La gestion des fichiers sources est donc intégrée dans le -module SALOME MED. +module SALOME FIELDS. Organisation des sources du composant MEDCalc --------------------------------------------- @@ -42,7 +42,7 @@ suivants: * cmp: package containing the SALOME components * tui: package containing the python user interface * gui: package containing the graphical user interface (the GUI part - of the MED module) + of the FIELDS module) * res: resources files associated to the MEDCalc package (icons, config files, data files, ...) * exe: additional executable programs that can be launched from the @@ -51,7 +51,7 @@ suivants: Construction du composant MEDCalc --------------------------------- -Intégré à la construction du module MED. Le composant MEDCalc dépend de +Intégré à la construction du module FIELDS. Le composant MEDCalc dépend de MEDCoupling et MEDLoader uniquement. Exécution des tests unitaires du composant MEDCalc @@ -61,7 +61,7 @@ Les tests unitaires peuvent être exécutés au moyen de scripts python lancés depuis une session shell SALOME. Dans un nouveau shell, taper:: $ ./appli/runSession - [NS=mars:2810]$ python appli/bin/salome/med/test_medcalc_components.py + [NS=mars:2810]$ python appli/bin/salome/fields/test_medcalc_components.py L'exécution imprime un rapport détaillant le résultat pour chaque fonction de test:: @@ -80,21 +80,21 @@ fonction de test:: test_saveFields (__main__.MyTestSuite) ... ok test_updateFieldMetadata (__main__.MyTestSuite) ... ok -Les scripts de test sont installés dans le répertoire ``bin/med``. On trouve: +Les scripts de test sont installés dans le répertoire ``bin/fields``. On trouve: * ``test_medcalc_components.py``: test les composants SALOME développés pour la manipulation de champs (``MEDDataManager`` et ``MEDCalculator``). * ``test_xmed_fieldOperations.py``: test des operations de champs telles qu'elles sont mises en oeuvre depuis l'interface textuelle. * ``test_xmed_uiEventListener.py``: test du système de notification - d'évènements des composants vers la partie gui du module MED. + d'évènements des composants vers la partie gui du module FIELDS. * ``test_xmed_visualisation.py``: test du système de visualisation - des champs tel que piloté depuis le module MED. + des champs tel que piloté depuis le module FIELDS. Architecture du module XMED =========================== -Le module MED pour la manipulation de champs est composé de: +Le module FIELDS pour la manipulation de champs est composé de: * une bibliothèque de fonctions pour le traitement de données sur des maillages et des champs conformes au modèle MED (package @@ -212,7 +212,7 @@ ANNEXE B: Traçabilité avec le module XMED ========================================= Le module SALOME de nom XMED est l'espace de développement initial du -composant logiciel MEDCalc, intégré aujourd'hui au module MED. Cette +composant logiciel MEDCalc, intégré aujourd'hui au module FIELDS. Cette annexe est la notice technique de ce module, qui reste disponible mais qui n'est plus maintenu. diff --git a/doc/dev/sphinx/fr/medcalc-specifications.rst b/doc/dev/sphinx/fr/medcalc-specifications.rst index 2823a965f..656fd9b17 100644 --- a/doc/dev/sphinx/fr/medcalc-specifications.rst +++ b/doc/dev/sphinx/fr/medcalc-specifications.rst @@ -5,7 +5,7 @@ .. include:: medcalc-definitions.rst %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -Module MED: Spécifications fonctionnelles et techniques +Module FIELDS: Spécifications fonctionnelles et techniques %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Ce texte présente les spécifications informatiques pour le @@ -278,7 +278,7 @@ informatiques correspondant aux maillages sont différents (chargés de deux fichiers différents). En l'état, il est donc impossible par exemple de faire la comparaison de champs résultats d'une étude paramétriques. MEDCoupling fournit une solution qu'il faudra mettre en -oeuvre de manière ergonomique au niveau du module MED. Il est possible +oeuvre de manière ergonomique au niveau du module FIELDS. Il est possible de changer le maillage support M1 d'un champs par un maillage M2 à partir du moment où les maillages M1 et M2 sont identiques géométriquement à une erreur près qu'il est possible de spécifier. @@ -756,7 +756,7 @@ Sur cette base, on peut envisager une grande variété de cas d'utilisation: Spécification des fonctions de visualisation ============================================ -Dans le cadre du module MED, on appelle *fonction de visualisation* +Dans le cadre du module FIELDS, on appelle *fonction de visualisation* une fonction qui permet d'avoir un aperçu graphique d'un champ, par exemple au moyen d'une carte de champ construite sur une de ses composante. Il s'agit là de vue de contrôle pour avoir une idée rapide @@ -765,9 +765,9 @@ préférera passer par les fonctions d'export vers le module PARAVIS. Les modules VISU et PARAVIS offre des interface de programmation C++ et python qui permettent le pilotage depuis un module tiers comme le -module MED. On peut donc envisager une fonction de visualisation +module FIELDS. On peut donc envisager une fonction de visualisation intégrée au module de manipulation de champs, c'est-à-dire que l'on -déclenche sans sortir du module MED, et qui exploite les fonctions de +déclenche sans sortir du module FIELDS, et qui exploite les fonctions de visualisation des modules VISU et/ou PARAVIS. Les captures d'écran ci-dessous illustrent la mise en oeuvre de la @@ -812,7 +812,7 @@ On adopte le principe de fonctionnement suivant: c’est-à-dire qu’il ne permet pas la sauvegarde du travail dans une étude au format hdf, ni le dump sous la forme de script python SALOME. Le besoin n'est pas avéré et on peut même dire que ça n'a - pas de sens compte-tenu de l'usage envisagé pour le module MED. + pas de sens compte-tenu de l'usage envisagé pour le module FIELDS. * Par contre, le module fournit des fonctions de sauvegarde du travail sous forme de fichiers med, l’export vers les modules VISU et PARAVIZ, ou même la sauvegarde de l’historique de l’interface de @@ -831,7 +831,7 @@ Plusieurs export peuvent être proposés: * Export des champs vers le module PARAVIZ, dans l'objectif par exemple d'en faire une analyse visuelle plus poussée qu'avec les - cartes de champs disponibles par défaut dans le module MED + cartes de champs disponibles par défaut dans le module FIELDS * Export des données sous forme de tableau numpy, par exemple pour permettre un travail algorithmique sur les valeurs des champs. @@ -839,12 +839,12 @@ Spécifications techniques ========================= Il s'agit d'exprimer ici les contraintes techniques applicables à la -conception et au développement du nouveau module MED. +conception et au développement du nouveau module FIELDS. Implantation technique du module -------------------------------- -Il est convenu que le module MED existant dans la plate-forme SALOME +Il est convenu que le module FIELDS existant dans la plate-forme SALOME incarne le module de manipulation de champ. Dans la pratique, il s'agit d'identifier clairement les parties à conserver, d'une part, puis les parties à re-écrire, d'autre part. On peut partir sur les @@ -854,7 +854,7 @@ hypothèses techniques suivantes: champs proprement dites est construit sur la base des paquets logiciels MEDCoupling (lui-même basé sur le INTERP_KERNEL) et MEDLoader. -* L'interface graphique du module MED est complétement re-écrite et +* L'interface graphique du module FIELDS est complétement re-écrite et remplacée par une interface adaptée spécialement à la manipulation des champs et la gestion des données associées * Le contrôle visuel pourra être déclenché dans les visualisateurs @@ -874,12 +874,12 @@ figure ci-dessous: :align: center Le schéma représente les packages logiciels qui composent le module -MED (cf. |REF_CEA_VBE_MEDMEM|_): +FIELDS (cf. |REF_CEA_VBE_MEDMEM|_): * La partie MEDMEM, représentées en blanc. Cette partie est conservée pour compatibilité ascendante au niveau des applications métier qui ont fait le choix historique de s'appuyer sur MEDMEM. Cette partie - du module MED aura tendance à disparaitre dans le futur au bénéfice + du module FIELDS aura tendance à disparaitre dans le futur au bénéfice de MEDCoupling et MEDLoader. * La partie MEDCoupling, représentée en orange et qui founrnit le modèle MED mémoire de référence (composé de maillage et de champs) diff --git a/doc/dev/sphinx/fr/medcalc-userguide-api.rst b/doc/dev/sphinx/fr/medcalc-userguide-api.rst index 8aaa7b614..45ddab248 100644 --- a/doc/dev/sphinx/fr/medcalc-userguide-api.rst +++ b/doc/dev/sphinx/fr/medcalc-userguide-api.rst @@ -37,11 +37,11 @@ example to perform field projections from a mesh to another. Installation of the MEDMEM library ---------------------------------- -The MEDMEM library is part of the SALOME MED module and then is +The MEDMEM library is part of the SALOME FIELDS module and then is installed together with this module by the installation process of SALOME. Nevertheless, it is possible for low-weight deployment to install only the MEDMEM library from the source files embedded in the -SALOME MED module. Keep in mind that the MEDMEM library is designed to +SALOME FIELDS module. Keep in mind that the MEDMEM library is designed to be a self-consistent library with very few third party softwares (only med-file, glibc and mpi typically). In particular, it is strictly independent from the SALOME framework even if it distributed with @@ -117,7 +117,7 @@ Preparing the shell environment ------------------------------- We make the hypothesis here that the MEDMEM library is installed using -the SALOME procedure and then is located in the MED module +the SALOME procedure and then is located in the FIELDS module installation directory. In addition to the MED library, the third party software required for executing the examples are: python, hdf5 and med-fichier. Then, you should prepare your shell environment @@ -142,11 +142,11 @@ with a set of instructions that looks like:: export LD_LIBRARY_PATH=${MED2HOME}/lib:${LD_LIBRARY_PATH} #------ medmem --- - MED_ROOT_DIR= - export LD_LIBRARY_PATH=${MED_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH} - PYTHONPATH=${MED_ROOT_DIR}/lib/python2.6/site-packages/salome:${PYTHONPATH} - PYTHONPATH=${MED_ROOT_DIR}/bin/salome:${PYTHONPATH} - PYTHONPATH=${MED_ROOT_DIR}/lib/salome:${PYTHONPATH} + FIELDS_ROOT_DIR= + export LD_LIBRARY_PATH=${FIELDS_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH} + PYTHONPATH=${FIELDS_ROOT_DIR}/lib/python2.6/site-packages/salome:${PYTHONPATH} + PYTHONPATH=${FIELDS_ROOT_DIR}/bin/salome:${PYTHONPATH} + PYTHONPATH=${FIELDS_ROOT_DIR}/lib/salome:${PYTHONPATH} export PYTHONPATH Example 01: Explore a med file to get information concerning meshes and fields diff --git a/doc/dev/sphinx/fr/medcalc-userguide-gui.rst b/doc/dev/sphinx/fr/medcalc-userguide-gui.rst index dcf1cbed8..41d4db0a7 100644 --- a/doc/dev/sphinx/fr/medcalc-userguide-gui.rst +++ b/doc/dev/sphinx/fr/medcalc-userguide-gui.rst @@ -5,11 +5,11 @@ .. include:: medcalc-definitions.rst %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -Module MED: Guide d'utilisation de l'interface graphique +Module FIELDS: Guide d'utilisation de l'interface graphique %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Ce document est un guide rapide pour l'utilisation de l'interface -graphique du module MED. Il montre comment utiliser le module sur la +graphique du module FIELDS. Il montre comment utiliser le module sur la base de quelques exemples de référence, inspirés des cas d'utilisation identifiés lors de l'analyse des besoins en matière de manipulation de champs. @@ -23,7 +23,7 @@ champs. :local: :backlinks: none -Présentation générale du module MED +Présentation générale du module FIELDS =================================== L'ergonomie générale d'utilisation du module de manipulation de champs @@ -70,7 +70,7 @@ processus de la forme suivante: 5. Enregistrement d'une partie des champs produits dans un fichier med -Tour rapide des fonctions du module MED +Tour rapide des fonctions du module FIELDS ======================================= Cette section présente des exemples d'utilisation du module XMED sous @@ -623,7 +623,7 @@ Exemple 8: Continuer l'analyse dans PARAVIS * Export de champs vers le module PARAVIS. Les possibilités de représentation graphique des champs fournies par -le module MED ont pour seul objectif le contrôle visuel rapide. Par +le module FIELDS ont pour seul objectif le contrôle visuel rapide. Par défaut, le viewer de VISU est employé. Pour une analyse plus détaillées des champs, il est nécessaire de @@ -655,7 +655,7 @@ carte de champ: .. _xmed.userguide.tui-fr: -Utilisation de l'interface textuelle du module MED (TUI) +Utilisation de l'interface textuelle du module FIELDS (TUI) ======================================================== Toutes les opérations menées au moyen de l'interface graphique peuvent diff --git a/doc/dev/sphinx/index.rst b/doc/dev/sphinx/index.rst index 6560ec984..275ad05f3 100644 --- a/doc/dev/sphinx/index.rst +++ b/doc/dev/sphinx/index.rst @@ -1,9 +1,9 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%% -Documentation of MED module +Documentation of FIELDS module %%%%%%%%%%%%%%%%%%%%%%%%%%% -The SALOME MED module provides MEDCoupling library (a C++ library dedicated of +The SALOME FIELDS module provides MEDCoupling library (a C++ library dedicated of mesh and field manipulation consistent with MED model), as well as a Graphical User Interface to access some usual operations. diff --git a/doc/dev/sphinx/medcalc-develguide.rst b/doc/dev/sphinx/medcalc-develguide.rst index 0d378d2f9..8433f52f1 100644 --- a/doc/dev/sphinx/medcalc-develguide.rst +++ b/doc/dev/sphinx/medcalc-develguide.rst @@ -5,14 +5,14 @@ .. include:: medcalc-definitions.rst %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -Module MED: Guide de développement du composant MEDCalc +Module FIELDS: Guide de développement du composant MEDCalc %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -Le composant logiciel MEDCalc est un élément du module MED. Il fournit +Le composant logiciel MEDCalc est un élément du module FIELDS. Il fournit une interface utilisateur pour la manipulation de maillages et de champs, composée d'une interface texte (TUI) et d'une interface graphique (GUI). L'interface graphique constitue l'interface graphique -du module MED. +du module FIELDS. Ce document est la documentation technique du composant MEDCalc. Il fournit les instructions à suivre pour installer le composant en vue @@ -28,10 +28,10 @@ Mise en place de l'espace de développement Gestion de configuration du composant MEDCalc --------------------------------------------- -Le composant logiciel MEDCalc est un package du module SALOME MED, +Le composant logiciel MEDCalc est un package du module SALOME FIELDS, hébergé dans l'espace source au niveau du sous-répertoire `src/MEDCalc`. La gestion des fichiers sources est donc intégrée dans le -module SALOME MED. +module SALOME FIELDS. Organisation des sources du composant MEDCalc --------------------------------------------- @@ -42,7 +42,7 @@ suivants: * cmp: package containing the SALOME components * tui: package containing the python user interface * gui: package containing the graphical user interface (the GUI part - of the MED module) + of the FIELDS module) * res: resources files associated to the MEDCalc package (icons, config files, data files, ...) * exe: additional executable programs that can be launched from the @@ -51,7 +51,7 @@ suivants: Construction du composant MEDCalc --------------------------------- -Intégré à la construction du module MED. Le composant MEDCalc dépend de +Intégré à la construction du module FIELDS. Le composant MEDCalc dépend de MEDCoupling et MEDLoader uniquement. Exécution des tests unitaires du composant MEDCalc @@ -61,7 +61,7 @@ Les tests unitaires peuvent être exécutés au moyen de scripts python lancés depuis une session shell SALOME. Dans un nouveau shell, taper:: $ ./appli/runSession - [NS=mars:2810]$ python appli/bin/salome/med/test_medcalc_components.py + [NS=mars:2810]$ python appli/bin/salome/fields/test_medcalc_components.py L'exécution imprime un rapport détaillant le résultat pour chaque fonction de test:: @@ -80,21 +80,21 @@ fonction de test:: test_saveFields (__main__.MyTestSuite) ... ok test_updateFieldMetadata (__main__.MyTestSuite) ... ok -Les scripts de test sont installés dans le répertoire ``bin/med``. On trouve: +Les scripts de test sont installés dans le répertoire ``bin/fields``. On trouve: * ``test_medcalc_components.py``: test les composants SALOME développés pour la manipulation de champs (``MEDDataManager`` et ``MEDCalculator``). * ``test_xmed_fieldOperations.py``: test des operations de champs telles qu'elles sont mises en oeuvre depuis l'interface textuelle. * ``test_xmed_uiEventListener.py``: test du système de notification - d'évènements des composants vers la partie gui du module MED. + d'évènements des composants vers la partie gui du module FIELDS. * ``test_xmed_visualisation.py``: test du système de visualisation - des champs tel que piloté depuis le module MED. + des champs tel que piloté depuis le module FIELDS. Architecture du module XMED =========================== -Le module MED pour la manipulation de champs est composé de: +Le module FIELDS pour la manipulation de champs est composé de: * une bibliothèque de fonctions pour le traitement de données sur des maillages et des champs conformes au modèle MED (package @@ -212,7 +212,7 @@ ANNEXE B: Traçabilité avec le module XMED ========================================= Le module SALOME de nom XMED est l'espace de développement initial du -composant logiciel MEDCalc, intégré aujourd'hui au module MED. Cette +composant logiciel MEDCalc, intégré aujourd'hui au module FIELDS. Cette annexe est la notice technique de ce module, qui reste disponible mais qui n'est plus maintenu. diff --git a/doc/dev/sphinx/medcalc-specifications.rst b/doc/dev/sphinx/medcalc-specifications.rst index ae152232e..bd98f6ffb 100644 --- a/doc/dev/sphinx/medcalc-specifications.rst +++ b/doc/dev/sphinx/medcalc-specifications.rst @@ -5,7 +5,7 @@ .. include:: medcalc-definitions.rst %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -Module MED: Spécifications fonctionnelles et techniques +Module FIELDS: Spécifications fonctionnelles et techniques %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Ce texte présente les spécifications informatiques pour le @@ -278,7 +278,7 @@ informatiques correspondant aux maillages sont différents (chargés de deux fichiers différents). En l'état, il est donc impossible par exemple de faire la comparaison de champs résultats d'une étude paramétriques. MEDCoupling fournit une solution qu'il faudra mettre en -oeuvre de manière ergonomique au niveau du module MED. Il est possible +oeuvre de manière ergonomique au niveau du module FIELDS. Il est possible de changer le maillage support M1 d'un champs par un maillage M2 à partir du moment où les maillages M1 et M2 sont identiques géométriquement à une erreur près qu'il est possible de spécifier. @@ -756,7 +756,7 @@ Sur cette base, on peut envisager une grande variété de cas d'utilisation: Spécification des fonctions de visualisation ============================================ -Dans le cadre du module MED, on appelle *fonction de visualisation* +Dans le cadre du module FIELDS, on appelle *fonction de visualisation* une fonction qui permet d'avoir un aperçu graphique d'un champ, par exemple au moyen d'une carte de champ construite sur une de ses composante. Il s'agit là de vue de contrôle pour avoir une idée rapide @@ -765,9 +765,9 @@ préférera passer par les fonctions d'export vers le module PARAVIS. Les modules VISU et PARAVIS offre des interface de programmation C++ et python qui permettent le pilotage depuis un module tiers comme le -module MED. On peut donc envisager une fonction de visualisation +module FIELDS. On peut donc envisager une fonction de visualisation intégrée au module de manipulation de champs, c'est-à-dire que l'on -déclenche sans sortir du module MED, et qui exploite les fonctions de +déclenche sans sortir du module FIELDS, et qui exploite les fonctions de visualisation des modules VISU et/ou PARAVIS. Les captures d'écran ci-dessous illustrent la mise en oeuvre de la @@ -812,7 +812,7 @@ On adopte le principe de fonctionnement suivant: c’est-à-dire qu’il ne permet pas la sauvegarde du travail dans une étude au format hdf, ni le dump sous la forme de script python SALOME. Le besoin n'est pas avéré et on peut même dire que ça n'a - pas de sens compte-tenu de l'usage envisagé pour le module MED. + pas de sens compte-tenu de l'usage envisagé pour le module FIELDS. * Par contre, le module fournit des fonctions de sauvegarde du travail sous forme de fichiers med, l’export vers les modules VISU et PARAVIZ, ou même la sauvegarde de l’historique de l’interface de @@ -831,7 +831,7 @@ Plusieurs export peuvent être proposés: * Export des champs vers le module PARAVIZ, dans l'objectif par exemple d'en faire une analyse visuelle plus poussée qu'avec les - cartes de champs disponibles par défaut dans le module MED + cartes de champs disponibles par défaut dans le module FIELDS * Export des données sous forme de tableau numpy, par exemple pour permettre un travail algorithmique sur les valeurs des champs. @@ -839,12 +839,12 @@ Spécifications techniques ========================= Il s'agit d'exprimer ici les contraintes techniques applicables à la -conception et au développement du nouveau module MED. +conception et au développement du nouveau module FIELDS. Implantation technique du module -------------------------------- -Il est convenu que le module MED existant dans la plate-forme SALOME +Il est convenu que le module FIELDS existant dans la plate-forme SALOME incarne le module de manipulation de champ. Dans la pratique, il s'agit d'identifier clairement les parties à conserver, d'une part, puis les parties à re-écrire, d'autre part. On peut partir sur les @@ -854,7 +854,7 @@ hypothèses techniques suivantes: champs proprement dites est construit sur la base des paquets logiciels MEDCoupling (lui-même basé sur le INTERP_KERNEL) et MEDLoader. -* L'interface graphique du module MED est complétement re-écrite et +* L'interface graphique du module FIELDS est complétement re-écrite et remplacée par une interface adaptée spécialement à la manipulation des champs et la gestion des données associées * Le contrôle visuel pourra être déclenché dans les visualisateurs @@ -874,12 +874,12 @@ figure ci-dessous: :align: center Le schéma représente les packages logiciels qui composent le module -MED (cf. |REF_CEA_VBE_MEDMEM|_): +FIELDS (cf. |REF_CEA_VBE_MEDMEM|_): * La partie MEDMEM, représentées en blanc. Cette partie est conservée pour compatibilité ascendante au niveau des applications métier qui ont fait le choix historique de s'appuyer sur MEDMEM. Cette partie - du module MED aura tendance à disparaitre dans le futur au bénéfice + du module FIELDS aura tendance à disparaitre dans le futur au bénéfice de MEDCoupling et MEDLoader. * La partie MEDCoupling, représentée en orange et qui founrnit le modèle MED mémoire de référence (composé de maillage et de champs) diff --git a/doc/dev/sphinx/medcalc-userguide-api.rst b/doc/dev/sphinx/medcalc-userguide-api.rst index 42c345ade..7a3e580b5 100644 --- a/doc/dev/sphinx/medcalc-userguide-api.rst +++ b/doc/dev/sphinx/medcalc-userguide-api.rst @@ -37,11 +37,11 @@ example to perform field projections from a mesh to another. Installation of the MEDMEM library ---------------------------------- -The MEDMEM library is part of the SALOME MED module and then is +The MEDMEM library is part of the SALOME FIELDS module and then is installed together with this module by the installation process of SALOME. Nevertheless, it is possible for low-weight deployment to install only the MEDMEM library from the source files embedded in the -SALOME MED module. Keep in mind that the MEDMEM library is designed to +SALOME FIELDS module. Keep in mind that the MEDMEM library is designed to be a self-consistent library with very few third party software (only med-file, glibc and mpi typically). In particular, it is strictly independent from the SALOME framework even if it distributed with @@ -117,7 +117,7 @@ Preparing the shell environment ------------------------------- We make the hypothesis here that the MEDMEM library is installed using -the SALOME procedure and then is located in the MED module +the SALOME procedure and then is located in the FIELDS module installation directory. In addition to the MED library, the third party software required for executing the examples are: python, hdf5 and med-fichier. Then, you should prepare your shell environment @@ -142,11 +142,11 @@ with a set of instructions that looks like:: export LD_LIBRARY_PATH=${MED2HOME}/lib:${LD_LIBRARY_PATH} #------ medmem --- - MED_ROOT_DIR= - export LD_LIBRARY_PATH=${MED_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH} - PYTHONPATH=${MED_ROOT_DIR}/lib/python2.6/site-packages/salome:${PYTHONPATH} - PYTHONPATH=${MED_ROOT_DIR}/bin/salome:${PYTHONPATH} - PYTHONPATH=${MED_ROOT_DIR}/lib/salome:${PYTHONPATH} + FIELDS_ROOT_DIR= + export LD_LIBRARY_PATH=${FIELDS_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH} + PYTHONPATH=${FIELDS_ROOT_DIR}/lib/python2.6/site-packages/salome:${PYTHONPATH} + PYTHONPATH=${FIELDS_ROOT_DIR}/bin/salome:${PYTHONPATH} + PYTHONPATH=${FIELDS_ROOT_DIR}/lib/salome:${PYTHONPATH} export PYTHONPATH Example 01: Explore a med file to get information concerning meshes and fields diff --git a/doc/dev/sphinx/medcalc-userguide-gui.rst b/doc/dev/sphinx/medcalc-userguide-gui.rst index dc52d29ef..700d24dc6 100644 --- a/doc/dev/sphinx/medcalc-userguide-gui.rst +++ b/doc/dev/sphinx/medcalc-userguide-gui.rst @@ -5,10 +5,10 @@ .. include:: medcalc-definitions.rst %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -MED module: User guide for graphical interface +FIELDS module: User guide for graphical interface %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -This document is a quick guide for Graphical User Interface of MED module. It +This document is a quick guide for Graphical User Interface of FIELDS module. It shows how to use this module on the basis of a few reference examples, built from use cases identified during requirement analysis stage. @@ -25,10 +25,10 @@ from use cases identified during requirement analysis stage. 7, VISU module has been replaced by PARAVIS module. The look-and-feel may thus be slightly different. -General presentation of MED module +General presentation of FIELDS module ================================== -The overall ergonomics of MED module for field manipulation is inspired by +The overall ergonomics of FIELDS module for field manipulation is inspired by software such as octave or scilab. It combines a graphical interface (GUI) to select and prepare data, with a textual interface (the python console, TUI) for actual work on data. @@ -61,10 +61,10 @@ A typical use of field manipulation functions is: 5. Save (parts of) produced fields to a med file. -Quick tour on functions available in MED module +Quick tour on functions available in FIELDS module =============================================== -This section presents some use examples of MED module like a "storyboard", +This section presents some use examples of FIELDS module like a "storyboard", illustrating the functions proposed by the module. .. warning:: This section is under construction. Please consider that its @@ -189,7 +189,7 @@ file name: :align: center :width: 800px -The file ``result.med`` can then be reloaded in MED module (or PARAVIS module) +The file ``result.med`` can then be reloaded in FIELDS module (or PARAVIS module) to check the presence of saved fields. .. BUG: plantage à l'utilsation dans XMED d'un fichier rechargé @@ -540,7 +540,7 @@ Example 8: Continue analysis in PARAVIS * Export fields to PARAVIS module -The solutions for field representation in MED module aims at proposing a quick +The solutions for field representation in FIELDS module aims at proposing a quick visual control. For a detailed analysis of fields, user shall switch to PARAVIS. The field diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt index e49165e52..808942e3c 100644 --- a/resources/CMakeLists.txt +++ b/resources/CMakeLists.txt @@ -225,13 +225,13 @@ IF(MED_ENABLE_GUI) ) ENDIF(MED_ENABLE_GUI) -IF(SALOME_MED_WITH_FILE_EXAMPLES) - INSTALL(FILES ${MED_RESOURCES_FILES} DESTINATION ${SALOME_MED_INSTALL_RES_DATA}) -ENDIF(SALOME_MED_WITH_FILE_EXAMPLES) +IF(SALOME_FIELDS_WITH_FILE_EXAMPLES) + INSTALL(FILES ${MED_RESOURCES_FILES} DESTINATION ${SALOME_FIELDS_INSTALL_RES_DATA}) +ENDIF(SALOME_FIELDS_WITH_FILE_EXAMPLES) -MESSAGE(STATUS "Creation of ${CMAKE_CURRENT_BINARY_DIR}/MEDCatalog.xml") -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/MEDCatalog.xml.in ${CMAKE_CURRENT_BINARY_DIR}/MEDCatalog.xml @ONLY) +MESSAGE(STATUS "Creation of ${CMAKE_CURRENT_BINARY_DIR}/FIELDSCatalog.xml") +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/FIELDSCatalog.xml.in ${CMAKE_CURRENT_BINARY_DIR}/FIELDSCatalog.xml @ONLY) MESSAGE(STATUS "Creation of ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml") CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SalomeApp.xml.in ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml @ONLY) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/MEDCatalog.xml ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml DESTINATION ${SALOME_MED_INSTALL_RES_DATA}) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/FIELDSCatalog.xml ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml DESTINATION ${SALOME_FIELDS_INSTALL_RES_DATA}) diff --git a/resources/FIELDSCatalog.xml.in b/resources/FIELDSCatalog.xml.in new file mode 100644 index 000000000..efd64206b --- /dev/null +++ b/resources/FIELDSCatalog.xml.in @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + SALOME_MED/DataArrayCorbaInterface + + + SALOME_MED/DataArrayCorbaInterface + + + SALOME_MED/MEDCouplingMeshCorbaInterface + + + SALOME_MED/MEDCouplingMeshCorbaInterface + + + SALOME_MED/MEDCouplingMeshCorbaInterface + + + SALOME_MED/MEDCouplingMeshCorbaInterface + + + SALOME_MED/MEDCouplingFieldDoubleCorbaInterface + + + SALOME_MED/MEDCouplingUMeshCorbaInterface + + + SALOME_MED/ParaMEDCouplingFieldDoubleCorbaInterface + + + + SALOME_MED/MEDCouplingMultiFieldsCorbaInterface + + + + + + + + MEDFactory + MEDCalc Factory + FIELDS + Guillaume Boulant + @SALOMEFIELDS_VERSION@ + Factory of SALOME components for MED Field operations + + + + FIELDS + Fields + FIELDS + @SALOMEFIELDS_VERSION@ + FIELDS component engine + + + + diff --git a/resources/MEDCatalog.xml.in b/resources/MEDCatalog.xml.in deleted file mode 100644 index e7bab563e..000000000 --- a/resources/MEDCatalog.xml.in +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - SALOME_MED/DataArrayCorbaInterface - - - SALOME_MED/DataArrayCorbaInterface - - - SALOME_MED/MEDCouplingMeshCorbaInterface - - - SALOME_MED/MEDCouplingMeshCorbaInterface - - - SALOME_MED/MEDCouplingMeshCorbaInterface - - - SALOME_MED/MEDCouplingMeshCorbaInterface - - - SALOME_MED/MEDCouplingFieldDoubleCorbaInterface - - - SALOME_MED/MEDCouplingUMeshCorbaInterface - - - SALOME_MED/ParaMEDCouplingFieldDoubleCorbaInterface - - - - SALOME_MED/MEDCouplingMultiFieldsCorbaInterface - - - - - - - - MEDFactory - MEDCalc Factory - MED - Guillaume Boulant - @SALOMEMED_VERSION@ - Factory of SALOME components for MED Field operations - - - - MED - Med - MED - @SALOMEMED_VERSION@ - MED component engine - - - - diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in index 3279a8739..99268cc6e 100644 --- a/resources/SalomeApp.xml.in +++ b/resources/SalomeApp.xml.in @@ -22,28 +22,28 @@ --> -
+
- + - +
- - - - + + + +
- +
- +
- +
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9b6d5c14b..75571cef2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -25,12 +25,12 @@ ENDIF(SALOME_USE_MPI) ADD_SUBDIRECTORY(MEDCouplingCorba) ADD_SUBDIRECTORY(MEDCalculator) ADD_SUBDIRECTORY(MEDCalc) -IF(SALOME_MED_ENABLE_PYTHON) +IF(SALOME_FIELDS_ENABLE_PYTHON) ADD_SUBDIRECTORY(MEDCouplingCorba_Swig) -ENDIF(SALOME_MED_ENABLE_PYTHON) +ENDIF(SALOME_FIELDS_ENABLE_PYTHON) IF(SALOME_BUILD_GUI) - IF(SALOME_MED_ENABLE_PYTHON) + IF(SALOME_FIELDS_ENABLE_PYTHON) #ADD_SUBDIRECTORY(MEDGUI) - ENDIF(SALOME_MED_ENABLE_PYTHON) + ENDIF(SALOME_FIELDS_ENABLE_PYTHON) ENDIF(SALOME_BUILD_GUI) diff --git a/src/MEDCalc/CMakeLists.txt b/src/MEDCalc/CMakeLists.txt index 2db954b42..be90548a1 100644 --- a/src/MEDCalc/CMakeLists.txt +++ b/src/MEDCalc/CMakeLists.txt @@ -26,7 +26,7 @@ ENDIF() ADD_SUBDIRECTORY(test) -IF(SALOME_MED_ENABLE_PYTHON) +IF(SALOME_FIELDS_ENABLE_PYTHON) ADD_SUBDIRECTORY(tui) ADD_SUBDIRECTORY(exe) ENDIF() diff --git a/src/MEDCalc/cmp/CMakeLists.txt b/src/MEDCalc/cmp/CMakeLists.txt index 04baec0b7..a2a6ca61d 100644 --- a/src/MEDCalc/cmp/CMakeLists.txt +++ b/src/MEDCalc/cmp/CMakeLists.txt @@ -86,14 +86,14 @@ ADD_LIBRARY(MEDFactoryEngine SHARED ${MEDFactoryEngine_SOURCES}) SET_TARGET_PROPERTIES(MEDFactoryEngine PROPERTIES COMPILE_FLAGS "${COMMON_FLAGS}") TARGET_LINK_LIBRARIES(MEDFactoryEngine ${COMMON_LIBS} MEDEngineCommon) -ADD_LIBRARY(MEDEngine SHARED ${MEDEngine_SOURCES}) -SET_TARGET_PROPERTIES(MEDEngine PROPERTIES COMPILE_FLAGS "${COMMON_FLAGS}") -TARGET_LINK_LIBRARIES(MEDEngine ${COMMON_LIBS} MEDEngineCommon) +ADD_LIBRARY(FIELDSEngine SHARED ${MEDEngine_SOURCES}) +SET_TARGET_PROPERTIES(FIELDSEngine PROPERTIES COMPILE_FLAGS "${COMMON_FLAGS}") +TARGET_LINK_LIBRARIES(FIELDSEngine ${COMMON_LIBS} MEDEngineCommon) #INSTALL(TARGETS MEDFactoryEngine DESTINATION ${SALOME_INSTALL_LIBS}) INSTALL(TARGETS MEDEngineCommon EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) INSTALL(TARGETS MEDFactoryEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) -INSTALL(TARGETS MEDEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) +INSTALL(TARGETS FIELDSEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) FILE(GLOB MEDCALC_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") INSTALL(FILES ${MEDCALC_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/MEDCalc/cmp/MED.cxx b/src/MEDCalc/cmp/MED.cxx index 65fe2b326..d938c31ab 100644 --- a/src/MEDCalc/cmp/MED.cxx +++ b/src/MEDCalc/cmp/MED.cxx @@ -84,12 +84,12 @@ MED::addDatasourceToStudy(const MEDCALC::DatasourceHandler& datasourceHandler) SALOMEDS::UseCaseBuilder_var useCaseBuilder = aStudy->GetUseCaseBuilder(); // find MED component; create it if not found - SALOMEDS::SComponent_var father = aStudy->FindComponent("MED"); + SALOMEDS::SComponent_var father = aStudy->FindComponent("FIELDS"); if (CORBA::is_nil(father)) { // create component - father = studyBuilder->NewComponent("MED"); + father = studyBuilder->NewComponent("FIELDS"); // set name attribute - father->SetAttrString("AttributeName", "MEDCalc"); + father->SetAttrString("AttributeName", "FIELDS"); // set icon attribute father->SetAttrString("AttributePixMap", "ICO_MED"); // register component in the study @@ -272,7 +272,7 @@ MED::unregisterPresentation(CORBA::Long presentationId) SALOMEDS::UseCaseBuilder_var useCaseBuilder = aStudy->GetUseCaseBuilder(); SALOMEDS::GenericAttribute_var anAttribute; - SALOMEDS::SComponent_var father = aStudy->FindComponent("MED"); + SALOMEDS::SComponent_var father = aStudy->FindComponent("FIELDS"); SALOMEDS::ChildIterator_var it = aStudy->NewChildIterator(father); for (it->InitEx(true); it->More(); it->Next()) { SALOMEDS::SObject_var child(it->Value()); @@ -307,7 +307,7 @@ MED::getStudyPresentations() SALOMEDS::UseCaseBuilder_var useCaseBuilder = aStudy->GetUseCaseBuilder(); SALOMEDS::GenericAttribute_var anAttribute; - SALOMEDS::SComponent_var father = aStudy->FindComponent("MED"); + SALOMEDS::SComponent_var father = aStudy->FindComponent("FIELDS"); SALOMEDS::ChildIterator_var it = aStudy->NewChildIterator(father); for (it->InitEx(true); it->More(); it->Next()) { @@ -339,7 +339,7 @@ MED::getStudyPresentationEntry(CORBA::Long presentationId) SALOMEDS::UseCaseBuilder_var useCaseBuilder = aStudy->GetUseCaseBuilder(); SALOMEDS::GenericAttribute_var anAttribute; - SALOMEDS::SComponent_var father = aStudy->FindComponent("MED"); + SALOMEDS::SComponent_var father = aStudy->FindComponent("FIELDS"); SALOMEDS::ChildIterator_var it = aStudy->NewChildIterator(father); for (it->InitEx(true); it->More(); it->Next()) { @@ -363,7 +363,7 @@ MED::DumpPython(CORBA::Boolean isPublished, CORBA::Boolean isMultiFile, CORBA::Boolean& isValidScript) { - SALOMEDS::SObject_var aSO = KERNEL::getStudyServant()->FindComponent("MED"); + SALOMEDS::SObject_var aSO = KERNEL::getStudyServant()->FindComponent("FIELDS"); if(CORBA::is_nil(aSO)) { std::cerr << "Error: Cannot find component MED\n"; return new Engines::TMPFile(0); @@ -475,7 +475,7 @@ extern "C" \param interfaceName SALOME component interface name \return CORBA object identifier of the registered servant */ - PortableServer::ObjectId* MEDEngine_factory(CORBA::ORB_ptr orb, + PortableServer::ObjectId* FIELDSEngine_factory(CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, PortableServer::ObjectId* contId, const char* instanceName, diff --git a/src/MEDCalc/cmp/MED.hxx b/src/MEDCalc/cmp/MED.hxx index a3436164b..bd3246683 100644 --- a/src/MEDCalc/cmp/MED.hxx +++ b/src/MEDCalc/cmp/MED.hxx @@ -85,10 +85,10 @@ public: extern "C" MEDCALC_EXPORT -PortableServer::ObjectId* MEDEngine_factory( CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa, - PortableServer::ObjectId* contId, - const char* instanceName, - const char* interfaceName ); +PortableServer::ObjectId* FIELDSEngine_factory( CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa, + PortableServer::ObjectId* contId, + const char* instanceName, + const char* interfaceName ); #endif diff --git a/src/MEDCalc/cmp/test_medcalc_components.py b/src/MEDCalc/cmp/test_medcalc_components.py index a4c211d33..99687da24 100644 --- a/src/MEDCalc/cmp/test_medcalc_components.py +++ b/src/MEDCalc/cmp/test_medcalc_components.py @@ -59,7 +59,7 @@ if salome.lcc is None: salome.salome_init() __import__(corbaModule) factory=salome.lcc.FindOrLoadComponent(containerType,componentName) -# This is not the main CORBA component of the SALOME module MED +# This is not the main CORBA component of the SALOME module FIELDS # (i.e. the engine associated to the study), but the CORBA # entry point for MED fields operations (i.e. a CORBA component # reachable throughout the LifeCycleCORBA). This entry point is used to @@ -74,11 +74,11 @@ factory=salome.lcc.FindOrLoadComponent(containerType,componentName) import os try: - MED_ROOT_DIR=os.environ["MED_ROOT_DIR"] + FIELDS_ROOT_DIR=os.environ["FIELDS_ROOT_DIR"] except KeyError as e: - raise RuntimeError("MED_ROOT_DIR should be defined to load the test data") + raise RuntimeError("FIELDS_ROOT_DIR should be defined to load the test data") -RESDIR=os.path.join(MED_ROOT_DIR,"share","salome","resources","med","medcalc_testfiles") +RESDIR=os.path.join(FIELDS_ROOT_DIR,"share","salome","resources","fields","medcalc_testfiles") def getFilePath(filename): """ diff --git a/src/MEDCalc/gui/CMakeLists.txt b/src/MEDCalc/gui/CMakeLists.txt index 1fcf79de2..675a3895c 100644 --- a/src/MEDCalc/gui/CMakeLists.txt +++ b/src/MEDCalc/gui/CMakeLists.txt @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -IF(SALOME_MED_WITH_QTTESTING) +IF(SALOME_FIELDS_WITH_QTTESTING) ADD_DEFINITIONS(-DMED_HAS_QTTESTING) ENDIF() @@ -48,7 +48,7 @@ SET(MEDCALCGUI_SOURCES MEDWidgetHelperSlices.cxx ) -IF(SALOME_MED_WITH_QTTESTING) +IF(SALOME_FIELDS_WITH_QTTESTING) LIST(APPEND MEDCALCGUI_SOURCES TestController.cxx) ENDIF() @@ -70,7 +70,7 @@ SET(MEDCALCGUI_HEADERS MEDWidgetHelperDeflectionShape.hxx ) -IF(SALOME_MED_WITH_QTTESTING) +IF(SALOME_FIELDS_WITH_QTTESTING) LIST(APPEND MEDCALCGUI_HEADERS TestController.hxx) ENDIF() @@ -93,10 +93,10 @@ INCLUDE_DIRECTORIES( ) SET(MEDCALCGUITS_SOURCES - MED_images.ts - MED_msg_en.ts - MED_msg_fr.ts - MED_msg_ja.ts + FIELDS_images.ts + FIELDS_msg_en.ts + FIELDS_msg_fr.ts + FIELDS_msg_ja.ts MEDCALC_msg_en.ts MEDCALC_msg_fr.ts MEDCALC_msg_ja.ts @@ -127,7 +127,7 @@ SET(link_libraries ${MEDCoupling_medcouplingremapper} ) -IF(SALOME_MED_WITH_QTTESTING) +IF(SALOME_FIELDS_WITH_QTTESTING) LIST(APPEND link_libraries QtTesting) # from ParaView ENDIF() @@ -138,7 +138,7 @@ ENDIF(WITH_MEDMEMGUI) TARGET_LINK_LIBRARIES(MEDCALCGUI ${link_libraries}) INSTALL(TARGETS MEDCALCGUI DESTINATION ${SALOME_INSTALL_LIBS}) -QT_INSTALL_TS_RESOURCES("${MEDCALCGUITS_SOURCES}" "${SALOME_MED_INSTALL_RES_DATA}") +QT_INSTALL_TS_RESOURCES("${MEDCALCGUITS_SOURCES}" "${SALOME_FIELDS_INSTALL_RES_DATA}") FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/MEDCalc/gui/DatasourceController.cxx b/src/MEDCalc/gui/DatasourceController.cxx index 2ffac2d8d..02b2e8e8e 100644 --- a/src/MEDCalc/gui/DatasourceController.cxx +++ b/src/MEDCalc/gui/DatasourceController.cxx @@ -194,8 +194,8 @@ void DatasourceController::OnAddImagesource() QString medFilename = dialog.getMedFilepath(); bool autoLoad = dialog.isAutoLoaded(); - std::string ROOT_DIR(getenv("MED_ROOT_DIR")); - std::string command(ROOT_DIR+"/bin/salome/med/image2med.py"); + std::string ROOT_DIR(getenv("FIELDS_ROOT_DIR")); + std::string command(ROOT_DIR+"/bin/salome/fields/image2med.py"); command += " -i "+QS2S(imageFilename); command += " -m "+QS2S(medFilename); int error = system(command.c_str()); diff --git a/src/MEDCalc/gui/FIELDS_images.ts b/src/MEDCalc/gui/FIELDS_images.ts new file mode 100644 index 000000000..bc019e499 --- /dev/null +++ b/src/MEDCalc/gui/FIELDS_images.ts @@ -0,0 +1,249 @@ + + + + + @default + + ICO_IMPORT_MED + datasource_add.png + + + ICO_DATASOURCE + datasource.png + + + ICO_DATASOURCE_ADD + datasource_add.png + + + ICO_PROCESSING_CHANGE_MESH + processing_changeUnderlyingMesh.png + + + ICO_PROCESSING_INTERPOLATE_FIELD + processing_interpolateField.png + + + ICO_DATASOURCE_EXPAND_FIELD + datasource_expandfield.png + + + ICO_DATASOURCE_FIELD + datasource_field.png + + + ICO_DATASOURCE_MESH + datasource_mesh.png + + + ICO_DATASOURCE_USE + datasource_use.png + + + ICO_FOLDER + folder.png + + + ICO_IMAGE_ADD + image_add.png + + + ICO_MED + MEDCalc.png + + + ICO_MED_SMALL + MEDCalc_small.png + + + ICO_WORKSPACE_CLEAN + workspace_clean.png + + + ICO_WORKSPACE_SAVE + workspace_save.png + + + ICO_ICO_DELETE_PRESENTATION + delete.png + + + + ICO_PRESENTATION_MESH_VIEW_DEFAULT + mesh24.png + + + ICO_PRESENTATION_SCALAR_MAP_DEFAULT + scalarmap24.png + + + ICO_PRESENTATION_CONTOUR_DEFAULT + pqIsosurface24.png + + + ICO_PRESENTATION_VECTOR_FIELD_DEFAULT + pqGlyph24.png + + + ICO_PRESENTATION_SLICES_DEFAULT + pqSlice24.png + + + ICO_PRESENTATION_DEFLECTION_SHAPE_DEFAULT + pqWarp24.png + + + ICO_PRESENTATION_POINT_SPRITE_DEFAULT + pqNodeMapData24.png + + + + ICO_MEDPresentationMeshView_DEFAULT + mesh16.png + + + ICO_MEDPresentationScalarMap_DEFAULT + scalarmap16.png + + + ICO_MEDPresentationContour_DEFAULT + pqIsosurface16.png + + + ICO_MEDPresentationVectorField_DEFAULT + pqGlyph16.png + + + ICO_MEDPresentationSlices_DEFAULT + pqSlice16.png + + + ICO_MEDPresentationDeflectionShape_DEFAULT + pqWarp16.png + + + ICO_MEDPresentationPointSprite_DEFAULT + pqNodeMapData16.png + + + + ICO_PRESENTATION_MESH_VIEW_MODERN + mesh24.png + + + ICO_PRESENTATION_SCALAR_MAP_MODERN + scalarmap24.png + + + ICO_PRESENTATION_CONTOUR_MODERN + pqIsosurface24.png + + + ICO_PRESENTATION_VECTOR_FIELD_MODERN + pqGlyph24.png + + + ICO_PRESENTATION_SLICES_MODERN + pqSlice24.png + + + ICO_PRESENTATION_DEFLECTION_SHAPE_MODERN + pqWarp24.png + + + ICO_PRESENTATION_POINT_SPRITE_MODERN + pqNodeMapData24.png + + + + ICO_MEDPresentationMeshView_MODERN + mesh16.png + + + ICO_MEDPresentationScalarMap_MODERN + scalarmap16.png + + + ICO_MEDPresentationContour_MODERN + pqIsosurface16.png + + + ICO_MEDPresentationVectorField_MODERN + pqGlyph16.png + + + ICO_MEDPresentationSlices_MODERN + pqSlice16.png + + + ICO_MEDPresentationDeflectionShape_MODERN + pqWarp16.png + + + ICO_MEDPresentationPointSprite_MODERN + pqNodeMapData16.png + + + + ICO_PRESENTATION_MESH_VIEW_CLASSIC + visu_mesh24.png + + + ICO_PRESENTATION_SCALAR_MAP_CLASSIC + visu_scalars24.png + + + ICO_PRESENTATION_CONTOUR_CLASSIC + visu_isosurfaces24.png + + + ICO_PRESENTATION_VECTOR_FIELD_CLASSIC + visu_vectors24.png + + + ICO_PRESENTATION_SLICES_CLASSIC + visu_cutplanes24.png + + + ICO_PRESENTATION_DEFLECTION_SHAPE_CLASSIC + visu_deformed24.png + + + ICO_PRESENTATION_POINT_SPRITE_CLASSIC + visu_points24.png + + + + ICO_MEDPresentationMeshView_CLASSIC + visu_mesh16.png + + + ICO_MEDPresentationScalarMap_CLASSIC + visu_scalars16.png + + + ICO_MEDPresentationContour_CLASSIC + visu_isosurfaces16.png + + + ICO_MEDPresentationVectorField_CLASSIC + visu_vectors16.png + + + ICO_MEDPresentationSlices_CLASSIC + visu_cutplanes16.png + + + ICO_MEDPresentationDeflectionShape_CLASSIC + visu_deformed16.png + + + ICO_MEDPresentationPointSprite_CLASSIC + visu_points16.png + + + ICO_DELETE_PRESENTATION + close.png + + + diff --git a/src/MEDCalc/gui/FIELDS_msg_en.ts b/src/MEDCalc/gui/FIELDS_msg_en.ts new file mode 100644 index 000000000..69f0b813b --- /dev/null +++ b/src/MEDCalc/gui/FIELDS_msg_en.ts @@ -0,0 +1,625 @@ + + + + + PresentationController + + TITLE_PRESENTATION_PARAMETERS + Presentation parameters + + + LAB_PRESENTATION_MESH_VIEW + Mesh + + + TIP_PRESENTATION_MESH_VIEW + Mesh + + + LAB_PRESENTATION_SCALAR_MAP + Scalar map + + + TIP_PRESENTATION_SCALAR_MAP + Scalar map + + + LAB_PRESENTATION_CONTOUR + Contour + + + TIP_PRESENTATION_CONTOUR + Contour + + + LAB_PRESENTATION_VECTOR_FIELD + Vector field + + + TIP_PRESENTATION_VECTOR_FIELD + Vector field + + + LAB_PRESENTATION_SLICES + Slices + + + TIP_PRESENTATION_SLICES + Slices + + + LAB_PRESENTATION_DEFLECTION_SHAPE + Deflection shape + + + TIP_PRESENTATION_DEFLECTION_SHAPE + Deflection shape + + + LAB_PRESENTATION_POINT_SPRITE + Point sprite + + + TIP_PRESENTATION_POINT_SPRITE + Point sprite + + + LAB_DELETE_PRESENTATION + Delete presentation + + + TIP_DELETE_PRESENTATION + Delete selected presentation + + + LAB_PARAVIS_DUMP + Dump pipeline + + + TIP_PARAVIS_DUMP + Dump the low level Python commands of the presentation + + + MENU_PRESENTATIONS + Presentations + + + MEDPresentationMeshView + Mesh view + + + MEDPresentationScalarMap + Scalar map + + + MEDPresentationContour + Contour + + + MEDPresentationVectorField + Vector field + + + MEDPresentationSlices + Slices + + + MEDPresentationDeflectionShape + Deflection shape + + + MEDPresentationPointSprite + Point sprite + + + + ProcessingController + + MENU_PROCESSING + Processing + + + LAB_PROCESSING_CHANGE_MESH + Change underlying mesh + + + LAB_PROCESSING_INTERPOLATE_FIELD + Interpolate field + + + + DatasourceController + + + LAB_ADD_DATA_SOURCE + Add Data Source + + + + TIP_ADD_DATA_SOURCE + Add a file data source (file providing med data) + + + + LAB_ADD_IMAGE_SOURCE + Add Image Source + + + + TIP_ADD_IMAGE_SOURCE + Create a Data Source from an image file + + + + LAB_EXPAND_FIELD + Expand field timeseries + + + + LAB_USE_IN_WORKSPACE + Use in workspace + + + + IMPORT_MED_FIELDS + Import MED fields + + + + OPERATION_FAILED + Operation failed + + + + CREATION_FAILED + The creation of med data from the image file failed + + + + OPERATION_NOT_ALLOWED + Operation not allowed + + + + FIELD_ALREADY_DEFINED + This field is already defined in the workspace + + + + WidgetPresentationParameters + + LAB_DEFAULT_DYN_TITLE + Default parameters + + + LAB_DISP_COMP + Displayed component: + + + LAB_EUCLIDEAN_NORM + Euclidean norm + + + LAB_SCALARBAR + Scalar bar: + + + LAB_RANGE + Range: + + + LAB_ALL_TIMESTEPS + All timesteps + + + LAB_CURRENT_TIMESTEP + Current timestep + + + LAB_USER_RANGE + User-specified + + + LAB_TIMESTEP + Timestep: + + + LAB_MIN_VALUE + Min value: + + + LAB_MAX_VALUE + Max value: + + + LAB_COLOR_MAP + Color map: + + + LAB_MESH_WIREFRAME + Wireframe + + + LAB_MESH_SURFACE + Surface + + + LAB_MESH_SURF_EDGES + Surface With Edges + + + LAB_DISP_MESH_MODE + Mesh display: + + + LAB_NB_CONTOURS + Number of contours (max. %1): + + + LAB_NB_SLICES + Number of slices (max. %1): + + + LAB_SPINBOX_TOOLTIP + Hit 'Enter' to apply + + + LAB_SLICE_ORIENT + Slice orientation: + + + LAB_SLICE_NORMAL_TO_X + Normal to X + + + LAB_SLICE_NORMAL_TO_Y + Normal to Y + + + LAB_SLICE_NORMAL_TO_Z + Normal to Z + + + LAB_SLICE_NORMAL_TO_XY + Normal to XY + + + LAB_SLICE_NORMAL_TO_XZ + Normal to XZ + + + LAB_SLICE_NORMAL_TO_YZ + Normal to YZ + + + LAB_SLICE_NORMAL_TO_XYZ + Normal to XYZ + + + LAB_BLUE_TO_RED + Blue to red rainbow + + + LAB_COOL_TO_WARM + Cool to warm + + + + DlgAlias + + + SELECT_AN_ALIAS_FOR_THE_FIELD + Select an alias for the field + + + + DEFINE_AN_ALIAS + You can define an alias to manipulate the field in console: + + + + ALIAS + Alias + + + + MSG_OPERATION_DEFINES_VARIABLE + (this operation defines a variable named <alias> in TUI console. Enter "<alias>.help()" to see available functions, or simply "doc") + + + + DlgChangeUnderlyingMesh + + + FORM + Form + + + + MESH_GT + Mesh -> + + + + MSG_EXPLORER + (Explorer provides a view on MED data sources (mesh and fields) referenced in data space) + + + + DATA_VERIFICATION + Data verification + + + + + SELECT_MESH + You must select a mesh in the explorer and clic the button Mesh + + + + DlgInterpolateField + + + SELECT_MESH + You must select a mesh in the explorer and clic the button Mesh + + + + TARGET_MESH_GT + Target mesh -> + + + + MSG_EXPLORER + (Explorer provides a view on MED data sources (mesh and fields) referenced in data space) + + + + LABEL_PRECISION + Interpolator precision + + + + LABEL_INTERSECTION_TYPE + Intersection type + + + + LABEL_METHOD + Interpolation method + + + + LABEL_DEFAULT_VALUE + Default value of resulting field + + + + LABEL_REVERSE + Reverse interpolation ? + + + + LABEL_NATURE + Field nature + + + + DlgImageToMed + + + FORM + Form + + + + IMAGE_FILE + Image file: + + + + MED_FILE + MED file: + + + + SELECT_IMAGE_FILE + Select image file + + + + SPECIFY_MED_FILE + Specify a MED file + + + + LOAD_AUTOMATICALLY + Load automatically + + + + DlgUseInWorkspace + + + FORM + Form + + + + PRESSURE + Pressure: + + + + TEMPERATURE + Temperature: + + + + GenericDialog + + + DIALOG + Dialog + + + + MEDModule + + + + IMPORT_FROM_FILE + Import from File + + + + IMPORT_MED_FILE + Import MED file + + + + MEN_FILE + &File + + + PREF_TAB_GENERAL + General + + + PREF_THEME_GROUP + Theme + + + PREF_ICONS + Icons + + + PREF_ICON_THEME_MODERN + Modern + + + PREF_ICON_THEME_CLASSIC + Classic + + + + WorkspaceController + + + VISUALIZE_SCALAR_MAP + Visualize (scalar map) + + + + USE_IN_CONSOLE + Use (in console) + + + + EXPORT_TO_PARAVIS + Export (to PARAVIS) + + + + SAVE_AS_MED + Save (as MED file) + + + + REMOVE_FROM_WORKSPACE + Remove (from workspace) + + + + LAB_SAVE_WORKSPACE + Save workspace + + + + TIP_SAVE_WORKSPACE + Save the workspace (fields and meshes) in a MED file + + + + LAB_CLEAN_WORKSPACE + Clean workspace + + + + TIP_CLEAN_WORKSPACE + Clean all data in the workspace + + + + SAVE_SELECTED_FIELDS + Save selected fields + + + + SAVE_WORKSPACE_DATA + Save workspace data + + + + NOT_IMPLEMENTED_YET + Not implemented yet + + + + FUNCTION_NOT_IMPLEMENTED + This function is not implemented yet + + + + @default + + + + + + + FILE_FILTER_MED + MED files (*.med) + + + + FILE_FILTER_PNG + PNG image (*.png) + + + + FILE_FILTER_JPG + JPG image (*.jpg) + + + + FILE_FILTER_PGM + PGM image (*.jpg) + + + + FILE_FILTER_ALL + All files (*.*) + + + LAB_VIEW_MODE + View mode: + + + LAB_VIEW_MODE_REPLACE + Replace + + + LAB_VIEW_MODE_OVERLAP + Overlap + + + LAB_VIEW_MODE_NEW_LAYOUT + New layout + + + LAB_VIEW_MODE_SPLIT_VIEW + Split + + + diff --git a/src/MEDCalc/gui/FIELDS_msg_fr.ts b/src/MEDCalc/gui/FIELDS_msg_fr.ts new file mode 100644 index 000000000..8b92efa4b --- /dev/null +++ b/src/MEDCalc/gui/FIELDS_msg_fr.ts @@ -0,0 +1,625 @@ + + + + + PresentationController + + TITLE_PRESENTATION_PARAMETERS + Paramètres de presentation + + + LAB_PRESENTATION_MESH_VIEW + Maillage + + + TIP_PRESENTATION_MESH_VIEW + Maillage + + + LAB_PRESENTATION_SCALAR_MAP + Carte scalaire + + + TIP_PRESENTATION_SCALAR_MAP + Carte scalaire + + + LAB_PRESENTATION_CONTOUR + Contour + + + TIP_PRESENTATION_CONTOUR + Contour + + + LAB_PRESENTATION_VECTOR_FIELD + Champ de vecteurs + + + TIP_PRESENTATION_VECTOR_FIELD + Champ de vecteurs + + + LAB_PRESENTATION_SLICES + Coupes + + + TIP_PRESENTATION_SLICES + Coupes + + + LAB_PRESENTATION_DEFLECTION_SHAPE + Déformée + + + TIP_PRESENTATION_DEFLECTION_SHAPE + Déformée + + + LAB_PRESENTATION_POINT_SPRITE + Point sprite + + + TIP_PRESENTATION_POINT_SPRITE + Point sprite + + + LAB_DELETE_PRESENTATION + Supprimer + + + TIP_DELETE_PRESENTATION + Supprime la présentation sélectionnée + + + LAB_PARAVIS_DUMP + Trace du pipeline + + + TIP_PARAVIS_DUMP + Affiche les commandes Python bas niveau de la présentation + + + MENU_PRESENTATIONS + Présentations + + + MEDPresentationMeshView + Maillage + + + MEDPresentationScalarMap + Carte scalaire + + + MEDPresentationContour + Contour + + + MEDPresentationVectorField + Champ de vecteurs + + + MEDPresentationSlices + Coupes + + + MEDPresentationDeflectionShape + Déformée + + + MEDPresentationPointSprite + Point sprite + + + + ProcessingController + + MENU_PROCESSING + Traitement + + + LAB_PROCESSING_CHANGE_MESH + Changer le maillage sous-jacent + + + LAB_PROCESSING_INTERPOLATE_FIELD + Interpoler le champ + + + + DatasourceController + + + LAB_ADD_DATA_SOURCE + Importer des données MED + + + + TIP_ADD_DATA_SOURCE + Ajouter des données par import de fichiers MED + + + + LAB_ADD_IMAGE_SOURCE + Ajouter une image + + + + TIP_ADD_IMAGE_SOURCE + Ajouter des données par import d'un fichier image + + + + LAB_EXPAND_FIELD + Étendre les series temporelles du champ + + + + LAB_USE_IN_WORKSPACE + Utiliser dans l'espace de travail + + + + IMPORT_MED_FIELDS + Importer des champs (format MED) + + + + OPERATION_FAILED + L'opération a échoué + + + + CREATION_FAILED + La création des données MED à partir d'un fichier image a échoué + + + + OPERATION_NOT_ALLOWED + Opération non autorisée + + + + FIELD_ALREADY_DEFINED + Ce champ est déjà défini dans l'espace de travail + + + + WidgetPresentationParameters + + LAB_DEFAULT_DYN_TITLE + Paramètres par défaut + + + LAB_DISP_COMP + Composante affichée : + + + LAB_EUCLIDEAN_NORM + Norme euclidienne + + + LAB_SCALARBAR + Echelle de valeurs : + + + LAB_RANGE + Intervalle : + + + LAB_ALL_TIMESTEPS + Tous les pas de temps + + + LAB_CURRENT_TIMESTEP + Pas de temps courant + + + LAB_USER_RANGE + Personnalisé : + + + LAB_TIMESTEP + Pas de temps : + + + LAB_MIN_VALUE + Valeur min : + + + LAB_MAX_VALUE + Valeur max : + + + LAB_COLOR_MAP + Table de couleurs : + + + LAB_MESH_WIREFRAME + Fil de fer + + + LAB_MESH_SURFACE + Surface + + + LAB_MESH_SURF_EDGES + Surface Avec Arrêtes + + + LAB_DISP_MESH_MODE + Affichage du maillage: + + + LAB_NB_CONTOURS + Nombre de contours (max. %1) : + + + LAB_NB_SLICES + Nombres de coupes (max. %1) : + + + LAB_SPINBOX_TOOLTIP + Taper 'Entrée' pour appliquer + + + LAB_SLICE_ORIENT + Orientation des coupes: + + + LAB_SLICE_NORMAL_TO_X + Normale à X + + + LAB_SLICE_NORMAL_TO_Y + Normale à Y + + + LAB_SLICE_NORMAL_TO_Z + Normale à Z + + + LAB_SLICE_NORMAL_TO_XY + Normale à XY + + + LAB_SLICE_NORMAL_TO_XZ + Normale à XZ + + + LAB_SLICE_NORMAL_TO_YZ + Normale à YZ + + + LAB_SLICE_NORMAL_TO_XYZ + Normale à XYZ + + + LAB_BLUE_TO_RED + Arc-en-ciel bleu vers rouge + + + LAB_COOL_TO_WARM + Froid vers chaud + + + + DlgAlias + + + SELECT_AN_ALIAS_FOR_THE_FIELD + Selectionner un alias pour ce champ + + + + DEFINE_AN_ALIAS + Vous pouvez définir un alias pour manipuler le champs dans la console: + + + + ALIAS + Alias + + + + MSG_OPERATION_DEFINES_VARIABLE + (cette opération définit une variable nommée <alias> dans la console texte. Tapez "<alias>.help()" pour voir les fonctions disponibles, ou simplement "doc") + + + + DlgChangeUnderlyingMesh + + + FORM + Formulaire + + + + MESH_GT + Maillage -> + + + + MSG_EXPLORER + (L'explorateur fournit une vue des données MED (maillage et champs) référencées dans l'espace des données) + + + + DATA_VERIFICATION + Vérification des données + + + + + SELECT_MESH + Vous devez sélectionner un maillage dans l'explorateur et cliquer sur le bouton Maillage + + + + DlgInterpolateField + + + SELECT_MESH + Vous devez sélectionner un maillage dans l'explorateur et cliquer sur le bouton Maillage + + + + TARGET_MESH_GT + Maillage cible -> + + + + MSG_EXPLORER + (L'explorateur fournit une vue des données MED (maillage et champs) référencées dans l'espace des données) + + + + LABEL_PRECISION + Précision de l'interpolateur + + + + LABEL_INTERSECTION_TYPE + Type d'intersection + + + + LABEL_METHOD + Méthode d'interpolation + + + + LABEL_DEFAULT_VALUE + Valeur par défaut du champ résultant + + + + LABEL_REVERSE + Interpolation inverse ? + + + + LABEL_NATURE + Nature du champ + + + + DlgImageToMed + + + FORM + Formulaire + + + + IMAGE_FILE + Fichier image : + + + + MED_FILE + Fichier MED : + + + + SELECT_IMAGE_FILE + Selectionner un fichier image + + + + SPECIFY_MED_FILE + Spécifier un fichier MED + + + + LOAD_AUTOMATICALLY + Charger automatiquement + + + + DlgUseInWorkspace + + + FORM + Formulaire + + + + PRESSURE + Pression : + + + + TEMPERATURE + Température : + + + + GenericDialog + + + DIALOG + Dialogue + + + + MEDModule + + + + IMPORT_FROM_FILE + Importer depuis un fichier + + + + IMPORT_MED_FILE + Importer un fichier MED + + + + MEN_FILE + &Fichier + + + PREF_TAB_GENERAL + Général + + + PREF_THEME_GROUP + Thème + + + PREF_ICONS + Icones + + + PREF_ICON_THEME_MODERN + Moderne + + + PREF_ICON_THEME_CLASSIC + Classique + + + + WorkspaceController + + + VISUALIZE_SCALAR_MAP + Visualiser (carte scalaire) + + + + USE_IN_CONSOLE + Utiliser (dans la console) + + + + EXPORT_TO_PARAVIS + Exporter (vers PARAVIS) + + + + SAVE_AS_MED + Sauvegarder (dans un fichier MED) + + + + REMOVE_FROM_WORKSPACE + Supprimer (de l'espace de travail) + + + + LAB_SAVE_WORKSPACE + Sauvegarder l'espace de travail + + + + TIP_SAVE_WORKSPACE + Sauvegarder l'espace de travail (champs et maillages) dans un fichier MED + + + + LAB_CLEAN_WORKSPACE + Nettoyer l'espace de travail + + + + TIP_CLEAN_WORKSPACE + Effacer toute les données de l'espace de travail + + + + SAVE_SELECTED_FIELDS + Sauvegarder les champs sélectionnés + + + + SAVE_WORKSPACE_DATA + Sauvegarder les données de l'espace de travail + + + + NOT_IMPLEMENTED_YET + Non implémenté + + + + FUNCTION_NOT_IMPLEMENTED + Cette function n'est pas encore implémentée + + + + @default + + + + + + + FILE_FILTER_MED + Fichiers MED (*.med) + + + + FILE_FILTER_PNG + Image PNG (*.png) + + + + FILE_FILTER_JPG + Image JPG (*.jpg) + + + + FILE_FILTER_PGM + Image PGM (*.jpg) + + + + FILE_FILTER_ALL + Tous les fichiers (*.*) + + + LAB_VIEW_MODE + Mode de rendu : + + + LAB_VIEW_MODE_REPLACE + Remplacer + + + LAB_VIEW_MODE_OVERLAP + Superposer + + + LAB_VIEW_MODE_NEW_LAYOUT + Nouvel onglet + + + LAB_VIEW_MODE_SPLIT_VIEW + Scinder + + + diff --git a/src/MEDCalc/gui/FIELDS_msg_ja.ts b/src/MEDCalc/gui/FIELDS_msg_ja.ts new file mode 100644 index 000000000..59f48fb88 --- /dev/null +++ b/src/MEDCalc/gui/FIELDS_msg_ja.ts @@ -0,0 +1,625 @@ + + + + + PresentationController + + TITLE_PRESENTATION_PARAMETERS + 表現パラメータ + + + LAB_PRESENTATION_MESH_VIEW + メッシュ + + + TIP_PRESENTATION_MESH_VIEW + メッシュ + + + LAB_PRESENTATION_SCALAR_MAP + スカラーマップ + + + TIP_PRESENTATION_SCALAR_MAP + スカラーマップ + + + LAB_PRESENTATION_CONTOUR + コンター + + + TIP_PRESENTATION_CONTOUR + コンター + + + LAB_PRESENTATION_VECTOR_FIELD + ベクトル場 + + + TIP_PRESENTATION_VECTOR_FIELD + ベクトル場 + + + LAB_PRESENTATION_SLICES + スライス + + + TIP_PRESENTATION_SLICES + スライス + + + LAB_PRESENTATION_DEFLECTION_SHAPE + 偏差形状 + + + TIP_PRESENTATION_DEFLECTION_SHAPE + 偏差形状 + + + LAB_PRESENTATION_POINT_SPRITE + 点スプライト描画 + + + TIP_PRESENTATION_POINT_SPRITE + 点スプライト + + + LAB_DELETE_PRESENTATION + プレゼンテーションの削除 + + + TIP_DELETE_PRESENTATION + 選択されたプレゼンテーションの削除 + + + LAB_PARAVIS_DUMP + パイプラインの保存 + + + TIP_PARAVIS_DUMP + プレゼンテーションの低レベルPythonコマンドをダンプ + + + MENU_PRESENTATIONS + プレゼンテーション + + + MEDPresentationMeshView + メッシュビュー + + + MEDPresentationScalarMap + スカラーマップ + + + MEDPresentationContour + コンター + + + MEDPresentationVectorField + ベクトル場 + + + MEDPresentationSlices + スライス + + + MEDPresentationDeflectionShape + 偏差形状 + + + MEDPresentationPointSprite + 点スプライト描画 + + + + ProcessingController + + MENU_PROCESSING + 処理中 + + + LAB_PROCESSING_CHANGE_MESH + 基本要素の変更 + + + LAB_PROCESSING_INTERPOLATE_FIELD + 場の補間 + + + + DatasourceController + + + LAB_ADD_DATA_SOURCE + データソースの追加 + + + + TIP_ADD_DATA_SOURCE + （medデータを供給する）ファイルデータソースの追加 + + + + LAB_ADD_IMAGE_SOURCE + イメージソースの追加 + + + + TIP_ADD_IMAGE_SOURCE + イメージファイルからデータソースの作成 + + + + LAB_EXPAND_FIELD + 場の時系列を拡張 + + + + LAB_USE_IN_WORKSPACE + ワークスペースの使用 + + + + IMPORT_MED_FIELDS + MEDフィールドのインポート + + + + OPERATION_FAILED + 操作に失敗しました。 + + + + CREATION_FAILED + イメージファイルからMEDデータの作成に失敗しました。 + + + + OPERATION_NOT_ALLOWED + 許可されていない操作です。 + + + + FIELD_ALREADY_DEFINED + この場はワークスペース内で既に定義されています。 + + + + WidgetPresentationParameters + + LAB_DEFAULT_DYN_TITLE + デフォルトパラメータ + + + LAB_DISP_COMP + 表示されたコンポーネント: + + + LAB_EUCLIDEAN_NORM + ユークリッド幾何学基準 + + + LAB_SCALARBAR + スカラバー: + + + LAB_RANGE + 範囲: + + + LAB_ALL_TIMESTEPS + すべてのタイムステップ + + + LAB_CURRENT_TIMESTEP + 現在のタイムステップ + + + LAB_USER_RANGE + ユーザ指定 + + + LAB_TIMESTEP + タイムステップ: + + + LAB_MIN_VALUE + 最小値: + + + LAB_MAX_VALUE + 最大値: + + + LAB_COLOR_MAP + カラーマップ: + + + LAB_MESH_WIREFRAME + ワイヤフレーム + + + LAB_MESH_SURFACE + 表面 + + + LAB_MESH_SURF_EDGES + エッジを持った表面 + + + LAB_DISP_MESH_MODE + メッシュ表示: + + + LAB_NB_CONTOURS + コンタ数 (max. %1): + + + LAB_NB_SLICES + スライス数 (max. %1): + + + LAB_SPINBOX_TOOLTIP + Enterキーを押して適用 + + + LAB_SLICE_ORIENT + スライス方向: + + + LAB_SLICE_NORMAL_TO_X + Xと垂直 + + + LAB_SLICE_NORMAL_TO_Y + Yと垂直 + + + LAB_SLICE_NORMAL_TO_Z + Zと垂直 + + + LAB_SLICE_NORMAL_TO_XY + XYと垂直 + + + LAB_SLICE_NORMAL_TO_XZ + XZと垂直 + + + LAB_SLICE_NORMAL_TO_YZ + YZと垂直 + + + LAB_SLICE_NORMAL_TO_XYZ + XYZと垂直 + + + LAB_BLUE_TO_RED + 青-赤 グラデーション + + + LAB_COOL_TO_WARM + 冷却から温め + + + + DlgAlias + + + SELECT_AN_ALIAS_FOR_THE_FIELD + 場のエイリアスを選択 + + + + DEFINE_AN_ALIAS + コンソールでの場の操作に対するエイリアスを定義することができる: + + + + ALIAS + エイリアス + + + + MSG_OPERATION_DEFINES_VARIABLE + (この操作はテキスト コンソールに<alias>という名前の変数を定義します。 "<alias>. help()"と入力すると機能、または単純な「doc」を見ることがきます) + + + + DlgChangeUnderlyingMesh + + + FORM + フォーム + + + + MESH_GT + メッシュ -> + + + + MSG_EXPLORER + エクスプローラによってデータスペース内で参照されたMEDデータソース（メッシュおよび場）上に表示します。 + + + + DATA_VERIFICATION + データの検証 + + + + + SELECT_MESH + エクスプローラ内のメッシュを選択し、メッシュボタンをクリックする必要があります。 + + + + DlgInterpolateField + + + SELECT_MESH + エクスプローラ内のメッシュを選択し、メッシュボタンをクリックする必要があります。 + + + + TARGET_MESH_GT + ターゲットのメッシュ -> + + + + MSG_EXPLORER + エクスプローラによってデータスペース内で参照されたMEDデータソース（メッシュおよび場）上に表示します。 + + + + LABEL_PRECISION + 挿入精度 + + + + LABEL_INTERSECTION_TYPE + 交点タイプ + + + + LABEL_METHOD + 挿入方法 + + + + LABEL_DEFAULT_VALUE + 結果フィールドのデフォルト値 + + + + LABEL_REVERSE + 挿入を反転しますか？ + + + + LABEL_NATURE + フィールド性質 + + + + DlgImageToMed + + + FORM + フォーム + + + + IMAGE_FILE + 画像ファイル: + + + + MED_FILE + MED ファイル: + + + + SELECT_IMAGE_FILE + イメージ ファイルの選択 + + + + SPECIFY_MED_FILE + MED ファイルの指定 + + + + LOAD_AUTOMATICALLY + 自動読み込み + + + + DlgUseInWorkspace + + + FORM + フォーム + + + + PRESSURE + 圧力: + + + + TEMPERATURE + 温度: + + + + GenericDialog + + + DIALOG + ダイアログ + + + + MEDModule + + + + IMPORT_FROM_FILE + ファイルからのインポート + + + + IMPORT_MED_FILE + MEDファイルをインポート + + + + MEN_FILE + ファイル(&F) + + + PREF_TAB_GENERAL + 一般的な + + + PREF_THEME_GROUP + テーマ + + + PREF_ICONS + アイコン + + + PREF_ICON_THEME_MODERN + モダン + + + PREF_ICON_THEME_CLASSIC + クラシック + + + + WorkspaceController + + + VISUALIZE_SCALAR_MAP + 視覚化 (スカラーマップ) + + + + USE_IN_CONSOLE + 使用 (コンソルにおいて) + + + + EXPORT_TO_PARAVIS + 書き出し (PARAVISへ) + + + + SAVE_AS_MED + 保存 (MED ファイルとして) + + + + REMOVE_FROM_WORKSPACE + 削除 (ワークスペースから) + + + + LAB_SAVE_WORKSPACE + ワークスペースの表示 + + + + TIP_SAVE_WORKSPACE + ワークスペースの保存 (メッシュと場) MED ファイル内 + + + + LAB_CLEAN_WORKSPACE + ワークスペースのクリーニグ + + + + TIP_CLEAN_WORKSPACE + ワークスペース内の全データのクリーニング + + + + SAVE_SELECTED_FIELDS + 選択場の保存 + + + + SAVE_WORKSPACE_DATA + ワークスペースデータの保存 + + + + NOT_IMPLEMENTED_YET + 未実装 + + + + FUNCTION_NOT_IMPLEMENTED + この機能はまだ実装されていません + + + + @default + + + + + + + FILE_FILTER_MED + MED ファイル (*.med) + + + + FILE_FILTER_PNG + PNG 画像 (*.png) + + + + FILE_FILTER_JPG + JPG 画像 (*.jpg) + + + + FILE_FILTER_PGM + PGM 画像 (*.jpg) + + + + FILE_FILTER_ALL + 全ファイル (*.*) + + + LAB_VIEW_MODE + ビューモード: + + + LAB_VIEW_MODE_REPLACE + 置き換え + + + LAB_VIEW_MODE_OVERLAP + オーバーラップ + + + LAB_VIEW_MODE_NEW_LAYOUT + 新レイアウト + + + LAB_VIEW_MODE_SPLIT_VIEW + 分割 + + + diff --git a/src/MEDCalc/gui/MEDModule.cxx b/src/MEDCalc/gui/MEDModule.cxx index 9e59a5979..6bbe782c5 100644 --- a/src/MEDCalc/gui/MEDModule.cxx +++ b/src/MEDCalc/gui/MEDModule.cxx @@ -58,7 +58,7 @@ MED_ORB::MED_Gen_var MEDModule::_MED_engine; MEDModule::MEDModule() : - SalomeApp_Module("MED"), _studyEditor(0), + SalomeApp_Module("FIELDS"), _studyEditor(0), _datasourceController(0), _workspaceController(0), _presentationController(0), _processingController(0), _pvGuiElements(0) { @@ -99,15 +99,15 @@ MEDModule::engine() void MEDModule::init() { - // initialize MED module engine (load, if necessary) + // initialize FIELDS module engine (load, if necessary) if ( CORBA::is_nil( _MED_engine ) ) { Engines::EngineComponent_var comp = - SalomeApp_Application::lcc()->FindOrLoad_Component( "FactoryServer", "MED" ); + SalomeApp_Application::lcc()->FindOrLoad_Component( "FactoryServer", "FIELDS" ); if (CORBA::is_nil( comp )) - STDLOG("Could not FindOrLoad_Component MED"); + STDLOG("Could not FindOrLoad_Component FIELDS"); _MED_engine = MED_ORB::MED_Gen::_narrow( comp ); if (CORBA::is_nil( _MED_engine )) - STDLOG("Could not narrow MED engine"); + STDLOG("Could not narrow FIELDS engine"); } } @@ -345,7 +345,7 @@ MEDModule::createStandardAction(const QString& label, if (iconName.isEmpty()) ico = QIcon(); else - ico = QIcon(resMgr->loadPixmap("MED", iconName)); + ico = QIcon(resMgr->loadPixmap("FIELDS", iconName)); QAction* action = createAction(-1, label, @@ -413,7 +413,7 @@ MEDModule::itemClickGeneric(std::string & name, std::string & type, int & presId if (!model) return false; - if (item->componentDataType().toStdString() != "MED") + if (item->componentDataType().toStdString() != "FIELDS") return false; _PTR(SObject) obj = item->object(); _PTR(GenericAttribute) anAttribute; diff --git a/src/MEDCalc/gui/MED_images.ts b/src/MEDCalc/gui/MED_images.ts deleted file mode 100644 index bc019e499..000000000 --- a/src/MEDCalc/gui/MED_images.ts +++ /dev/null @@ -1,249 +0,0 @@ - - - - - @default - - ICO_IMPORT_MED - datasource_add.png - - - ICO_DATASOURCE - datasource.png - - - ICO_DATASOURCE_ADD - datasource_add.png - - - ICO_PROCESSING_CHANGE_MESH - processing_changeUnderlyingMesh.png - - - ICO_PROCESSING_INTERPOLATE_FIELD - processing_interpolateField.png - - - ICO_DATASOURCE_EXPAND_FIELD - datasource_expandfield.png - - - ICO_DATASOURCE_FIELD - datasource_field.png - - - ICO_DATASOURCE_MESH - datasource_mesh.png - - - ICO_DATASOURCE_USE - datasource_use.png - - - ICO_FOLDER - folder.png - - - ICO_IMAGE_ADD - image_add.png - - - ICO_MED - MEDCalc.png - - - ICO_MED_SMALL - MEDCalc_small.png - - - ICO_WORKSPACE_CLEAN - workspace_clean.png - - - ICO_WORKSPACE_SAVE - workspace_save.png - - - ICO_ICO_DELETE_PRESENTATION - delete.png - - - - ICO_PRESENTATION_MESH_VIEW_DEFAULT - mesh24.png - - - ICO_PRESENTATION_SCALAR_MAP_DEFAULT - scalarmap24.png - - - ICO_PRESENTATION_CONTOUR_DEFAULT - pqIsosurface24.png - - - ICO_PRESENTATION_VECTOR_FIELD_DEFAULT - pqGlyph24.png - - - ICO_PRESENTATION_SLICES_DEFAULT - pqSlice24.png - - - ICO_PRESENTATION_DEFLECTION_SHAPE_DEFAULT - pqWarp24.png - - - ICO_PRESENTATION_POINT_SPRITE_DEFAULT - pqNodeMapData24.png - - - - ICO_MEDPresentationMeshView_DEFAULT - mesh16.png - - - ICO_MEDPresentationScalarMap_DEFAULT - scalarmap16.png - - - ICO_MEDPresentationContour_DEFAULT - pqIsosurface16.png - - - ICO_MEDPresentationVectorField_DEFAULT - pqGlyph16.png - - - ICO_MEDPresentationSlices_DEFAULT - pqSlice16.png - - - ICO_MEDPresentationDeflectionShape_DEFAULT - pqWarp16.png - - - ICO_MEDPresentationPointSprite_DEFAULT - pqNodeMapData16.png - - - - ICO_PRESENTATION_MESH_VIEW_MODERN - mesh24.png - - - ICO_PRESENTATION_SCALAR_MAP_MODERN - scalarmap24.png - - - ICO_PRESENTATION_CONTOUR_MODERN - pqIsosurface24.png - - - ICO_PRESENTATION_VECTOR_FIELD_MODERN - pqGlyph24.png - - - ICO_PRESENTATION_SLICES_MODERN - pqSlice24.png - - - ICO_PRESENTATION_DEFLECTION_SHAPE_MODERN - pqWarp24.png - - - ICO_PRESENTATION_POINT_SPRITE_MODERN - pqNodeMapData24.png - - - - ICO_MEDPresentationMeshView_MODERN - mesh16.png - - - ICO_MEDPresentationScalarMap_MODERN - scalarmap16.png - - - ICO_MEDPresentationContour_MODERN - pqIsosurface16.png - - - ICO_MEDPresentationVectorField_MODERN - pqGlyph16.png - - - ICO_MEDPresentationSlices_MODERN - pqSlice16.png - - - ICO_MEDPresentationDeflectionShape_MODERN - pqWarp16.png - - - ICO_MEDPresentationPointSprite_MODERN - pqNodeMapData16.png - - - - ICO_PRESENTATION_MESH_VIEW_CLASSIC - visu_mesh24.png - - - ICO_PRESENTATION_SCALAR_MAP_CLASSIC - visu_scalars24.png - - - ICO_PRESENTATION_CONTOUR_CLASSIC - visu_isosurfaces24.png - - - ICO_PRESENTATION_VECTOR_FIELD_CLASSIC - visu_vectors24.png - - - ICO_PRESENTATION_SLICES_CLASSIC - visu_cutplanes24.png - - - ICO_PRESENTATION_DEFLECTION_SHAPE_CLASSIC - visu_deformed24.png - - - ICO_PRESENTATION_POINT_SPRITE_CLASSIC - visu_points24.png - - - - ICO_MEDPresentationMeshView_CLASSIC - visu_mesh16.png - - - ICO_MEDPresentationScalarMap_CLASSIC - visu_scalars16.png - - - ICO_MEDPresentationContour_CLASSIC - visu_isosurfaces16.png - - - ICO_MEDPresentationVectorField_CLASSIC - visu_vectors16.png - - - ICO_MEDPresentationSlices_CLASSIC - visu_cutplanes16.png - - - ICO_MEDPresentationDeflectionShape_CLASSIC - visu_deformed16.png - - - ICO_MEDPresentationPointSprite_CLASSIC - visu_points16.png - - - ICO_DELETE_PRESENTATION - close.png - - - diff --git a/src/MEDCalc/gui/MED_msg_en.ts b/src/MEDCalc/gui/MED_msg_en.ts deleted file mode 100644 index 69f0b813b..000000000 --- a/src/MEDCalc/gui/MED_msg_en.ts +++ /dev/null @@ -1,625 +0,0 @@ - - - - - PresentationController - - TITLE_PRESENTATION_PARAMETERS - Presentation parameters - - - LAB_PRESENTATION_MESH_VIEW - Mesh - - - TIP_PRESENTATION_MESH_VIEW - Mesh - - - LAB_PRESENTATION_SCALAR_MAP - Scalar map - - - TIP_PRESENTATION_SCALAR_MAP - Scalar map - - - LAB_PRESENTATION_CONTOUR - Contour - - - TIP_PRESENTATION_CONTOUR - Contour - - - LAB_PRESENTATION_VECTOR_FIELD - Vector field - - - TIP_PRESENTATION_VECTOR_FIELD - Vector field - - - LAB_PRESENTATION_SLICES - Slices - - - TIP_PRESENTATION_SLICES - Slices - - - LAB_PRESENTATION_DEFLECTION_SHAPE - Deflection shape - - - TIP_PRESENTATION_DEFLECTION_SHAPE - Deflection shape - - - LAB_PRESENTATION_POINT_SPRITE - Point sprite - - - TIP_PRESENTATION_POINT_SPRITE - Point sprite - - - LAB_DELETE_PRESENTATION - Delete presentation - - - TIP_DELETE_PRESENTATION - Delete selected presentation - - - LAB_PARAVIS_DUMP - Dump pipeline - - - TIP_PARAVIS_DUMP - Dump the low level Python commands of the presentation - - - MENU_PRESENTATIONS - Presentations - - - MEDPresentationMeshView - Mesh view - - - MEDPresentationScalarMap - Scalar map - - - MEDPresentationContour - Contour - - - MEDPresentationVectorField - Vector field - - - MEDPresentationSlices - Slices - - - MEDPresentationDeflectionShape - Deflection shape - - - MEDPresentationPointSprite - Point sprite - - - - ProcessingController - - MENU_PROCESSING - Processing - - - LAB_PROCESSING_CHANGE_MESH - Change underlying mesh - - - LAB_PROCESSING_INTERPOLATE_FIELD - Interpolate field - - - - DatasourceController - - - LAB_ADD_DATA_SOURCE - Add Data Source - - - - TIP_ADD_DATA_SOURCE - Add a file data source (file providing med data) - - - - LAB_ADD_IMAGE_SOURCE - Add Image Source - - - - TIP_ADD_IMAGE_SOURCE - Create a Data Source from an image file - - - - LAB_EXPAND_FIELD - Expand field timeseries - - - - LAB_USE_IN_WORKSPACE - Use in workspace - - - - IMPORT_MED_FIELDS - Import MED fields - - - - OPERATION_FAILED - Operation failed - - - - CREATION_FAILED - The creation of med data from the image file failed - - - - OPERATION_NOT_ALLOWED - Operation not allowed - - - - FIELD_ALREADY_DEFINED - This field is already defined in the workspace - - - - WidgetPresentationParameters - - LAB_DEFAULT_DYN_TITLE - Default parameters - - - LAB_DISP_COMP - Displayed component: - - - LAB_EUCLIDEAN_NORM - Euclidean norm - - - LAB_SCALARBAR - Scalar bar: - - - LAB_RANGE - Range: - - - LAB_ALL_TIMESTEPS - All timesteps - - - LAB_CURRENT_TIMESTEP - Current timestep - - - LAB_USER_RANGE - User-specified - - - LAB_TIMESTEP - Timestep: - - - LAB_MIN_VALUE - Min value: - - - LAB_MAX_VALUE - Max value: - - - LAB_COLOR_MAP - Color map: - - - LAB_MESH_WIREFRAME - Wireframe - - - LAB_MESH_SURFACE - Surface - - - LAB_MESH_SURF_EDGES - Surface With Edges - - - LAB_DISP_MESH_MODE - Mesh display: - - - LAB_NB_CONTOURS - Number of contours (max. %1): - - - LAB_NB_SLICES - Number of slices (max. %1): - - - LAB_SPINBOX_TOOLTIP - Hit 'Enter' to apply - - - LAB_SLICE_ORIENT - Slice orientation: - - - LAB_SLICE_NORMAL_TO_X - Normal to X - - - LAB_SLICE_NORMAL_TO_Y - Normal to Y - - - LAB_SLICE_NORMAL_TO_Z - Normal to Z - - - LAB_SLICE_NORMAL_TO_XY - Normal to XY - - - LAB_SLICE_NORMAL_TO_XZ - Normal to XZ - - - LAB_SLICE_NORMAL_TO_YZ - Normal to YZ - - - LAB_SLICE_NORMAL_TO_XYZ - Normal to XYZ - - - LAB_BLUE_TO_RED - Blue to red rainbow - - - LAB_COOL_TO_WARM - Cool to warm - - - - DlgAlias - - - SELECT_AN_ALIAS_FOR_THE_FIELD - Select an alias for the field - - - - DEFINE_AN_ALIAS - You can define an alias to manipulate the field in console: - - - - ALIAS - Alias - - - - MSG_OPERATION_DEFINES_VARIABLE - (this operation defines a variable named <alias> in TUI console. Enter "<alias>.help()" to see available functions, or simply "doc") - - - - DlgChangeUnderlyingMesh - - - FORM - Form - - - - MESH_GT - Mesh -> - - - - MSG_EXPLORER - (Explorer provides a view on MED data sources (mesh and fields) referenced in data space) - - - - DATA_VERIFICATION - Data verification - - - - - SELECT_MESH - You must select a mesh in the explorer and clic the button Mesh - - - - DlgInterpolateField - - - SELECT_MESH - You must select a mesh in the explorer and clic the button Mesh - - - - TARGET_MESH_GT - Target mesh -> - - - - MSG_EXPLORER - (Explorer provides a view on MED data sources (mesh and fields) referenced in data space) - - - - LABEL_PRECISION - Interpolator precision - - - - LABEL_INTERSECTION_TYPE - Intersection type - - - - LABEL_METHOD - Interpolation method - - - - LABEL_DEFAULT_VALUE - Default value of resulting field - - - - LABEL_REVERSE - Reverse interpolation ? - - - - LABEL_NATURE - Field nature - - - - DlgImageToMed - - - FORM - Form - - - - IMAGE_FILE - Image file: - - - - MED_FILE - MED file: - - - - SELECT_IMAGE_FILE - Select image file - - - - SPECIFY_MED_FILE - Specify a MED file - - - - LOAD_AUTOMATICALLY - Load automatically - - - - DlgUseInWorkspace - - - FORM - Form - - - - PRESSURE - Pressure: - - - - TEMPERATURE - Temperature: - - - - GenericDialog - - - DIALOG - Dialog - - - - MEDModule - - - - IMPORT_FROM_FILE - Import from File - - - - IMPORT_MED_FILE - Import MED file - - - - MEN_FILE - &File - - - PREF_TAB_GENERAL - General - - - PREF_THEME_GROUP - Theme - - - PREF_ICONS - Icons - - - PREF_ICON_THEME_MODERN - Modern - - - PREF_ICON_THEME_CLASSIC - Classic - - - - WorkspaceController - - - VISUALIZE_SCALAR_MAP - Visualize (scalar map) - - - - USE_IN_CONSOLE - Use (in console) - - - - EXPORT_TO_PARAVIS - Export (to PARAVIS) - - - - SAVE_AS_MED - Save (as MED file) - - - - REMOVE_FROM_WORKSPACE - Remove (from workspace) - - - - LAB_SAVE_WORKSPACE - Save workspace - - - - TIP_SAVE_WORKSPACE - Save the workspace (fields and meshes) in a MED file - - - - LAB_CLEAN_WORKSPACE - Clean workspace - - - - TIP_CLEAN_WORKSPACE - Clean all data in the workspace - - - - SAVE_SELECTED_FIELDS - Save selected fields - - - - SAVE_WORKSPACE_DATA - Save workspace data - - - - NOT_IMPLEMENTED_YET - Not implemented yet - - - - FUNCTION_NOT_IMPLEMENTED - This function is not implemented yet - - - - @default - - - - - - - FILE_FILTER_MED - MED files (*.med) - - - - FILE_FILTER_PNG - PNG image (*.png) - - - - FILE_FILTER_JPG - JPG image (*.jpg) - - - - FILE_FILTER_PGM - PGM image (*.jpg) - - - - FILE_FILTER_ALL - All files (*.*) - - - LAB_VIEW_MODE - View mode: - - - LAB_VIEW_MODE_REPLACE - Replace - - - LAB_VIEW_MODE_OVERLAP - Overlap - - - LAB_VIEW_MODE_NEW_LAYOUT - New layout - - - LAB_VIEW_MODE_SPLIT_VIEW - Split - - - diff --git a/src/MEDCalc/gui/MED_msg_fr.ts b/src/MEDCalc/gui/MED_msg_fr.ts deleted file mode 100644 index 8b92efa4b..000000000 --- a/src/MEDCalc/gui/MED_msg_fr.ts +++ /dev/null @@ -1,625 +0,0 @@ - - - - - PresentationController - - TITLE_PRESENTATION_PARAMETERS - Paramètres de presentation - - - LAB_PRESENTATION_MESH_VIEW - Maillage - - - TIP_PRESENTATION_MESH_VIEW - Maillage - - - LAB_PRESENTATION_SCALAR_MAP - Carte scalaire - - - TIP_PRESENTATION_SCALAR_MAP - Carte scalaire - - - LAB_PRESENTATION_CONTOUR - Contour - - - TIP_PRESENTATION_CONTOUR - Contour - - - LAB_PRESENTATION_VECTOR_FIELD - Champ de vecteurs - - - TIP_PRESENTATION_VECTOR_FIELD - Champ de vecteurs - - - LAB_PRESENTATION_SLICES - Coupes - - - TIP_PRESENTATION_SLICES - Coupes - - - LAB_PRESENTATION_DEFLECTION_SHAPE - Déformée - - - TIP_PRESENTATION_DEFLECTION_SHAPE - Déformée - - - LAB_PRESENTATION_POINT_SPRITE - Point sprite - - - TIP_PRESENTATION_POINT_SPRITE - Point sprite - - - LAB_DELETE_PRESENTATION - Supprimer - - - TIP_DELETE_PRESENTATION - Supprime la présentation sélectionnée - - - LAB_PARAVIS_DUMP - Trace du pipeline - - - TIP_PARAVIS_DUMP - Affiche les commandes Python bas niveau de la présentation - - - MENU_PRESENTATIONS - Présentations - - - MEDPresentationMeshView - Maillage - - - MEDPresentationScalarMap - Carte scalaire - - - MEDPresentationContour - Contour - - - MEDPresentationVectorField - Champ de vecteurs - - - MEDPresentationSlices - Coupes - - - MEDPresentationDeflectionShape - Déformée - - - MEDPresentationPointSprite - Point sprite - - - - ProcessingController - - MENU_PROCESSING - Traitement - - - LAB_PROCESSING_CHANGE_MESH - Changer le maillage sous-jacent - - - LAB_PROCESSING_INTERPOLATE_FIELD - Interpoler le champ - - - - DatasourceController - - - LAB_ADD_DATA_SOURCE - Importer des données MED - - - - TIP_ADD_DATA_SOURCE - Ajouter des données par import de fichiers MED - - - - LAB_ADD_IMAGE_SOURCE - Ajouter une image - - - - TIP_ADD_IMAGE_SOURCE - Ajouter des données par import d'un fichier image - - - - LAB_EXPAND_FIELD - Étendre les series temporelles du champ - - - - LAB_USE_IN_WORKSPACE - Utiliser dans l'espace de travail - - - - IMPORT_MED_FIELDS - Importer des champs (format MED) - - - - OPERATION_FAILED - L'opération a échoué - - - - CREATION_FAILED - La création des données MED à partir d'un fichier image a échoué - - - - OPERATION_NOT_ALLOWED - Opération non autorisée - - - - FIELD_ALREADY_DEFINED - Ce champ est déjà défini dans l'espace de travail - - - - WidgetPresentationParameters - - LAB_DEFAULT_DYN_TITLE - Paramètres par défaut - - - LAB_DISP_COMP - Composante affichée : - - - LAB_EUCLIDEAN_NORM - Norme euclidienne - - - LAB_SCALARBAR - Echelle de valeurs : - - - LAB_RANGE - Intervalle : - - - LAB_ALL_TIMESTEPS - Tous les pas de temps - - - LAB_CURRENT_TIMESTEP - Pas de temps courant - - - LAB_USER_RANGE - Personnalisé : - - - LAB_TIMESTEP - Pas de temps : - - - LAB_MIN_VALUE - Valeur min : - - - LAB_MAX_VALUE - Valeur max : - - - LAB_COLOR_MAP - Table de couleurs : - - - LAB_MESH_WIREFRAME - Fil de fer - - - LAB_MESH_SURFACE - Surface - - - LAB_MESH_SURF_EDGES - Surface Avec Arrêtes - - - LAB_DISP_MESH_MODE - Affichage du maillage: - - - LAB_NB_CONTOURS - Nombre de contours (max. %1) : - - - LAB_NB_SLICES - Nombres de coupes (max. %1) : - - - LAB_SPINBOX_TOOLTIP - Taper 'Entrée' pour appliquer - - - LAB_SLICE_ORIENT - Orientation des coupes: - - - LAB_SLICE_NORMAL_TO_X - Normale à X - - - LAB_SLICE_NORMAL_TO_Y - Normale à Y - - - LAB_SLICE_NORMAL_TO_Z - Normale à Z - - - LAB_SLICE_NORMAL_TO_XY - Normale à XY - - - LAB_SLICE_NORMAL_TO_XZ - Normale à XZ - - - LAB_SLICE_NORMAL_TO_YZ - Normale à YZ - - - LAB_SLICE_NORMAL_TO_XYZ - Normale à XYZ - - - LAB_BLUE_TO_RED - Arc-en-ciel bleu vers rouge - - - LAB_COOL_TO_WARM - Froid vers chaud - - - - DlgAlias - - - SELECT_AN_ALIAS_FOR_THE_FIELD - Selectionner un alias pour ce champ - - - - DEFINE_AN_ALIAS - Vous pouvez définir un alias pour manipuler le champs dans la console: - - - - ALIAS - Alias - - - - MSG_OPERATION_DEFINES_VARIABLE - (cette opération définit une variable nommée <alias> dans la console texte. Tapez "<alias>.help()" pour voir les fonctions disponibles, ou simplement "doc") - - - - DlgChangeUnderlyingMesh - - - FORM - Formulaire - - - - MESH_GT - Maillage -> - - - - MSG_EXPLORER - (L'explorateur fournit une vue des données MED (maillage et champs) référencées dans l'espace des données) - - - - DATA_VERIFICATION - Vérification des données - - - - - SELECT_MESH - Vous devez sélectionner un maillage dans l'explorateur et cliquer sur le bouton Maillage - - - - DlgInterpolateField - - - SELECT_MESH - Vous devez sélectionner un maillage dans l'explorateur et cliquer sur le bouton Maillage - - - - TARGET_MESH_GT - Maillage cible -> - - - - MSG_EXPLORER - (L'explorateur fournit une vue des données MED (maillage et champs) référencées dans l'espace des données) - - - - LABEL_PRECISION - Précision de l'interpolateur - - - - LABEL_INTERSECTION_TYPE - Type d'intersection - - - - LABEL_METHOD - Méthode d'interpolation - - - - LABEL_DEFAULT_VALUE - Valeur par défaut du champ résultant - - - - LABEL_REVERSE - Interpolation inverse ? - - - - LABEL_NATURE - Nature du champ - - - - DlgImageToMed - - - FORM - Formulaire - - - - IMAGE_FILE - Fichier image : - - - - MED_FILE - Fichier MED : - - - - SELECT_IMAGE_FILE - Selectionner un fichier image - - - - SPECIFY_MED_FILE - Spécifier un fichier MED - - - - LOAD_AUTOMATICALLY - Charger automatiquement - - - - DlgUseInWorkspace - - - FORM - Formulaire - - - - PRESSURE - Pression : - - - - TEMPERATURE - Température : - - - - GenericDialog - - - DIALOG - Dialogue - - - - MEDModule - - - - IMPORT_FROM_FILE - Importer depuis un fichier - - - - IMPORT_MED_FILE - Importer un fichier MED - - - - MEN_FILE - &Fichier - - - PREF_TAB_GENERAL - Général - - - PREF_THEME_GROUP - Thème - - - PREF_ICONS - Icones - - - PREF_ICON_THEME_MODERN - Moderne - - - PREF_ICON_THEME_CLASSIC - Classique - - - - WorkspaceController - - - VISUALIZE_SCALAR_MAP - Visualiser (carte scalaire) - - - - USE_IN_CONSOLE - Utiliser (dans la console) - - - - EXPORT_TO_PARAVIS - Exporter (vers PARAVIS) - - - - SAVE_AS_MED - Sauvegarder (dans un fichier MED) - - - - REMOVE_FROM_WORKSPACE - Supprimer (de l'espace de travail) - - - - LAB_SAVE_WORKSPACE - Sauvegarder l'espace de travail - - - - TIP_SAVE_WORKSPACE - Sauvegarder l'espace de travail (champs et maillages) dans un fichier MED - - - - LAB_CLEAN_WORKSPACE - Nettoyer l'espace de travail - - - - TIP_CLEAN_WORKSPACE - Effacer toute les données de l'espace de travail - - - - SAVE_SELECTED_FIELDS - Sauvegarder les champs sélectionnés - - - - SAVE_WORKSPACE_DATA - Sauvegarder les données de l'espace de travail - - - - NOT_IMPLEMENTED_YET - Non implémenté - - - - FUNCTION_NOT_IMPLEMENTED - Cette function n'est pas encore implémentée - - - - @default - - - - - - - FILE_FILTER_MED - Fichiers MED (*.med) - - - - FILE_FILTER_PNG - Image PNG (*.png) - - - - FILE_FILTER_JPG - Image JPG (*.jpg) - - - - FILE_FILTER_PGM - Image PGM (*.jpg) - - - - FILE_FILTER_ALL - Tous les fichiers (*.*) - - - LAB_VIEW_MODE - Mode de rendu : - - - LAB_VIEW_MODE_REPLACE - Remplacer - - - LAB_VIEW_MODE_OVERLAP - Superposer - - - LAB_VIEW_MODE_NEW_LAYOUT - Nouvel onglet - - - LAB_VIEW_MODE_SPLIT_VIEW - Scinder - - - diff --git a/src/MEDCalc/gui/MED_msg_ja.ts b/src/MEDCalc/gui/MED_msg_ja.ts deleted file mode 100644 index 59f48fb88..000000000 --- a/src/MEDCalc/gui/MED_msg_ja.ts +++ /dev/null @@ -1,625 +0,0 @@ - - - - - PresentationController - - TITLE_PRESENTATION_PARAMETERS - 表現パラメータ - - - LAB_PRESENTATION_MESH_VIEW - メッシュ - - - TIP_PRESENTATION_MESH_VIEW - メッシュ - - - LAB_PRESENTATION_SCALAR_MAP - スカラーマップ - - - TIP_PRESENTATION_SCALAR_MAP - スカラーマップ - - - LAB_PRESENTATION_CONTOUR - コンター - - - TIP_PRESENTATION_CONTOUR - コンター - - - LAB_PRESENTATION_VECTOR_FIELD - ベクトル場 - - - TIP_PRESENTATION_VECTOR_FIELD - ベクトル場 - - - LAB_PRESENTATION_SLICES - スライス - - - TIP_PRESENTATION_SLICES - スライス - - - LAB_PRESENTATION_DEFLECTION_SHAPE - 偏差形状 - - - TIP_PRESENTATION_DEFLECTION_SHAPE - 偏差形状 - - - LAB_PRESENTATION_POINT_SPRITE - 点スプライト描画 - - - TIP_PRESENTATION_POINT_SPRITE - 点スプライト - - - LAB_DELETE_PRESENTATION - プレゼンテーションの削除 - - - TIP_DELETE_PRESENTATION - 選択されたプレゼンテーションの削除 - - - LAB_PARAVIS_DUMP - パイプラインの保存 - - - TIP_PARAVIS_DUMP - プレゼンテーションの低レベルPythonコマンドをダンプ - - - MENU_PRESENTATIONS - プレゼンテーション - - - MEDPresentationMeshView - メッシュビュー - - - MEDPresentationScalarMap - スカラーマップ - - - MEDPresentationContour - コンター - - - MEDPresentationVectorField - ベクトル場 - - - MEDPresentationSlices - スライス - - - MEDPresentationDeflectionShape - 偏差形状 - - - MEDPresentationPointSprite - 点スプライト描画 - - - - ProcessingController - - MENU_PROCESSING - 処理中 - - - LAB_PROCESSING_CHANGE_MESH - 基本要素の変更 - - - LAB_PROCESSING_INTERPOLATE_FIELD - 場の補間 - - - - DatasourceController - - - LAB_ADD_DATA_SOURCE - データソースの追加 - - - - TIP_ADD_DATA_SOURCE - （medデータを供給する）ファイルデータソースの追加 - - - - LAB_ADD_IMAGE_SOURCE - イメージソースの追加 - - - - TIP_ADD_IMAGE_SOURCE - イメージファイルからデータソースの作成 - - - - LAB_EXPAND_FIELD - 場の時系列を拡張 - - - - LAB_USE_IN_WORKSPACE - ワークスペースの使用 - - - - IMPORT_MED_FIELDS - MEDフィールドのインポート - - - - OPERATION_FAILED - 操作に失敗しました。 - - - - CREATION_FAILED - イメージファイルからMEDデータの作成に失敗しました。 - - - - OPERATION_NOT_ALLOWED - 許可されていない操作です。 - - - - FIELD_ALREADY_DEFINED - この場はワークスペース内で既に定義されています。 - - - - WidgetPresentationParameters - - LAB_DEFAULT_DYN_TITLE - デフォルトパラメータ - - - LAB_DISP_COMP - 表示されたコンポーネント: - - - LAB_EUCLIDEAN_NORM - ユークリッド幾何学基準 - - - LAB_SCALARBAR - スカラバー: - - - LAB_RANGE - 範囲: - - - LAB_ALL_TIMESTEPS - すべてのタイムステップ - - - LAB_CURRENT_TIMESTEP - 現在のタイムステップ - - - LAB_USER_RANGE - ユーザ指定 - - - LAB_TIMESTEP - タイムステップ: - - - LAB_MIN_VALUE - 最小値: - - - LAB_MAX_VALUE - 最大値: - - - LAB_COLOR_MAP - カラーマップ: - - - LAB_MESH_WIREFRAME - ワイヤフレーム - - - LAB_MESH_SURFACE - 表面 - - - LAB_MESH_SURF_EDGES - エッジを持った表面 - - - LAB_DISP_MESH_MODE - メッシュ表示: - - - LAB_NB_CONTOURS - コンタ数 (max. %1): - - - LAB_NB_SLICES - スライス数 (max. %1): - - - LAB_SPINBOX_TOOLTIP - Enterキーを押して適用 - - - LAB_SLICE_ORIENT - スライス方向: - - - LAB_SLICE_NORMAL_TO_X - Xと垂直 - - - LAB_SLICE_NORMAL_TO_Y - Yと垂直 - - - LAB_SLICE_NORMAL_TO_Z - Zと垂直 - - - LAB_SLICE_NORMAL_TO_XY - XYと垂直 - - - LAB_SLICE_NORMAL_TO_XZ - XZと垂直 - - - LAB_SLICE_NORMAL_TO_YZ - YZと垂直 - - - LAB_SLICE_NORMAL_TO_XYZ - XYZと垂直 - - - LAB_BLUE_TO_RED - 青-赤 グラデーション - - - LAB_COOL_TO_WARM - 冷却から温め - - - - DlgAlias - - - SELECT_AN_ALIAS_FOR_THE_FIELD - 場のエイリアスを選択 - - - - DEFINE_AN_ALIAS - コンソールでの場の操作に対するエイリアスを定義することができる: - - - - ALIAS - エイリアス - - - - MSG_OPERATION_DEFINES_VARIABLE - (この操作はテキスト コンソールに<alias>という名前の変数を定義します。 "<alias>. help()"と入力すると機能、または単純な「doc」を見ることがきます) - - - - DlgChangeUnderlyingMesh - - - FORM - フォーム - - - - MESH_GT - メッシュ -> - - - - MSG_EXPLORER - エクスプローラによってデータスペース内で参照されたMEDデータソース（メッシュおよび場）上に表示します。 - - - - DATA_VERIFICATION - データの検証 - - - - - SELECT_MESH - エクスプローラ内のメッシュを選択し、メッシュボタンをクリックする必要があります。 - - - - DlgInterpolateField - - - SELECT_MESH - エクスプローラ内のメッシュを選択し、メッシュボタンをクリックする必要があります。 - - - - TARGET_MESH_GT - ターゲットのメッシュ -> - - - - MSG_EXPLORER - エクスプローラによってデータスペース内で参照されたMEDデータソース（メッシュおよび場）上に表示します。 - - - - LABEL_PRECISION - 挿入精度 - - - - LABEL_INTERSECTION_TYPE - 交点タイプ - - - - LABEL_METHOD - 挿入方法 - - - - LABEL_DEFAULT_VALUE - 結果フィールドのデフォルト値 - - - - LABEL_REVERSE - 挿入を反転しますか？ - - - - LABEL_NATURE - フィールド性質 - - - - DlgImageToMed - - - FORM - フォーム - - - - IMAGE_FILE - 画像ファイル: - - - - MED_FILE - MED ファイル: - - - - SELECT_IMAGE_FILE - イメージ ファイルの選択 - - - - SPECIFY_MED_FILE - MED ファイルの指定 - - - - LOAD_AUTOMATICALLY - 自動読み込み - - - - DlgUseInWorkspace - - - FORM - フォーム - - - - PRESSURE - 圧力: - - - - TEMPERATURE - 温度: - - - - GenericDialog - - - DIALOG - ダイアログ - - - - MEDModule - - - - IMPORT_FROM_FILE - ファイルからのインポート - - - - IMPORT_MED_FILE - MEDファイルをインポート - - - - MEN_FILE - ファイル(&F) - - - PREF_TAB_GENERAL - 一般的な - - - PREF_THEME_GROUP - テーマ - - - PREF_ICONS - アイコン - - - PREF_ICON_THEME_MODERN - モダン - - - PREF_ICON_THEME_CLASSIC - クラシック - - - - WorkspaceController - - - VISUALIZE_SCALAR_MAP - 視覚化 (スカラーマップ) - - - - USE_IN_CONSOLE - 使用 (コンソルにおいて) - - - - EXPORT_TO_PARAVIS - 書き出し (PARAVISへ) - - - - SAVE_AS_MED - 保存 (MED ファイルとして) - - - - REMOVE_FROM_WORKSPACE - 削除 (ワークスペースから) - - - - LAB_SAVE_WORKSPACE - ワークスペースの表示 - - - - TIP_SAVE_WORKSPACE - ワークスペースの保存 (メッシュと場) MED ファイル内 - - - - LAB_CLEAN_WORKSPACE - ワークスペースのクリーニグ - - - - TIP_CLEAN_WORKSPACE - ワークスペース内の全データのクリーニング - - - - SAVE_SELECTED_FIELDS - 選択場の保存 - - - - SAVE_WORKSPACE_DATA - ワークスペースデータの保存 - - - - NOT_IMPLEMENTED_YET - 未実装 - - - - FUNCTION_NOT_IMPLEMENTED - この機能はまだ実装されていません - - - - @default - - - - - - - FILE_FILTER_MED - MED ファイル (*.med) - - - - FILE_FILTER_PNG - PNG 画像 (*.png) - - - - FILE_FILTER_JPG - JPG 画像 (*.jpg) - - - - FILE_FILTER_PGM - PGM 画像 (*.jpg) - - - - FILE_FILTER_ALL - 全ファイル (*.*) - - - LAB_VIEW_MODE - ビューモード: - - - LAB_VIEW_MODE_REPLACE - 置き換え - - - LAB_VIEW_MODE_OVERLAP - オーバーラップ - - - LAB_VIEW_MODE_NEW_LAYOUT - 新レイアウト - - - LAB_VIEW_MODE_SPLIT_VIEW - 分割 - - - diff --git a/src/MEDCalc/gui/dialogs/DlgImageToMed.cxx b/src/MEDCalc/gui/dialogs/DlgImageToMed.cxx index 6a5d05b3b..21f8abd53 100644 --- a/src/MEDCalc/gui/dialogs/DlgImageToMed.cxx +++ b/src/MEDCalc/gui/dialogs/DlgImageToMed.cxx @@ -32,7 +32,7 @@ DlgImageToMed::DlgImageToMed(QDialog *parent) : GenericDialog(parent) { ui.setupUi(this->getPanel()); - QString moduleName = "MED"; + QString moduleName = "FIELDS"; QPixmap aPixmap = GUI::getResourcesManager()->loadPixmap( moduleName, tr("ICO_FOLDER") ); QIcon icon(aPixmap); ui.btnImageFileChooser->setIcon(icon); diff --git a/src/MEDCalc/gui/factory.cxx b/src/MEDCalc/gui/factory.cxx index 215c32553..30854142b 100644 --- a/src/MEDCalc/gui/factory.cxx +++ b/src/MEDCalc/gui/factory.cxx @@ -33,7 +33,7 @@ * configuration below is MEDModule. */ -#include +#include #include "MEDModule.hxx" #include "MEDCALCGUI.hxx" @@ -59,7 +59,7 @@ extern "C" { /*! This function specifies the version of the module to be displayed in the about dialog box */ MEDCALCGUI_EXPORT char* getModuleVersion() { - return (char*)SALOMEMED_VERSION_STR; + return (char*)SALOMEFIELDS_VERSION_STR; } } diff --git a/src/MEDCalc/res/CMakeLists.txt b/src/MEDCalc/res/CMakeLists.txt index a69b6db66..154fec1a8 100644 --- a/src/MEDCalc/res/CMakeLists.txt +++ b/src/MEDCalc/res/CMakeLists.txt @@ -22,4 +22,4 @@ ADD_SUBDIRECTORY(presentations) FILE(GLOB MED_RESOURCES_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/*.png") -INSTALL(FILES ${MED_RESOURCES_FILES} DESTINATION ${SALOME_MED_INSTALL_RES_DATA}) +INSTALL(FILES ${MED_RESOURCES_FILES} DESTINATION ${SALOME_FIELDS_INSTALL_RES_DATA}) diff --git a/src/MEDCalc/res/presentations/classic/CMakeLists.txt b/src/MEDCalc/res/presentations/classic/CMakeLists.txt index d574ae324..2d8b072af 100644 --- a/src/MEDCalc/res/presentations/classic/CMakeLists.txt +++ b/src/MEDCalc/res/presentations/classic/CMakeLists.txt @@ -19,4 +19,4 @@ FILE(GLOB MED_RESOURCES_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/*.png") -INSTALL(FILES ${MED_RESOURCES_FILES} DESTINATION ${SALOME_MED_INSTALL_RES_DATA}) +INSTALL(FILES ${MED_RESOURCES_FILES} DESTINATION ${SALOME_FIELDS_INSTALL_RES_DATA}) diff --git a/src/MEDCalc/res/presentations/modern/CMakeLists.txt b/src/MEDCalc/res/presentations/modern/CMakeLists.txt index d574ae324..2d8b072af 100644 --- a/src/MEDCalc/res/presentations/modern/CMakeLists.txt +++ b/src/MEDCalc/res/presentations/modern/CMakeLists.txt @@ -19,4 +19,4 @@ FILE(GLOB MED_RESOURCES_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/*.png") -INSTALL(FILES ${MED_RESOURCES_FILES} DESTINATION ${SALOME_MED_INSTALL_RES_DATA}) +INSTALL(FILES ${MED_RESOURCES_FILES} DESTINATION ${SALOME_FIELDS_INSTALL_RES_DATA}) diff --git a/src/MEDCalc/res/testfiles/CMakeLists.txt b/src/MEDCalc/res/testfiles/CMakeLists.txt index 24567b8f5..87b89265e 100644 --- a/src/MEDCalc/res/testfiles/CMakeLists.txt +++ b/src/MEDCalc/res/testfiles/CMakeLists.txt @@ -32,7 +32,7 @@ SET(MED_FILES padderoutput.med ) -INSTALL(FILES ${MED_FILES} DESTINATION ${SALOME_MED_INSTALL_RES_DATA}/medcalc_testfiles) +INSTALL(FILES ${MED_FILES} DESTINATION ${SALOME_FIELDS_INSTALL_RES_DATA}/medcalc_testfiles) SET(MED_IMG_FILES irm_test1.png @@ -42,4 +42,4 @@ SET(MED_IMG_FILES champ_altitude_MAP.pgm ) -INSTALL(FILES ${MED_IMG_FILES} DESTINATION ${SALOME_MED_INSTALL_RES_DATA}/medcalc_testfiles) +INSTALL(FILES ${MED_IMG_FILES} DESTINATION ${SALOME_FIELDS_INSTALL_RES_DATA}/medcalc_testfiles) diff --git a/src/MEDCalc/test/CMakeLists.txt b/src/MEDCalc/test/CMakeLists.txt index 964172e05..dcc6fc662 100644 --- a/src/MEDCalc/test/CMakeLists.txt +++ b/src/MEDCalc/test/CMakeLists.txt @@ -20,16 +20,16 @@ SALOME_CONFIGURE_FILE(medcalc_testutils.py.in ${CMAKE_CURRENT_BINARY_DIR}/medcalc_testutils.py) IF(SALOME_BUILD_GUI) - IF(SALOME_MED_WITH_QTTESTING) + IF(SALOME_FIELDS_WITH_QTTESTING) ADD_SUBDIRECTORY(gui) ENDIF() ENDIF() -IF(SALOME_MED_ENABLE_PYTHON) +IF(SALOME_FIELDS_ENABLE_PYTHON) ADD_SUBDIRECTORY(tui) ENDIF() -SET(TEST_INSTALL_DIRECTORY ${SALOME_MED_INSTALL_TEST}/MEDCalc) +SET(TEST_INSTALL_DIRECTORY ${SALOME_FIELDS_INSTALL_TEST}/MEDCalc) SALOME_INSTALL_SCRIPTS(${CMAKE_CURRENT_BINARY_DIR}/medcalc_testutils.py ${SALOME_INSTALL_SCRIPT_SCRIPTS}) INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${TEST_INSTALL_DIRECTORY} diff --git a/src/MEDCalc/test/gui/CMakeLists.txt b/src/MEDCalc/test/gui/CMakeLists.txt index dd43e6e7c..c29d55ff6 100644 --- a/src/MEDCalc/test/gui/CMakeLists.txt +++ b/src/MEDCalc/test/gui/CMakeLists.txt @@ -34,15 +34,15 @@ SET(_test_files ) # Install rules -SET(TEST_INSTALL_DIRECTORY ${SALOME_MED_INSTALL_TEST}/MEDCalc/gui) +SET(TEST_INSTALL_DIRECTORY ${SALOME_FIELDS_INSTALL_TEST}/MEDCalc/gui) SALOME_INSTALL_SCRIPTS(test_qttesting.py ${TEST_INSTALL_DIRECTORY}) SALOME_INSTALL_SCRIPTS("${_test_scripts}" ${SALOME_INSTALL_PYTHON}/tests/gui) -INSTALL(FILES ${_test_scenarii} DESTINATION ${SALOME_MED_INSTALL_RES_DATA}/tests/gui/scenarios) -INSTALL(FILES ${_test_baselines} DESTINATION ${SALOME_MED_INSTALL_RES_DATA}/tests/gui/baselines) -INSTALL(FILES ${_test_files} DESTINATION ${SALOME_MED_INSTALL_RES_DATA}/tests/gui/medfiles) +INSTALL(FILES ${_test_scenarii} DESTINATION ${SALOME_FIELDS_INSTALL_RES_DATA}/tests/gui/scenarios) +INSTALL(FILES ${_test_baselines} DESTINATION ${SALOME_FIELDS_INSTALL_RES_DATA}/tests/gui/baselines) +INSTALL(FILES ${_test_files} DESTINATION ${SALOME_FIELDS_INSTALL_RES_DATA}/tests/gui/medfiles) INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${TEST_INSTALL_DIRECTORY} diff --git a/src/MEDCalc/test/medcalc_testutils.py.in b/src/MEDCalc/test/medcalc_testutils.py.in index 77e825515..d73d4c3f1 100644 --- a/src/MEDCalc/test/medcalc_testutils.py.in +++ b/src/MEDCalc/test/medcalc_testutils.py.in @@ -20,7 +20,7 @@ import os def __getRootDir(): - rootDir = os.environ.get("MED_ROOT_DIR", "") + rootDir = os.environ.get("FIELDS_ROOT_DIR", "") return rootDir # === GUI === diff --git a/src/MEDCalc/test/tui/CMakeLists.txt b/src/MEDCalc/test/tui/CMakeLists.txt index 8a6cc20e4..cff341c85 100644 --- a/src/MEDCalc/test/tui/CMakeLists.txt +++ b/src/MEDCalc/test/tui/CMakeLists.txt @@ -25,7 +25,7 @@ SET(_test_files medfiles/deplacements.med ) -SET(TEST_INSTALL_DIRECTORY ${SALOME_MED_INSTALL_TEST}/MEDCalc/tui) +SET(TEST_INSTALL_DIRECTORY ${SALOME_FIELDS_INSTALL_TEST}/MEDCalc/tui) FOREACH(tfile ${TEST_NAMES}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py @@ -38,4 +38,4 @@ INSTALL(FILES CTestTestfileInstall.cmake INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY}) -INSTALL(FILES ${_test_files} DESTINATION ${SALOME_MED_INSTALL_RES_DATA}/tests/tui/medfiles) +INSTALL(FILES ${_test_files} DESTINATION ${SALOME_FIELDS_INSTALL_RES_DATA}/tests/tui/medfiles) diff --git a/src/MEDCalc/tui/medcorba.py b/src/MEDCalc/tui/medcorba.py index fa828c6ac..16552468d 100644 --- a/src/MEDCalc/tui/medcorba.py +++ b/src/MEDCalc/tui/medcorba.py @@ -32,7 +32,7 @@ # containerType = Name of the container factory # factoryComponentName = "MEDFactory" -medComponentName = "MED" +medComponentName = "FIELDS" #corbaModule = "MEDCALC" containerType = "FactoryServer" @@ -44,7 +44,7 @@ if salome.lcc is None: import MEDCALC # corbaModule med_engine = salome.lcc.FindOrLoadComponent(containerType,medComponentName) factory = salome.lcc.FindOrLoadComponent(containerType,factoryComponentName) -# The factory is not the main CORBA component of the SALOME module MED +# The factory is not the main CORBA component of the SALOME module FIELDS # (i.e. the engine associated to the study), but the CORBA # entry point for MED fields operations (i.e. a CORBA component # reachable through the LifeCycleCORBA). This entry point is used to diff --git a/src/MEDCalc/tui/medimages.py b/src/MEDCalc/tui/medimages.py index 649334103..e36ad86b4 100644 --- a/src/MEDCalc/tui/medimages.py +++ b/src/MEDCalc/tui/medimages.py @@ -130,8 +130,8 @@ class FieldBuilder: def getTestImagePath(): import os - MED_ROOT_DIR=os.environ["MED_ROOT_DIR"] - RESDIR=os.path.join(MED_ROOT_DIR, "share", "salome", "resources", "med", "medcalc_testfiles") + FIELDS_ROOT_DIR=os.environ["FIELDS_ROOT_DIR"] + RESDIR=os.path.join(FIELDS_ROOT_DIR, "share", "salome", "resources", "fields", "medcalc_testfiles") imgFileName="irm_test1.png" imgFilePath=os.path.join(RESDIR,imgFileName) return imgFilePath diff --git a/src/MEDCalculator/CMakeLists.txt b/src/MEDCalculator/CMakeLists.txt index 797b01a61..906524e83 100644 --- a/src/MEDCalculator/CMakeLists.txt +++ b/src/MEDCalculator/CMakeLists.txt @@ -20,12 +20,12 @@ ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${MEDFILE_DEFINITIONS} ${OMNIORB_DEFINITIONS}) -IF(SALOME_MED_ENABLE_PYTHON) +IF(SALOME_FIELDS_ENABLE_PYTHON) ADD_SUBDIRECTORY(Swig) IF(SALOME_BUILD_TESTS) ADD_SUBDIRECTORY(Test) ENDIF(SALOME_BUILD_TESTS) -ENDIF(SALOME_MED_ENABLE_PYTHON) +ENDIF(SALOME_FIELDS_ENABLE_PYTHON) INCLUDE_DIRECTORIES( ${MEDFILE_INCLUDE_DIRS} diff --git a/src/MEDCalculator/Test/CMakeLists.txt b/src/MEDCalculator/Test/CMakeLists.txt index 8dbaa3774..184c8dc51 100644 --- a/src/MEDCalculator/Test/CMakeLists.txt +++ b/src/MEDCalculator/Test/CMakeLists.txt @@ -45,7 +45,7 @@ INSTALL(TARGETS TestMEDCalculator DESTINATION ${SALOME_INSTALL_BINS}) # Application tests -SET(TEST_INSTALL_DIRECTORY ${SALOME_MED_INSTALL_TEST}/MEDCalculator) +SET(TEST_INSTALL_DIRECTORY ${SALOME_FIELDS_INSTALL_TEST}/MEDCalculator) INSTALL(TARGETS TestMEDCalculator DESTINATION ${TEST_INSTALL_DIRECTORY}) INSTALL(FILES CTestTestfileInstall.cmake diff --git a/src/MEDGUI/CMakeLists.txt b/src/MEDGUI/CMakeLists.txt index cbb8ddbc1..125ad435a 100644 --- a/src/MEDGUI/CMakeLists.txt +++ b/src/MEDGUI/CMakeLists.txt @@ -57,4 +57,4 @@ SET(MEDGUITS_SOURCES ADD_LIBRARY(MEDGUI SHARED ${MEDGUI_SOURCES} ${MEDGUI_HEADERS_MOC} ${MEDGUI_FORMS_HEADERS}) TARGET_LINK_LIBRARIES(MEDGUI medcalculator ${QT_MT_LIBS} ${BOOST_LIBRARIES} ${GUI_LDFLAGS} ${SalomeApp} ${CAM} ${LightApp} ${qtx} ${suit} ${SalomeObject} ${PLATFORM_LIBS} ${SalomeLifeCycleCORBA}) INSTALL(TARGETS MEDGUI DESTINATION ${SALOME_INSTALL_LIBS}) -QT_INSTALL_TS_RESOURCES("${MEDGUITS_SOURCES}" "${SALOME_MED_INSTALL_RES_DATA}") +QT_INSTALL_TS_RESOURCES("${MEDGUITS_SOURCES}" "${SALOME_FIELDS_INSTALL_RES_DATA}") diff --git a/src/MEDGUI/MEDGUIDataBaseDockWidget.cxx b/src/MEDGUI/MEDGUIDataBaseDockWidget.cxx index 9fe6cd703..7732dc8f6 100644 --- a/src/MEDGUI/MEDGUIDataBaseDockWidget.cxx +++ b/src/MEDGUI/MEDGUIDataBaseDockWidget.cxx @@ -49,11 +49,11 @@ MEDGUIDataBaseDockWidget::MEDGUIDataBaseDockWidget(CAM_Application *app, QWidget // QPixmap pixmap; SUIT_ResourceMgr* mgr=_app->resourceMgr(); - pixmap=mgr->loadPixmap("MED","med_field.png"); + pixmap=mgr->loadPixmap("FIELDS","med_field.png"); _fields=new QTreeWidgetItem((QTreeWidget*)0,QStringList(QString("Fields"))); _fields->setIcon(0,QIcon(pixmap)); _tree_widget->addTopLevelItem(_fields); - pixmap=mgr->loadPixmap("MED","med_mesh.png"); + pixmap=mgr->loadPixmap("FIELDS","med_mesh.png"); _meshes=new QTreeWidgetItem((QTreeWidget*)0,QStringList(QString("Meshes"))); _meshes->setIcon(0,QIcon(pixmap)); _tree_widget->addTopLevelItem(_meshes);