Skip to content
Snippets Groups Projects
Commit 7efd8db5 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

disambiguate local fct name

parent d6cb4dc1
No related branches found
No related tags found
1 merge request!1636PyCore: Re-implementation of embedded Python as a separate module (Major change)
...@@ -100,7 +100,7 @@ QString readFile(const QString& fileName) ...@@ -100,7 +100,7 @@ QString readFile(const QString& fileName)
//! Creates a multi-layer by executing a funcName in embedded Python. //! Creates a multi-layer by executing a funcName in embedded Python.
//! Function is supposed to be in code provided by 'snippet'. //! Function is supposed to be in code provided by 'snippet'.
std::unique_ptr<MultiLayer> createMultiLayer(const QString& snippet, const QString& funcName) std::unique_ptr<MultiLayer> code2sample(const QString& snippet, const QString& funcName)
{ {
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);
void* result_ptr = nullptr; void* result_ptr = nullptr;
...@@ -184,7 +184,7 @@ std::unique_ptr<MultiLayer> PyImportAssistant::importMultiLayer() ...@@ -184,7 +184,7 @@ std::unique_ptr<MultiLayer> PyImportAssistant::importMultiLayer()
if (funcName.isEmpty()) if (funcName.isEmpty())
return {}; return {};
std::unique_ptr<MultiLayer> sample = createMultiLayer(snippet, funcName); std::unique_ptr<MultiLayer> sample = code2sample(snippet, funcName);
if (!sample) if (!sample)
throw std::runtime_error("Import did not yield MultiLayer object"); throw std::runtime_error("Import did not yield MultiLayer object");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment