First devs for issue 234 (Added the lima binding to the Python environment).

Author: Charles PIGNEROL

src/Magix3D/CMakeLists.txt

@@ -47,7 +47,9 @@ install (
 # Le script de lancement de Magix3D :
 find_package (QtPython3 REQUIRED)
 set (QtPython_RUNTIME_DIR "${QtPython3_RUNTIME_DIR}")
-#find_package (LimaScripting)	# Faut il ajouter le PATH à Lima si installé ailleurs ?
+# On ajoute Lima qui fait partie intégrante du package "maillage" :
+find_package (Lima REQUIRED COMPONENTS LimaScripting)
+set (LIMA_BINDING_DIR ${LimaScripting_RUNTIME_DIR})
 set (MAGIX3D_BINDING_INSTALL_DIR ${PYTHON_BINDING_DIR})
 find_package (VTK REQUIRED COMPONENTS vtksys )
 set (VTK_LIBRARY_PATH "${VTK_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")

src/Magix3D/cmake/Magix3D.in

@@ -24,9 +24,10 @@ ROOT_DIR=@CMAKE_INSTALL_PREFIX@
 
 # Spécificités Magix3D :
 export QT_PYTHON_SCRIPTS_DIR=@QtPython_RUNTIME_DIR@
-export PYTHONPATH=@CMAKE_INSTALL_PREFIX@/@MAGIX3D_BINDING_INSTALL_DIR@:@ADDPYTHONPACKAGES@$PYTHONPATH
+export PYTHONPATH=@CMAKE_INSTALL_PREFIX@/@MAGIX3D_BINDING_INSTALL_DIR@:@LIMA_BINDING_DIR@:@ADDPYTHONPACKAGES@$PYTHONPATH
 export PYTHONPATH=@QtPython_RUNTIME_DIR@:$PYTHONPATH
 export MGX3D_PATH=@CMAKE_INSTALL_PREFIX@/@MAGIX3D_BINDING_INSTALL_DIR@
+export LIMA_PATH=@LIMA_BINDING_DIR@
 HELP_URL="-helpURL $ROOT_DIR/share/doc/@CMAKE_PROJECT_NAME@/sphinx"
 WIKI_URL="-wikiURL @URL_WIKI@"
 QUALIF_URL="-qualifURL @URL_QUALIF@"

src/Magix3D/cmake/Magix3DPython.py.in

@@ -3,7 +3,7 @@
 
 import sys
 
-dependencies = "@ADDPYTHONPACKAGES@"
+dependencies = "@LIMA_BINDING_DIR@:@ADDPYTHONPACKAGES@"
 dependencies_tmp = dependencies.split(":")
 
 sys.path.insert(1,"@CMAKE_INSTALL_PREFIX@/@MAGIX3D_BINDING_INSTALL_DIR@")

src/QtComponents/QtMgx3DMainWindow.cpp

@@ -3573,6 +3573,17 @@ void QtMgx3DMainWindow::showReady ( )
 				      << "L'exécution de commandes Python pourrait ne pas fonctionner.";
 				log(WarningLog(error));
 			}    // else if (0 != env)
+			env	= getenv ("LIMA_PATH");
+			if (0 != env)
+			{
+				const string limaPath (env);
+				UTF8String   path (Charset::UTF_8);
+				path << "sys.path.append(\"" << limaPath << "\")";
+				_pythonPanel->executeCommand (path);
+				UTF8String importLine (Charset::UTF_8);
+				importLine << "from LimaScripting import *";
+				_pythonPanel->executeCommand (importLine);
+			}	// if (0 != env)
 		}    // QtMgx3DMainWindow::initPythonScripting