diff --git a/src/Mod/TechDraw/App/DrawPagePy.xml b/src/Mod/TechDraw/App/DrawPagePy.xml
index 9f16a74712..6b7abf2b2e 100644
--- a/src/Mod/TechDraw/App/DrawPagePy.xml
+++ b/src/Mod/TechDraw/App/DrawPagePy.xml
@@ -28,21 +28,24 @@
getAllViews() - returns a list of all the views on page including Views inside Collections
-
+
- Return the width of this page
+ Returns the width of this page
-
-
+
+
+
- Return the height of this page
+ Returns the height of this page
-
-
+
+
+
- Return the orientation of this page
+ Returns the orientation of this page
-
+
+
Ask the Gui to redraw this page
diff --git a/src/Mod/TechDraw/App/DrawPagePyImp.cpp b/src/Mod/TechDraw/App/DrawPagePyImp.cpp
index 9f51bf08ae..8d147bf1a6 100644
--- a/src/Mod/TechDraw/App/DrawPagePyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawPagePyImp.cpp
@@ -1,3 +1,24 @@
+/***************************************************************************
+ * Copyright (c) 2016 WandererFan *
+ * *
+ * 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"
@@ -28,100 +49,91 @@ std::string DrawPagePy::representation() const
PyObject* DrawPagePy::addView(PyObject* args)
{
- //this implements iRC = pyPage.addView(pyView) -or-
- //doCommand(Doc, "App.activeDocument().%s.addView(App.activeDocument().%s)", PageName.c_str(), FeatName.c_str());
PyObject *pcDocObj;
-
- if (!PyArg_ParseTuple(args, "O!", &(App::DocumentObjectPy::Type), &pcDocObj)) {
- PyErr_SetString(PyExc_TypeError, "DrawPagePy::AddView - Bad Arg - not DocumentObject");
+ if (!PyArg_ParseTuple(args, "O!", &(TechDraw::DrawViewPy::Type), &pcDocObj)) {
return nullptr;
}
DrawPage* page = getDrawPagePtr(); //get DrawPage for pyPage
- //TODO: argument 1 arrives as "DocumentObjectPy", not "DrawViewPy"
- //how to validate that obj is DrawView before use??
DrawViewPy* pyView = static_cast(pcDocObj);
DrawView* view = pyView->getDrawViewPtr(); //get DrawView for pyView
-
int rc = page->addView(view);
- return PyLong_FromLong((long) rc);
+
+ return PyLong_FromLong(rc);
}
PyObject* DrawPagePy::removeView(PyObject* args)
{
- //this implements iRC = pyPage.removeView(pyView) -or-
- //doCommand(Doc, "App.activeDocument().%s.removeView(App.activeDocument().%s)", PageName.c_str(), FeatName.c_str());
PyObject *pcDocObj;
-
- if (!PyArg_ParseTuple(args, "O!", &(App::DocumentObjectPy::Type), &pcDocObj)) {
- PyErr_SetString(PyExc_TypeError, "DrawPagePy::removeView - Bad Arg - not DocumentObject");
+ if (!PyArg_ParseTuple(args, "O!", &(TechDraw::DrawViewPy::Type), &pcDocObj)) {
return nullptr;
}
DrawPage* page = getDrawPagePtr(); //get DrawPage for pyPage
- //how to validate that obj is DrawView before use??
DrawViewPy* pyView = static_cast(pcDocObj);
DrawView* view = pyView->getDrawViewPtr(); //get DrawView for pyView
-
int rc = page->removeView(view);
- return PyLong_FromLong((long) rc);
+ return PyLong_FromLong(rc);
}
PyObject* DrawPagePy::getAllViews(PyObject* args)
{
- (void) args;
+ if (!PyArg_ParseTuple(args, "")) {
+ return nullptr;
+ }
+
DrawPage* page = getDrawPagePtr();
std::vector allViews = page->getAllViews();
Py::List ret;
- for (auto&v: allViews) {
+ for (auto v: allViews) {
if (v->isDerivedFrom(TechDraw::DrawProjGroupItem::getClassTypeId())) {
TechDraw::DrawProjGroupItem* dpgi = static_cast(v);
- ret.append(Py::asObject(new TechDraw::DrawProjGroupItemPy(dpgi))); //is this legit? or need to make new copy of dv?
- } else if (v->isDerivedFrom(TechDraw::DrawViewPart::getClassTypeId())) {
+ ret.append(Py::asObject(new TechDraw::DrawProjGroupItemPy(dpgi)));
+ }
+ else if (v->isDerivedFrom(TechDraw::DrawViewPart::getClassTypeId())) {
TechDraw::DrawViewPart* dvp = static_cast(v);
ret.append(Py::asObject(new TechDraw::DrawViewPartPy(dvp)));
- } else if (v->isDerivedFrom(TechDraw::DrawViewAnnotation::getClassTypeId())) {
+ }
+ else if (v->isDerivedFrom(TechDraw::DrawViewAnnotation::getClassTypeId())) {
TechDraw::DrawViewAnnotation* dva = static_cast(v);
ret.append(Py::asObject(new TechDraw::DrawViewAnnotationPy(dva)));
- } else {
+ }
+ else {
TechDraw::DrawView* dv = static_cast(v);
ret.append(Py::asObject(new TechDraw::DrawViewPy(dv)));
}
}
+
return Py::new_reference_to(ret);
}
PyObject* DrawPagePy::requestPaint(PyObject* args)
{
- (void) args;
+ if (!PyArg_ParseTuple(args, "")) {
+ return nullptr;
+ }
+
DrawPage* page = getDrawPagePtr();
page->requestPaint();
- Py_INCREF(Py_None);
- return Py_None;
+
+ Py_Return;
}
-
-// double getPageWidth() const;
-PyObject* DrawPagePy::getPageWidth(PyObject *)
+Py::Float DrawPagePy::getPageWidth() const
{
- PyErr_SetString(PyExc_NotImplementedError, "Not yet implemented");
- return nullptr;
+ return Py::Float(getDrawPagePtr()->getPageWidth());
}
-// double getPageHeight() const;
-PyObject* DrawPagePy::getPageHeight(PyObject *)
+Py::Float DrawPagePy::getPageHeight() const
{
- PyErr_SetString(PyExc_NotImplementedError, "Not yet implemented");
- return nullptr;
+ return Py::Float(getDrawPagePtr()->getPageHeight());
}
-// const char* getPageOrientation() const;
-PyObject* DrawPagePy::getPageOrientation(PyObject *)
+Py::String DrawPagePy::getPageOrientation() const
{
- PyErr_SetString(PyExc_NotImplementedError, "Not yet implemented");
- return nullptr;
+ return Py::String(getDrawPagePtr()->getPageOrientation());
}
PyObject *DrawPagePy::getCustomAttributes(const char* ) const