From 14329d9458308ef37baa8e8730032580252d9766 Mon Sep 17 00:00:00 2001 From: WandererFan Date: Wed, 20 Jul 2016 12:44:36 -0400 Subject: [PATCH] Remove obs property & code --- src/Mod/TechDraw/App/DrawParametricTemplate.h | 4 ++-- src/Mod/TechDraw/App/DrawSVGTemplate.cpp | 10 ---------- src/Mod/TechDraw/App/DrawSVGTemplate.h | 11 +---------- src/Mod/TechDraw/App/DrawTemplate.cpp | 2 +- src/Mod/TechDraw/App/DrawTemplate.h | 2 +- 5 files changed, 5 insertions(+), 24 deletions(-) diff --git a/src/Mod/TechDraw/App/DrawParametricTemplate.h b/src/Mod/TechDraw/App/DrawParametricTemplate.h index e6c5a6843c..8c3a4ebbe5 100644 --- a/src/Mod/TechDraw/App/DrawParametricTemplate.h +++ b/src/Mod/TechDraw/App/DrawParametricTemplate.h @@ -33,11 +33,11 @@ namespace TechDrawGeometry class BaseGeom; } +//TODO: DrawParametricTemplate class is obsolete + namespace TechDraw { -/** Base class of all View Features in the drawing module - */ class TechDrawExport DrawParametricTemplate: public TechDraw::DrawTemplate { PROPERTY_HEADER(TechDraw::DrawParametricTemplate); diff --git a/src/Mod/TechDraw/App/DrawSVGTemplate.cpp b/src/Mod/TechDraw/App/DrawSVGTemplate.cpp index a8c89576ca..0043ba6628 100644 --- a/src/Mod/TechDraw/App/DrawSVGTemplate.cpp +++ b/src/Mod/TechDraw/App/DrawSVGTemplate.cpp @@ -76,16 +76,6 @@ DrawSVGTemplate::~DrawSVGTemplate() { } -/* -std::string DrawSVGTemplate::getSvgIdForEditable(const std::string &editableName) -{ - if (editableSvgIds.count(editableName)) { - return editableSvgIds[editableName]; - } else { - return ""; - } -}*/ - PyObject *DrawSVGTemplate::getPyObject(void) { if (PythonObject.is(Py::_None())) { diff --git a/src/Mod/TechDraw/App/DrawSVGTemplate.h b/src/Mod/TechDraw/App/DrawSVGTemplate.h index f05590a5c3..21f780e481 100644 --- a/src/Mod/TechDraw/App/DrawSVGTemplate.h +++ b/src/Mod/TechDraw/App/DrawSVGTemplate.h @@ -33,14 +33,12 @@ namespace TechDraw { -/** Base class of all View Features in the drawing module - */ class TechDrawExport DrawSVGTemplate: public TechDraw::DrawTemplate { PROPERTY_HEADER(TechDraw::DrawSVGTemplate); public: - DrawSVGTemplate(); /// Constructor + DrawSVGTemplate(); ~DrawSVGTemplate(); App::PropertyFileIncluded PageResult; @@ -59,13 +57,6 @@ public: return "TechDrawGui::ViewProviderTemplate"; } - /// Returns the SVG ID for editable field with name editableName - /*! - * If editableName isn't known, returns an empty string - */ - // std::string getSvgIdForEditable(const std::string &editableName); - - // from base class virtual PyObject *getPyObject(void); virtual unsigned int getMemSize(void) const; diff --git a/src/Mod/TechDraw/App/DrawTemplate.cpp b/src/Mod/TechDraw/App/DrawTemplate.cpp index 6e241f347a..8ba9cf887a 100644 --- a/src/Mod/TechDraw/App/DrawTemplate.cpp +++ b/src/Mod/TechDraw/App/DrawTemplate.cpp @@ -62,7 +62,7 @@ DrawTemplate::DrawTemplate(void) // Physical Properties inherent to every template class ADD_PROPERTY_TYPE(Width, (0), group, (App::PropertyType)(App::Prop_None), "Width of page"); ADD_PROPERTY_TYPE(Height, (0), group, (App::PropertyType)(App::Prop_None), "Height of page"); - ADD_PROPERTY_TYPE(PaperSize, (""), group, (App::PropertyType)(App::Prop_None), "Paper Format"); + //ADD_PROPERTY_TYPE(PaperSize, (""), group, (App::PropertyType)(App::Prop_None), "Paper Format"); //obs? ADD_PROPERTY_TYPE(EditableTexts, (), group, (App::PropertyType)(App::Prop_None), "Editable strings in the template"); diff --git a/src/Mod/TechDraw/App/DrawTemplate.h b/src/Mod/TechDraw/App/DrawTemplate.h index 715609b812..31986ed112 100644 --- a/src/Mod/TechDraw/App/DrawTemplate.h +++ b/src/Mod/TechDraw/App/DrawTemplate.h @@ -47,7 +47,7 @@ public: App::PropertyLength Width; App::PropertyLength Height; App::PropertyEnumeration Orientation; - App::PropertyString PaperSize; + //App::PropertyString PaperSize; App::PropertyMap EditableTexts;