X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSalomeApp%2FSalomeApp_PyInterp.cxx;h=9c73a22881a8b51df2d3643feaa3e500c12c404f;hb=320eb776e5eb37ade130d10326bf5cee4559ee86;hp=942aa6da486ea6ede8c60e7798b0efcfdf0016b9;hpb=41279a9323521bc2e2d9f83921bb6d5ca7836d99;p=modules%2Fgui.git

diff --git a/src/SalomeApp/SalomeApp_PyInterp.cxx b/src/SalomeApp/SalomeApp_PyInterp.cxx
old mode 100755
new mode 100644
index 942aa6da4..9c73a2288
--- a/src/SalomeApp/SalomeApp_PyInterp.cxx
+++ b/src/SalomeApp/SalomeApp_PyInterp.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2023  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
@@ -23,12 +23,13 @@
 //  Author : Nicolas REJNERI
 
 #include "SalomeApp_PyInterp.h"
+#include "SUIT_ResourceMgr.h"
 
 /*!
   \brief Constructor
 */
-SalomeApp_PyInterp::SalomeApp_PyInterp()
-  : myFirstRun( true ), myFirstInitStudy( false )
+SalomeApp_PyInterp::SalomeApp_PyInterp( SUIT_ResourceMgr* resMgr )
+  : myFirstRun( true ), myFirstInitStudy( false ), myResourceMgr( resMgr )
 {
 }
 
@@ -63,6 +64,12 @@ int SalomeApp_PyInterp::beforeRun()
 {
   if ( myFirstRun ) {
     myFirstRun = false;
+    QStringList parameters = myResourceMgr->parameters( "pythonpath" );
+    foreach ( QString parameter, parameters ) {
+      QStringList paths = myResourceMgr->stringValue( "pythonpath", parameter ).split( ";;" );
+      foreach( QString path, paths )
+        simpleRun( QString( "import sys; sys.path.append('%1')" ).arg( path ).toUtf8().constData(), false );
+    }
     int ret = simpleRun( "from Help import *", false );
     if ( ret )
       return ret;
@@ -72,7 +79,7 @@ int SalomeApp_PyInterp::beforeRun()
     int ret = simpleRun( "import salome", false );
     if ( ret )
       return ret;
-    ret = simpleRun( "salome.salome_init(1)", false );
+    ret = simpleRun( "salome.salome_init(embedded=True)", false );
     if ( ret )
       return ret;
   }