+ move module Python stuff into C++ class

This commit is contained in:
wmayer
2015-10-24 18:04:53 +02:00
parent 38cf9bfab6
commit 4187bef893
6 changed files with 167 additions and 203 deletions

View File

@@ -30,6 +30,10 @@
#include <Gui/Application.h>
#include <Gui/Language/Translator.h>
#include "Workbench.h"
#include <CXX/Extensions.hxx>
#include <CXX/Objects.hxx>
//#include "resources/qrc_ReverseEngineering.cpp"
// use a different name to CreateCommand()
@@ -42,8 +46,20 @@ void loadReverseEngineeringResource()
Gui::Translator::instance()->refresh();
}
/* registration table */
extern struct PyMethodDef ReverseEngineeringGui_Import_methods[];
namespace ReverseEngineeringGui {
class Module : public Py::ExtensionModule<Module>
{
public:
Module() : Py::ExtensionModule<Module>("ReverseEngineeringGui")
{
initialize("This module is the ReverseEngineeringGui module."); // register with Python
}
virtual ~Module() {}
private:
};
} // namespace ReverseEngineeringGui
/* Python entry */
@@ -55,7 +71,7 @@ void ReenGuiExport initReverseEngineeringGui()
return;
}
(void) Py_InitModule("ReverseEngineeringGui", ReverseEngineeringGui_Import_methods); /* mod name, table ptr */
new ReverseEngineeringGui::Module();
Base::Console().Log("Loading GUI of ReverseEngineering module... done\n");
// instantiating the commands

View File

@@ -1,33 +0,0 @@
/***************************************************************************
* Copyright (c) 2008 Werner Mayer <wmayer[at]users.sourceforge.net> *
* *
* 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_
# include <Python.h>
#endif
/* registration table */
struct PyMethodDef ReverseEngineeringGui_Import_methods[] = {
{NULL, NULL} /* end of table marker */
};

View File

@@ -28,7 +28,6 @@ qt4_add_resources(ReenGui_QRC_SRCS Resources/ReverseEngineering.qrc)
SET(ReenGui_SRCS
${ReenGui_QRC_SRCS}
AppReverseEngineeringGui.cpp
AppReverseEngineeringGuiPy.cpp
Command.cpp
Resources/ReverseEngineering.qrc
PreCompiled.cpp