BUG: Fixes loading of python bundled with an extension

See http://na-mic.org/Mantis/view.php?id=2391 Fixes #2391
chrismullins · Aug 17, 2012 · 449fe22 · 449fe22
1 parent db590b5
commit 449fe22
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/Base/QTCore/qSlicerCorePythonManager.cxx b/Base/QTCore/qSlicerCorePythonManager.cxx
@@ -20,6 +20,7 @@
 
 // Qt includes
 #include <QBitArray>
+#include <QSettings>
 
 // CTK includes
 #include <ctkVTKPythonQtWrapperFactory.h>
@@ -63,6 +64,16 @@ QStringList qSlicerCorePythonManager::pythonPaths()
   paths << app->slicerHome() + "/" Slicer_BIN_DIR "/" + app->intDir();
   paths << app->slicerHome() + "/" Slicer_BIN_DIR "/Python";
 
+  QSettings* settings = app->settings();
+  QStringList extraPaths = settings->value("Modules/AdditionalPaths").toStringList();
+  QStringList newPythonModulePaths;
+  foreach (const QString& s, extraPaths)
+    {
+    QString pythonDir = s;
+    pythonDir.append("/Python");
+    newPythonModulePaths << s;
+    newPythonModulePaths << pythonDir;
+    }
   paths << app->slicerHome() + "/" Slicer_LIB_DIR;
 
 #ifdef Slicer_BUILD_QTLOADABLEMODULES
@@ -121,6 +132,7 @@ QStringList qSlicerCorePythonManager::pythonPaths()
     paths << app->slicerHome() + "/lib/Python" + pythonLibSubDirectory + "/site-packages";
     }
 
+  paths << newPythonModulePaths;
   return paths;
 }