diff --git a/GUI/View/Project/PyImportAssistant.cpp b/GUI/View/Project/PyImportAssistant.cpp index fe8d60d4f3426dce1cad9f038d24927113ff4f8c..a1308c8c4653e7d21cad6e70e23183698ca26a45 100644 --- a/GUI/View/Project/PyImportAssistant.cpp +++ b/GUI/View/Project/PyImportAssistant.cpp @@ -30,7 +30,7 @@ #include "GUI/View/Project/ProjectManager.h" #include "GUI/View/Tool/Globals.h" #include "PyCore/Embed/PythonInterpreter.h" // listOfFunctions -#include "PyCore/Sample/Multilayer/ImportMultiLayer.h" // createMultiLayerFromPython +#include "PyCore/Sample/ImportMultiLayer.h" // createMultiLayerFromPython #include "Sample/Multilayer/MultiLayer.h" #include <QApplication> #include <QFileDialog> @@ -104,8 +104,8 @@ std::unique_ptr<MultiLayer> createMultiLayer(const QString& snippet, const QStri { QApplication::setOverrideCursor(Qt::WaitCursor); void* result_ptr = nullptr; - PyObjectPtr result{PythonInterpreter::createMultiLayerFromPython( - snippet.toStdString(), funcName.toStdString(), bornagainDir(), result_ptr)}; + PyObjectPtr result{PythonInterpreter::createMultiLayerFromPython(result_ptr, + snippet.toStdString(), funcName.toStdString(), bornagainDir())}; std::unique_ptr<MultiLayer> multilayer_ptr( reinterpret_cast<MultiLayer*>(result_ptr)->clone()); @@ -119,7 +119,7 @@ std::unique_ptr<MultiLayer> createMultiLayer(const QString& snippet, const QStri QApplication::restoreOverrideCursor(); - return std::move(multilayer_ptr); + return multilayer_ptr; } //! Lets user select a function name which generates a MultiLayer. @@ -154,19 +154,18 @@ QString getPySampleFunctionName(const QString& snippet) { QApplication::setOverrideCursor(Qt::WaitCursor); - Result<std::vector<std::string>> funcs_res{ + std::vector<std::string> funcs_res{ PythonInterpreter::BornAgain::listOfFunctions(snippet.toStdString(), bornagainDir())}; - if (!funcs_res.valid()) { + if (funcs_res.empty()) { QApplication::restoreOverrideCursor(); QString message("Exception thrown while acquiring functions from Python code.\n\n"); - QString details = QString::fromStdString(funcs_res.status.message); - DetailedMessageBox(GUI::Global::mainWindow, "Python failure", message, details).exec(); + DetailedMessageBox(GUI::Global::mainWindow, "Python failure", message, "").exec(); return ""; } QApplication::restoreOverrideCursor(); - QStringList funcList{GUI::Util::String::fromStdStrings(funcs_res.val)}; + QStringList funcList{GUI::Util::String::fromStdStrings(funcs_res)}; return selectPySampleFunction(funcList); }