From 86b9c30019e1ddee7bb367eae674c9515f3d1892 Mon Sep 17 00:00:00 2001 From: michael Date: Sat, 30 Jan 2021 21:55:23 +0100 Subject: [PATCH] Separated the data depending on salome from the data not depending in salome --- CoreFlows/gui/{src => }/CFDesktop.py | 0 CoreFlows/gui/CMakeLists.txt | 140 +++++------------- .../gui/{src => }/CoreFlows_Standalone.py | 0 .../gui/{src => }/SalomePyQt_MockUp.py.in | 0 CoreFlows/gui/salome/CMakeLists.txt | 126 ++++++++++++++++ .../gui/{ => salome}/resources/CMakeLists.txt | 0 .../{ => salome}/resources/SalomeApp.xml.in | 0 CoreFlows/gui/{ => salome}/resources/icon.png | Bin .../gui/{ => salome}/src/.CMakeLists.txt.swp | Bin CoreFlows/gui/{ => salome}/src/CMakeLists.txt | 6 +- .../gui/{ => salome}/src/SOLVERLABGUI.py | 0 CoreFlows/gui/{src => }/ui/CMakeLists.txt | 18 ++- CoreFlows/gui/{src => }/ui/MainCFWidget.py | 0 CoreFlows/gui/{src => }/ui/MainCFWidget.ui | 6 +- CoreFlows/gui/{src => }/utils.py.in | 4 +- 15 files changed, 178 insertions(+), 122 deletions(-) rename CoreFlows/gui/{src => }/CFDesktop.py (100%) mode change 100755 => 100644 CoreFlows/gui/CMakeLists.txt rename CoreFlows/gui/{src => }/CoreFlows_Standalone.py (100%) rename CoreFlows/gui/{src => }/SalomePyQt_MockUp.py.in (100%) create mode 100755 CoreFlows/gui/salome/CMakeLists.txt rename CoreFlows/gui/{ => salome}/resources/CMakeLists.txt (100%) rename CoreFlows/gui/{ => salome}/resources/SalomeApp.xml.in (100%) rename CoreFlows/gui/{ => salome}/resources/icon.png (100%) rename CoreFlows/gui/{ => salome}/src/.CMakeLists.txt.swp (100%) rename CoreFlows/gui/{ => salome}/src/CMakeLists.txt (95%) rename CoreFlows/gui/{ => salome}/src/SOLVERLABGUI.py (100%) rename CoreFlows/gui/{src => }/ui/CMakeLists.txt (55%) rename CoreFlows/gui/{src => }/ui/MainCFWidget.py (100%) rename CoreFlows/gui/{src => }/ui/MainCFWidget.ui (99%) rename CoreFlows/gui/{src => }/utils.py.in (60%) diff --git a/CoreFlows/gui/src/CFDesktop.py b/CoreFlows/gui/CFDesktop.py similarity index 100% rename from CoreFlows/gui/src/CFDesktop.py rename to CoreFlows/gui/CFDesktop.py diff --git a/CoreFlows/gui/CMakeLists.txt b/CoreFlows/gui/CMakeLists.txt old mode 100755 new mode 100644 index 1009e35..5fae7d7 --- a/CoreFlows/gui/CMakeLists.txt +++ b/CoreFlows/gui/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2014 CEA/DEN, EDF R&D +# Copyright (C) 2012-2021 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 @@ -16,111 +16,41 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -cmake_minimum_required (VERSION 3.1) -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -INCLUDE(CMakeDependentOption) -# Versioning -# =========== -# Project name, upper case -STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) -SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7) -SET(${PROJECT_NAME_UC}_MINOR_VERSION 8) -SET(${PROJECT_NAME_UC}_PATCH_VERSION 0) -SET(${PROJECT_NAME_UC}_VERSION - ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION}) -SET(${PROJECT_NAME_UC}_VERSION_DEV 1) -# User options -# ============ -OPTION(SALOME_BUILD_DOC "Generate SALOME CoreFlows documentation" ON) -OPTION(SALOME_BUILD_TESTS "Generate SALOME CoreFlows tests" ON) - -# Common CMake macros -# =================== -SET(CONFIGURATION_ROOT_DIR $ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake configuration files") -IF(EXISTS ${CONFIGURATION_ROOT_DIR}) - LIST(APPEND CMAKE_MODULE_PATH "${CONFIGURATION_ROOT_DIR}/cmake") - INCLUDE(SalomeMacros NO_POLICY_SCOPE) -ELSE() - MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !") -ENDIF() - -# Find KERNEL -# ============== -SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL") -IF( EXISTS ${KERNEL_ROOT_DIR} ) - FIND_PACKAGE(SalomeKERNEL REQUIRED) -ELSE( EXISTS ${KERNEL_ROOT_DIR} ) - MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR!") -ENDIF( EXISTS ${KERNEL_ROOT_DIR} ) - -# Find SALOME GUI -# ============== -SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the Salome GUI") -IF(EXISTS ${GUI_ROOT_DIR}) - FIND_PACKAGE(SalomeGUI) -ELSE(EXISTS ${GUI_ROOT_DIR}) - MESSAGE(FATAL_ERROR "We absolutely need a Salome GUI, please define GUI_ROOT_DIR!") -ENDIF(EXISTS ${GUI_ROOT_DIR}) - -# Platform setup -# ============== -INCLUDE(SalomeSetupPlatform) # From KERNEL - -# Prerequisites -# ============= - -# Mandatory products -IF( ${SalomeKERNEL_VERSION} STRLESS "7.8.0") - FIND_PACKAGE(SalomePython REQUIRED) -ELSE() - FIND_PACKAGE(SalomePythonInterp REQUIRED) - FIND_PACKAGE(SalomePythonLibs REQUIRED) -ENDIF() -MESSAGE(STATUS "SalomeKERNEL_VERSION is ${SalomeKERNEL_VERSION}") - -# Qt5 -FIND_PACKAGE(SalomeQt5 REQUIRED COMPONENTS QtCore QtGui) - -IF(SALOME_BUILD_DOC) -# FIND_PACKAGE(SalomeDoxygen) -# FIND_PACKAGE(SalomeSphinx) -# SALOME_LOG_OPTIONAL_PACKAGE(Doxygen SALOME_BUILD_DOC) -# SALOME_LOG_OPTIONAL_PACKAGE(Sphinx SALOME_BUILD_DOC) -# ADD_DEFINITIONS(-DDOXYGEN_IS_OK) -ENDIF() - -IF(SALOME_BUILD_TESTS) - ENABLE_TESTING() -ENDIF() - -# Detection summary: -SALOME_PACKAGE_REPORT_AND_CHECK() - -# Directories -# =========== -SET(SALOME_INSTALL_LIBS "${SALOME_INSTALL_LIBS}" CACHE PATH "Install path: SALOME libs") -SET(SALOME_INSTALL_PYTHON "${SALOME_INSTALL_PYTHON}" CACHE PATH - "Install path: SALOME Python scripts") -SET(SALOME_INSTALL_SCRIPT_PYTHON "${SALOME_INSTALL_SCRIPT_PYTHON}" CACHE PATH - "Install path: SALOME Python scripts") -SET(SALOME_INSTALL_CMAKE_LOCAL ${SALOME_INSTALL_CMAKE_LOCAL} CACHE PATH - "Install path: local SALOME CMake files") -SET(SALOME_INSTALL_RES "${SALOME_INSTALL_RES}" CACHE PATH "Install path: SALOME resources") -SET(SALOME_INSTALL_DOC "${SALOME_INSTALL_DOC}" CACHE PATH "Install path: SALOME documentation") -SET(SALOME_INSTALL_HEADERS ${SALOME_INSTALL_HEADERS} CACHE PATH "Install path: SALOME headers") - -# Specific to CoreFlows: -SET(SALOME_CoreFlows_INSTALL_RES_DATA ${SALOME_INSTALL_RES}/coreflows CACHE PATH "Install path: SALOME COREFLOWS specific resources") - -# Sources -# ======== -ADD_SUBDIRECTORY(src) -ADD_SUBDIRECTORY(resources) -IF(SALOME_BUILD_DOC) -# ADD_SUBDIRECTORY(doc) -ENDIF() +SET(GUI_bin_SCRIPTS + ${CMAKE_CURRENT_SOURCE_DIR}/CoreFlows_Standalone.py +) + +SET(GUI_lib_SCRIPTS + ${CMAKE_CURRENT_SOURCE_DIR}/CFDesktop.py +) + + +IF ( (EXISTS $ENV{CONFIGURATION_ROOT_DIR}) AND (EXISTS $ENV{KERNEL_ROOT_DIR}) AND (EXISTS $ENV{GUI_ROOT_DIR}) ) + ADD_SUBDIRECTORY(salome) +ELSE ( (EXISTS $ENV{CONFIGURATION_ROOT_DIR}) AND (EXISTS $ENV{KERNEL_ROOT_DIR}) AND (EXISTS $ENV{GUI_ROOT_DIR}) ) + INSTALL(FILES ${GUI_bin_SCRIPTS} DESTINATION bin/salome) + INSTALL(FILES ${GUI_lib_SCRIPTS} DESTINATION lib/python) + + # Configure file SalomePyQt_MockUp.py + SET(SGPYQT_RES_DIR "share/salome/resources") + configure_file( + SalomePyQt_MockUp.py.in + SalomePyQt_MockUp.py + @ONLY + ) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/SalomePyQt_MockUp.py DESTINATION lib/python) + # Configure file utils.py + SET(SALOME_INSTALL_PYTHON "lib/python")#This is to use the same variable as salome + configure_file( + utils.py.in + utils.py + @ONLY + ) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/utils.py DESTINATION lib/python) +ENDIF( (EXISTS $ENV{CONFIGURATION_ROOT_DIR}) AND (EXISTS $ENV{KERNEL_ROOT_DIR}) AND (EXISTS $ENV{GUI_ROOT_DIR}) ) + +ADD_SUBDIRECTORY(ui) diff --git a/CoreFlows/gui/src/CoreFlows_Standalone.py b/CoreFlows/gui/CoreFlows_Standalone.py similarity index 100% rename from CoreFlows/gui/src/CoreFlows_Standalone.py rename to CoreFlows/gui/CoreFlows_Standalone.py diff --git a/CoreFlows/gui/src/SalomePyQt_MockUp.py.in b/CoreFlows/gui/SalomePyQt_MockUp.py.in similarity index 100% rename from CoreFlows/gui/src/SalomePyQt_MockUp.py.in rename to CoreFlows/gui/SalomePyQt_MockUp.py.in diff --git a/CoreFlows/gui/salome/CMakeLists.txt b/CoreFlows/gui/salome/CMakeLists.txt new file mode 100755 index 0000000..1009e35 --- /dev/null +++ b/CoreFlows/gui/salome/CMakeLists.txt @@ -0,0 +1,126 @@ +# Copyright (C) 2012-2014 CEA/DEN, EDF R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +cmake_minimum_required (VERSION 3.1) +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +INCLUDE(CMakeDependentOption) + +# Versioning +# =========== +# Project name, upper case +STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) + +SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7) +SET(${PROJECT_NAME_UC}_MINOR_VERSION 8) +SET(${PROJECT_NAME_UC}_PATCH_VERSION 0) +SET(${PROJECT_NAME_UC}_VERSION + ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION}) +SET(${PROJECT_NAME_UC}_VERSION_DEV 1) + +# User options +# ============ +OPTION(SALOME_BUILD_DOC "Generate SALOME CoreFlows documentation" ON) +OPTION(SALOME_BUILD_TESTS "Generate SALOME CoreFlows tests" ON) + +# Common CMake macros +# =================== +SET(CONFIGURATION_ROOT_DIR $ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake configuration files") +IF(EXISTS ${CONFIGURATION_ROOT_DIR}) + LIST(APPEND CMAKE_MODULE_PATH "${CONFIGURATION_ROOT_DIR}/cmake") + INCLUDE(SalomeMacros NO_POLICY_SCOPE) +ELSE() + MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !") +ENDIF() + +# Find KERNEL +# ============== +SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL") +IF( EXISTS ${KERNEL_ROOT_DIR} ) + FIND_PACKAGE(SalomeKERNEL REQUIRED) +ELSE( EXISTS ${KERNEL_ROOT_DIR} ) + MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR!") +ENDIF( EXISTS ${KERNEL_ROOT_DIR} ) + +# Find SALOME GUI +# ============== +SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the Salome GUI") +IF(EXISTS ${GUI_ROOT_DIR}) + FIND_PACKAGE(SalomeGUI) +ELSE(EXISTS ${GUI_ROOT_DIR}) + MESSAGE(FATAL_ERROR "We absolutely need a Salome GUI, please define GUI_ROOT_DIR!") +ENDIF(EXISTS ${GUI_ROOT_DIR}) + +# Platform setup +# ============== +INCLUDE(SalomeSetupPlatform) # From KERNEL + +# Prerequisites +# ============= + +# Mandatory products +IF( ${SalomeKERNEL_VERSION} STRLESS "7.8.0") + FIND_PACKAGE(SalomePython REQUIRED) +ELSE() + FIND_PACKAGE(SalomePythonInterp REQUIRED) + FIND_PACKAGE(SalomePythonLibs REQUIRED) +ENDIF() +MESSAGE(STATUS "SalomeKERNEL_VERSION is ${SalomeKERNEL_VERSION}") + +# Qt5 +FIND_PACKAGE(SalomeQt5 REQUIRED COMPONENTS QtCore QtGui) + +IF(SALOME_BUILD_DOC) +# FIND_PACKAGE(SalomeDoxygen) +# FIND_PACKAGE(SalomeSphinx) +# SALOME_LOG_OPTIONAL_PACKAGE(Doxygen SALOME_BUILD_DOC) +# SALOME_LOG_OPTIONAL_PACKAGE(Sphinx SALOME_BUILD_DOC) +# ADD_DEFINITIONS(-DDOXYGEN_IS_OK) +ENDIF() + +IF(SALOME_BUILD_TESTS) + ENABLE_TESTING() +ENDIF() + +# Detection summary: +SALOME_PACKAGE_REPORT_AND_CHECK() + +# Directories +# =========== +SET(SALOME_INSTALL_LIBS "${SALOME_INSTALL_LIBS}" CACHE PATH "Install path: SALOME libs") +SET(SALOME_INSTALL_PYTHON "${SALOME_INSTALL_PYTHON}" CACHE PATH + "Install path: SALOME Python scripts") +SET(SALOME_INSTALL_SCRIPT_PYTHON "${SALOME_INSTALL_SCRIPT_PYTHON}" CACHE PATH + "Install path: SALOME Python scripts") +SET(SALOME_INSTALL_CMAKE_LOCAL ${SALOME_INSTALL_CMAKE_LOCAL} CACHE PATH + "Install path: local SALOME CMake files") +SET(SALOME_INSTALL_RES "${SALOME_INSTALL_RES}" CACHE PATH "Install path: SALOME resources") +SET(SALOME_INSTALL_DOC "${SALOME_INSTALL_DOC}" CACHE PATH "Install path: SALOME documentation") +SET(SALOME_INSTALL_HEADERS ${SALOME_INSTALL_HEADERS} CACHE PATH "Install path: SALOME headers") + +# Specific to CoreFlows: +SET(SALOME_CoreFlows_INSTALL_RES_DATA ${SALOME_INSTALL_RES}/coreflows CACHE PATH "Install path: SALOME COREFLOWS specific resources") + +# Sources +# ======== +ADD_SUBDIRECTORY(src) +ADD_SUBDIRECTORY(resources) +IF(SALOME_BUILD_DOC) +# ADD_SUBDIRECTORY(doc) +ENDIF() + diff --git a/CoreFlows/gui/resources/CMakeLists.txt b/CoreFlows/gui/salome/resources/CMakeLists.txt similarity index 100% rename from CoreFlows/gui/resources/CMakeLists.txt rename to CoreFlows/gui/salome/resources/CMakeLists.txt diff --git a/CoreFlows/gui/resources/SalomeApp.xml.in b/CoreFlows/gui/salome/resources/SalomeApp.xml.in similarity index 100% rename from CoreFlows/gui/resources/SalomeApp.xml.in rename to CoreFlows/gui/salome/resources/SalomeApp.xml.in diff --git a/CoreFlows/gui/resources/icon.png b/CoreFlows/gui/salome/resources/icon.png similarity index 100% rename from CoreFlows/gui/resources/icon.png rename to CoreFlows/gui/salome/resources/icon.png diff --git a/CoreFlows/gui/src/.CMakeLists.txt.swp b/CoreFlows/gui/salome/src/.CMakeLists.txt.swp similarity index 100% rename from CoreFlows/gui/src/.CMakeLists.txt.swp rename to CoreFlows/gui/salome/src/.CMakeLists.txt.swp diff --git a/CoreFlows/gui/src/CMakeLists.txt b/CoreFlows/gui/salome/src/CMakeLists.txt similarity index 95% rename from CoreFlows/gui/src/CMakeLists.txt rename to CoreFlows/gui/salome/src/CMakeLists.txt index de2a067..a606ff0 100755 --- a/CoreFlows/gui/src/CMakeLists.txt +++ b/CoreFlows/gui/salome/src/CMakeLists.txt @@ -18,19 +18,17 @@ # -ADD_SUBDIRECTORY(ui) - SET(SGPYQT_RES_DIR "${SALOME_INSTALL_RES}") SALOME_CONFIGURE_FILE(SalomePyQt_MockUp.py.in mockup/SalomePyQt_MockUp.py) SALOME_CONFIGURE_FILE(utils.py.in ${CMAKE_CURRENT_BINARY_DIR}/utils.py) SET(_bin_SCRIPTS SOLVERLABGUI.py - CoreFlows_Standalone.py + ${GUI_bin_SCRIPTS} ) SET(_lib_SCRIPTS - CFDesktop.py + ${GUI_lib_SCRIPTS} ${CMAKE_CURRENT_BINARY_DIR}/mockup/SalomePyQt_MockUp.py ${CMAKE_CURRENT_BINARY_DIR}/utils.py ) diff --git a/CoreFlows/gui/src/SOLVERLABGUI.py b/CoreFlows/gui/salome/src/SOLVERLABGUI.py similarity index 100% rename from CoreFlows/gui/src/SOLVERLABGUI.py rename to CoreFlows/gui/salome/src/SOLVERLABGUI.py diff --git a/CoreFlows/gui/src/ui/CMakeLists.txt b/CoreFlows/gui/ui/CMakeLists.txt similarity index 55% rename from CoreFlows/gui/src/ui/CMakeLists.txt rename to CoreFlows/gui/ui/CMakeLists.txt index fcacbf6..e0fef09 100755 --- a/CoreFlows/gui/src/ui/CMakeLists.txt +++ b/CoreFlows/gui/ui/CMakeLists.txt @@ -17,20 +17,22 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# --- resources --- - # uic files SET(_pyuic_files - MainCFWidget.ui + ${CMAKE_CURRENT_SOURCE_DIR}/MainCFWidget.ui ) # --- scripts --- SET(_all_lib_SCRIPTS - MainCFWidget.py + ${CMAKE_CURRENT_SOURCE_DIR}/MainCFWidget.py ) -# --- rules --- -SALOME_INSTALL_SCRIPTS("${_pyuic_SCRIPTS}" ${SALOME_INSTALL_PYTHON}) -SALOME_INSTALL_SCRIPTS("${_all_lib_SCRIPTS}" ${SALOME_INSTALL_PYTHON}) -INSTALL(FILES ${_pyuic_files} DESTINATION ${SALOME_INSTALL_PYTHON}) +IF ( (EXISTS $ENV{CONFIGURATION_ROOT_DIR}) AND (EXISTS $ENV{KERNEL_ROOT_DIR}) AND (EXISTS $ENV{GUI_ROOT_DIR}) ) + SALOME_INSTALL_SCRIPTS("${_pyuic_SCRIPTS}" ${SALOME_INSTALL_PYTHON})#file MainCFWidget.ui + SALOME_INSTALL_SCRIPTS("${_all_lib_SCRIPTS}" ${SALOME_INSTALL_PYTHON})#file MainCFWidget.py +ELSE ( (EXISTS $ENV{CONFIGURATION_ROOT_DIR}) AND (EXISTS $ENV{KERNEL_ROOT_DIR}) AND (EXISTS $ENV{GUI_ROOT_DIR}) ) + INSTALL(FILES ${_pyuic_files} DESTINATION lib/python) + INSTALL(FILES ${_all_lib_SCRIPTS} DESTINATION lib/python) +ENDIF( (EXISTS $ENV{CONFIGURATION_ROOT_DIR}) AND (EXISTS $ENV{KERNEL_ROOT_DIR}) AND (EXISTS $ENV{GUI_ROOT_DIR}) ) + diff --git a/CoreFlows/gui/src/ui/MainCFWidget.py b/CoreFlows/gui/ui/MainCFWidget.py similarity index 100% rename from CoreFlows/gui/src/ui/MainCFWidget.py rename to CoreFlows/gui/ui/MainCFWidget.py diff --git a/CoreFlows/gui/src/ui/MainCFWidget.ui b/CoreFlows/gui/ui/MainCFWidget.ui similarity index 99% rename from CoreFlows/gui/src/ui/MainCFWidget.ui rename to CoreFlows/gui/ui/MainCFWidget.ui index ff68df5..ca621d9 100755 --- a/CoreFlows/gui/src/ui/MainCFWidget.ui +++ b/CoreFlows/gui/ui/MainCFWidget.ui @@ -29,7 +29,7 @@ - 8 + 0 @@ -209,7 +209,7 @@ - <html><head/><body><p><span style=" font-size:18pt; font-weight:600; text-decoration: underline;">COREFLOWS</span></p></body></html> + <html><head/><body><p><span style=" font-size:18pt; font-weight:600; text-decoration: underline;">SOLVERLAB</span></p></body></html> @@ -1471,7 +1471,7 @@ - <html><head/><body><p><span style=" font-size:22pt; font-weight:600; text-decoration: underline;">Single Phase</span></p></body></html> + <html><head/><body><p><span style=" font-size:22pt; font-weight:600; text-decoration: underline;">Navier-Stokes</span></p></body></html> diff --git a/CoreFlows/gui/src/utils.py.in b/CoreFlows/gui/utils.py.in similarity index 60% rename from CoreFlows/gui/src/utils.py.in rename to CoreFlows/gui/utils.py.in index 8064712..9ba0f55 100755 --- a/CoreFlows/gui/src/utils.py.in +++ b/CoreFlows/gui/utils.py.in @@ -1,8 +1,8 @@ def completeResPath(fileName): import os subPath = "@SALOME_INSTALL_PYTHON@" - rd = os.environ.get("COREFLOWS_ROOT_DIR", None) + rd = os.environ.get("SOLVERLAB_ROOT_DIR", None) if rd is None: - raise Exception("COREFLOWS_ROOT_DIR is not defined!") + raise Exception("SOLVERLAB_ROOT_DIR is not defined!") filePath = os.path.join(rd, subPath, fileName) return filePath -- 2.39.2