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

+ simplify porting of Spreadsheet module to Python3

Browse Source
This commit is contained in:
wmayer 2016-01-17 23:15:24 +01:00
parent d78d747760
commit 36383135a8
4 changed files with 91 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Mod/Spreadsheet/App/AppSpreadsheet.cpp
View File

@ -15,22 +15,31 @@
# include <Python.h>
#endif
#include <CXX/Extensions.hxx>
#include <CXX/Objects.hxx>
#include <Base/Console.h>
#include "Sheet.h"
#include "SpreadsheetExpression.h"
/* registration table */
static struct PyMethodDef Spreadsheet_methods[] = {
{NULL, NULL} /* end of table marker */
namespace Spreadsheet {
class Module : public Py::ExtensionModule<Module>
{
public:
Module() : Py::ExtensionModule<Module>("Spreadsheet")
{
initialize("This module is the Spreadsheet module."); // register with Python
}
virtual ~Module() {}
private:
};
} // namespace Spreadsheet
/* Python entry */
extern "C" {
void SpreadsheetExport initSpreadsheet() {
(void) Py_InitModule("Spreadsheet", Spreadsheet_methods); /* mod name, table ptr */
Base::Console().Log("Loading Spreadsheet module... done\n");
PyMODINIT_FUNC initSpreadsheet() {
Spreadsheet::PropertySpreadsheetQuantity::init();
Spreadsheet::PropertyColumnWidths::init();
Spreadsheet::PropertyRowHeights::init();
@ -40,7 +49,6 @@ void SpreadsheetExport initSpreadsheet() {
Spreadsheet::AggregateFunctionExpression::init();
Spreadsheet::RangeExpression::init();
return;
new Spreadsheet::Module();
Base::Console().Log("Loading Spreadsheet module... done\n");
}
} // extern "C"

88
src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp
View File

@ -1,12 +1,23 @@
/***************************************************************************
* Copyright (c) 2015 Eivind Kvedalen (eivind@kvedalen.name) *
* Copyright (c) 2006 Werner Mayer <wmayer[at]users.sourceforge.net> *
* *
* This program 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. *
* for detail see the LICENCE text file. *
* Jrgen Riegel 2002 *
* Eivind Kvedalen 2015 *
* 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 *
* *
***************************************************************************/
@ -14,11 +25,24 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <Python.h>
# include <QIcon>
# include <QImage>
# include <QFileInfo>
#endif
#include <CXX/Extensions.hxx>
#include <CXX/Objects.hxx>
#include <Base/Console.h>
#include <Base/Exception.h>
#include <Base/FileInfo.h>
#include <App/Application.h>
#include <Gui/MainWindow.h>
#include <Gui/Document.h>
#include <Gui/Application.h>
#include <Gui/BitmapFactory.h>
#include <Gui/Language/Translator.h>
#include <Mod/Spreadsheet/App/Sheet.h>
#include "Workbench.h"
#include "ViewProviderSpreadsheet.h"
#include "SpreadsheetView.h"
@ -33,22 +57,53 @@ void loadSpreadsheetResource()
Gui::Translator::instance()->refresh();
}
/* registration table */
extern struct PyMethodDef SpreadsheetGui_Import_methods[];
namespace SpreadsheetGui {
class Module : public Py::ExtensionModule<Module>
{
public:
Module() : Py::ExtensionModule<Module>("SpreadsheetGui")
{
add_varargs_method("open",&Module::open
);
initialize("This module is the SpreadsheetGui module."); // register with Python
}
virtual ~Module() {}
private:
Py::Object open(const Py::Tuple& args)
{
const char* Name;
const char* DocName=0;
if (!PyArg_ParseTuple(args.ptr(), "s|s",&Name,&DocName))
throw Py::Exception();
try {
Base::FileInfo file(Name);
App::Document *pcDoc = App::GetApplication().newDocument(DocName ? DocName : QT_TR_NOOP("Unnamed"));
Spreadsheet::Sheet *pcSheet = static_cast<Spreadsheet::Sheet *>(pcDoc->addObject("Spreadsheet::Sheet", file.fileNamePure().c_str()));
pcSheet->importFromFile(Name, '\t', '"', '\\');
pcSheet->execute();
}
catch (const Base::Exception& e) {
throw Py::RuntimeError(e.what());
}
return Py::None();
}
};
} // namespace SpreadsheetGui
/* Python entry */
extern "C" {
void SpreadsheetGuiExport initSpreadsheetGui()
PyMODINIT_FUNC initSpreadsheetGui()
{
if (!Gui::Application::Instance) {
PyErr_SetString(PyExc_ImportError, "Cannot load Gui module in console application.");
return;
}
(void) Py_InitModule("SpreadsheetGui", SpreadsheetGui_Import_methods); /* mod name, table ptr */
Base::Console().Log("Loading GUI of Spreadsheet module... done\n");
// instantiating the commands
CreateSpreadsheetCommands();
@ -58,6 +113,7 @@ void SpreadsheetGuiExport initSpreadsheetGui()
// add resources and reloads the translators
loadSpreadsheetResource();
}
} // extern "C" {
new SpreadsheetGui::Module();
Base::Console().Log("Loading GUI of Spreadsheet module... done\n");
}

71
src/Mod/Spreadsheet/Gui/AppSpreadsheetGuiPy.cpp
View File

@ -1,71 +0,0 @@
/***************************************************************************
* Copyright (c) 2015 Eivind Kvedalen (eivind@kvedalen.name) *
* Copyright (c) 2006 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 <QIcon>
# include <QImage>
# include <QFileInfo>
#endif
#include "SpreadsheetView.h"
#include <Mod/Spreadsheet/App/Sheet.h>
#include <Base/Console.h>
#include <Base/Exception.h>
#include <Base/FileInfo.h>
#include <App/Application.h>
#include <Gui/MainWindow.h>
#include <Gui/Document.h>
#include <Gui/Application.h>
#include <Gui/BitmapFactory.h>
using namespace SpreadsheetGui;
using namespace Spreadsheet;
/* module functions */
static PyObject *
open(PyObject *self, PyObject *args)
{
const char* Name;
const char* DocName=0;
if (!PyArg_ParseTuple(args, "s|s",&Name,&DocName))
return NULL;
PY_TRY {
Base::FileInfo file(Name);
App::Document *pcDoc = App::GetApplication().newDocument(DocName ? DocName : QT_TR_NOOP("Unnamed"));
Sheet *pcSheet = (Sheet *)pcDoc->addObject("Spreadsheet::Sheet", file.fileNamePure().c_str());
pcSheet->importFromFile(Name, '\t', '"', '\\');
pcSheet->execute();
} PY_CATCH;
Py_Return;
}
/* registration table */
struct PyMethodDef SpreadsheetGui_Import_methods[] = {
{"open" ,open , 1}, /* method name, C func ptr, always-tuple */
{NULL, NULL} /* end of table marker */
};

1
src/Mod/Spreadsheet/Gui/CMakeLists.txt
View File

@ -53,7 +53,6 @@ SET(SpreadsheetGui_SRCS
# ${SpreadsheetGui_MOC_SRCS}
${SpreadsheetGui_QRC_SRCS}
AppSpreadsheetGui.cpp
AppSpreadsheetGuiPy.cpp
Command.cpp
LineEdit.h
LineEdit.cpp