conflict between utils.py from efficace and utils.py from solverlab

diff --git a/CoreFlows/gui/CMakeLists.txt b/CoreFlows/gui/CMakeLists.txt
index eeb4b941182a2f4e90ef260c90c7dbc62c6f366e..ebdcb11793ea52f862288ac14e154ca7e8f57d27 100644 (file)
--- a/CoreFlows/gui/CMakeLists.txt
+++ b/CoreFlows/gui/CMakeLists.txt
@@ -42,14 +42,14 @@ ELSE ( (EXISTS $ENV{CONFIGURATION_ROOT_DIR}) AND (EXISTS $ENV{KERNEL_ROOT_DIR})
       @ONLY
   )
   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/SalomePyQt_MockUp.py DESTINATION lib/python)
-  # Configure file utils.py
+  # Configure file slutils.py
   SET(SALOME_INSTALL_PYTHON "lib/python"${PYTHON_VERSION}"/site-packages/salome")#This is to use the same variable as salome
   configure_file(
-      utils.py.in
-      utils.py
+      slutils.py.in
+      slutils.py
       @ONLY
   )
-  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/utils.py DESTINATION lib/python)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/slutils.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/salome/src/CMakeLists.txt b/CoreFlows/gui/salome/src/CMakeLists.txt
index eb1ac54307215dcdd5a5e05dfbfac4d0a8acf9a8..08c51af22b81c258b5c9d0d427b5bb20919c644a 100755 (executable)
--- a/CoreFlows/gui/salome/src/CMakeLists.txt
+++ b/CoreFlows/gui/salome/src/CMakeLists.txt
@@ -20,7 +20,7 @@
 
 SET(SGPYQT_RES_DIR "${SALOME_INSTALL_RES}")
 SALOME_CONFIGURE_FILE(../../SalomePyQt_MockUp.py.in mockup/SalomePyQt_MockUp.py)
-SALOME_CONFIGURE_FILE(../../utils.py.in             utils.py)
+SALOME_CONFIGURE_FILE(../../slutils.py.in             slutils.py)
 
 SET(_bin_SCRIPTS
     SOLVERLABGUI.py
@@ -30,7 +30,7 @@ SET(_bin_SCRIPTS
 SET(_lib_SCRIPTS
     ${GUI_lib_SCRIPTS}
     ${CMAKE_CURRENT_BINARY_DIR}/mockup/SalomePyQt_MockUp.py
-    ${CMAKE_CURRENT_BINARY_DIR}/utils.py
+    ${CMAKE_CURRENT_BINARY_DIR}/slutils.py
 )
 
 SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_PYTHON})

diff --git a/CoreFlows/gui/slutils.py.in b/CoreFlows/gui/slutils.py.in
new file mode 100755 (executable)
index 0000000..9ba0f55
--- /dev/null
+++ b/CoreFlows/gui/slutils.py.in
@@ -0,0 +1,8 @@
+def completeResPath(fileName):
+  import os
+  subPath = "@SALOME_INSTALL_PYTHON@"
+  rd = os.environ.get("SOLVERLAB_ROOT_DIR", None)
+  if rd is None:
+    raise Exception("SOLVERLAB_ROOT_DIR is not defined!")
+  filePath = os.path.join(rd, subPath, fileName)
+  return filePath

diff --git a/CoreFlows/gui/ui/MainCFWidget.py b/CoreFlows/gui/ui/MainCFWidget.py
index 9e01f49ce6fcd1c8f232ac8b776dbba8ea8e19e3..64a5dcfe46c66252f7f76c0e7e85e304f30e45d9 100755 (executable)
--- a/CoreFlows/gui/ui/MainCFWidget.py
+++ b/CoreFlows/gui/ui/MainCFWidget.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from PyQt5 import QtWidgets, QtCore
 from PyQt5.uic import loadUi
-from utils import completeResPath
+from slutils import completeResPath
 
 import CoreFlows as cf
 import cdmath as cm

diff --git a/CoreFlows/gui/utils.py.in b/CoreFlows/gui/utils.py.in
deleted file mode 100755 (executable)
index 9ba0f55..0000000
--- a/CoreFlows/gui/utils.py.in
+++ /dev/null
@@ -1,8 +0,0 @@
-def completeResPath(fileName):
-  import os
-  subPath = "@SALOME_INSTALL_PYTHON@"
-  rd = os.environ.get("SOLVERLAB_ROOT_DIR", None)
-  if rd is None:
-    raise Exception("SOLVERLAB_ROOT_DIR is not defined!")
-  filePath = os.path.join(rd, subPath, fileName)
-  return filePath