+ simplify porting of Sandbox module to Python3

This commit is contained in:
wmayer
2016-01-18 11:43:20 +01:00
parent 455625bdf7
commit 2f9bb2d905
2 changed files with 18 additions and 22 deletions

View File

@@ -187,20 +187,21 @@ private:
double radius;
};
class SandboxModuleGui : public Py::ExtensionModule<SandboxModuleGui>
namespace SandboxGui {
class Module : public Py::ExtensionModule<Module>
{
public:
SandboxModuleGui() : Py::ExtensionModule<SandboxModuleGui>("SandboxGui")
Module() : Py::ExtensionModule<Module>("SandboxGui")
{
add_varargs_method("interactiveFilletArc",&SandboxModuleGui::interactiveFilletArc,
add_varargs_method("interactiveFilletArc",&Module::interactiveFilletArc,
"Interactive fillet arc");
add_varargs_method("xmlReader",&SandboxModuleGui::xmlReader,
add_varargs_method("xmlReader",&Module::xmlReader,
"Read XML");
initialize("This module is the SandboxGui module"); // register with Python
}
virtual ~SandboxModuleGui() {}
virtual ~Module() {}
private:
Py::Object interactiveFilletArc(const Py::Tuple& args)
@@ -238,10 +239,10 @@ private:
}
};
} // namespace SandboxGui
/* Python entry */
extern "C" {
void SandboxGuiExport initSandboxGui()
PyMODINIT_FUNC initSandboxGui()
{
if (!Gui::Application::Instance) {
PyErr_SetString(PyExc_ImportError, "Cannot load Gui module in console application.");
@@ -264,8 +265,6 @@ void SandboxGuiExport initSandboxGui()
// the following constructor call registers our extension module
// with the Python runtime system
(void)new SandboxModuleGui;
(void)new SandboxGui::Module;
Base::Console().Log("Loading GUI of Sandbox module... done\n");
}
} // extern "C"