suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ move module Python stuff into C++ class

Browse Source
This commit is contained in:
wmayer 2015-10-24 18:16:17 +02:00
parent e82a780774
commit b1ea3f70da
6 changed files with 34 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Tools/_TEMPLATE_/App/App_TEMPLATE_.cpp
View File

@ -28,12 +28,24 @@
#include <Base/Console.h>
#include <CXX/Extensions.hxx>
#include <CXX/Objects.hxx>
/* registration table */
extern struct PyMethodDef _TEMPLATE__methods[];
PyDoc_STRVAR(module__TEMPLATE__doc,
"This module is the _TEMPLATE_ module.");
namespace _TEMPLATE_ {
class Module : public Py::ExtensionModule<Module>
{
public:
Module() : Py::ExtensionModule<Module>("_TEMPLATE_")
{
initialize("This module is the _TEMPLATE_ module."); // register with Python
}
virtual ~Module() {}
private:
};
} // namespace _TEMPLATE_
/* Python entry */
@ -43,7 +55,7 @@ void _TEMPLATE_AppExport init_TEMPLATE_() {
// ADD YOUR CODE HERE
//
//
(void) Py_InitModule3("_TEMPLATE_", _TEMPLATE__methods, module__TEMPLATE__doc); /* mod name, table ptr */
new _TEMPLATE_::Module();
Base::Console().Log("Loading _TEMPLATE_ module... done\n");
}

38
src/Tools/_TEMPLATE_/App/App_TEMPLATE_Py.cpp
View File

@ -1,38 +0,0 @@
/***************************************************************************
* Copyright (c) YEAR YOUR NAME <Your e-mail address> *
* *
* This file is part of the FreeCAD CAx development system. *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Library General Public *
* License as published by the Free Software Foundation; either *
* version 2 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Library General Public License for more details. *
* *
* You should have received a copy of the GNU Library General Public *
* License along with this library; see the file COPYING.LIB. If not, *
* write to the Free Software Foundation, Inc., 59 Temple Place, *
* Suite 330, Boston, MA 02111-1307, USA *
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
#endif
#include <Python.h>
#include <Base/Console.h>
#include <Base/PyObjectBase.h>
#include <Base/Exception.h>
/* registration table */
struct PyMethodDef _TEMPLATE__methods[] = {
{NULL, NULL} /* end of table marker */
};

1
src/Tools/_TEMPLATE_/App/CMakeLists.txt
View File

@ -13,7 +13,6 @@ set(_TEMPLATE__LIBS
SET(_TEMPLATE__SRCS
App_TEMPLATE_.cpp
App_TEMPLATE_Py.cpp
PreCompiled.cpp
PreCompiled.h
)

23
src/Tools/_TEMPLATE_/Gui/App_TEMPLATE_Gui.cpp
View File

@ -31,15 +31,27 @@
#include "Workbench.h"
#include <CXX/Extensions.hxx>
#include <CXX/Objects.hxx>
// use a different name to CreateCommand()
void Create_TEMPLATE_Commands(void);
/* registration table */
extern struct PyMethodDef _TEMPLATE_Gui_methods[];
namespace _TEMPLATE_Gui {
class Module : public Py::ExtensionModule<Module>
{
public:
Module() : Py::ExtensionModule<Module>("_TEMPLATE_Gui")
{
initialize("This module is the _TEMPLATE_Gui module."); // register with Python
}
PyDoc_STRVAR(module__TEMPLATE_Gui_doc,
"This module is the _TEMPLATE_Gui module.");
virtual ~Module() {}
private:
};
} // namespace _TEMPLATE_Gui
/* Python entry */
@ -58,8 +70,7 @@ void _TEMPLATE_GuiExport init_TEMPLATE_Gui()
// ADD YOUR CODE HERE
//
//
(void) Py_InitModule3("_TEMPLATE_Gui", _TEMPLATE_Gui_methods, module__TEMPLATE_Gui_doc); /* mod name, table ptr */
new _TEMPLATE_Gui::Module();
Base::Console().Log("Loading GUI of _TEMPLATE_ module... done\n");
}

35
src/Tools/_TEMPLATE_/Gui/App_TEMPLATE_GuiPy.cpp
View File

@ -1,35 +0,0 @@
/***************************************************************************
* Copyright (c) YEAR YOUR NAME <Your e-mail address> *
* *
* This file is part of the FreeCAD CAx development system. *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Library General Public *
* License as published by the Free Software Foundation; either *
* version 2 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Library General Public License for more details. *
* *
* You should have received a copy of the GNU Library General Public *
* License along with this library; see the file COPYING.LIB. If not, *
* write to the Free Software Foundation, Inc., 59 Temple Place, *
* Suite 330, Boston, MA 02111-1307, USA *
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
#endif
#include <Base/Console.h>
#include <Base/Exception.h>
/* registration table */
struct PyMethodDef _TEMPLATE_Gui_methods[] = {
{NULL, NULL} /* end of table marker */
};

1
src/Tools/_TEMPLATE_/Gui/CMakeLists.txt
View File

@ -20,7 +20,6 @@ qt4_add_resources(_TEMPLATE__QRC_SRCS Resources/_TEMPLATE_.qrc)
SET(_TEMPLATE_Gui_SRCS
${_TEMPLATE__QRC_SRCS}
App_TEMPLATE_Gui.cpp
App_TEMPLATE_GuiPy.cpp
Command.cpp
PreCompiled.cpp
PreCompiled.h