From d0c5b7c045758809a43708fefb9f7c6cf9fe650b Mon Sep 17 00:00:00 2001 From: wandererfan Date: Fri, 10 Mar 2023 14:03:08 -0500 Subject: [PATCH] [TD]remove unused override methods --- .../TechDraw/Gui/ViewProviderDrawingView.cpp | 7 +++++- src/Mod/TechDraw/Gui/ViewProviderLeader.h | 2 -- src/Mod/TechDraw/Gui/ViewProviderPage.cpp | 22 +++++++------------ src/Mod/TechDraw/Gui/ViewProviderPage.h | 3 --- .../TechDraw/Gui/ViewProviderProjGroup.cpp | 8 ------- src/Mod/TechDraw/Gui/ViewProviderProjGroup.h | 2 -- .../Gui/ViewProviderProjGroupItem.cpp | 8 ------- .../TechDraw/Gui/ViewProviderProjGroupItem.h | 2 -- src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp | 2 ++ src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp | 6 ++--- 10 files changed, 19 insertions(+), 43 deletions(-) diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp index e0ebcb7e7d..db8868d347 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp @@ -83,7 +83,12 @@ void ViewProviderDrawingView::attach(App::DocumentObject *pcFeat) auto bndProgressMessage = boost::bind(&ViewProviderDrawingView::onProgressMessage, this, bp::_1, bp::_2, bp::_3); auto feature = getViewObject(); if (feature) { - m_myName = feature->getNameInDocument(); + const char* temp = feature->getNameInDocument(); + if (temp) { + // it could happen that feature is not completely in the document yet and getNameInDocument returns + // nullptr, so we only update m_myName if we got a valid string. + m_myName = temp; + } connectGuiRepaint = feature->signalGuiPaint.connect(bnd); connectProgressMessage = feature->signalProgressMessage.connect(bndProgressMessage); //TODO: would be good to start the QGIV creation process here, but no guarantee we actually have diff --git a/src/Mod/TechDraw/Gui/ViewProviderLeader.h b/src/Mod/TechDraw/Gui/ViewProviderLeader.h index ad11733c84..31d78ce504 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderLeader.h +++ b/src/Mod/TechDraw/Gui/ViewProviderLeader.h @@ -54,9 +54,7 @@ public: App::PropertyEnumeration LineStyle; App::PropertyColor Color; -/* virtual void setDisplayMode(const char* ModeName);*/ bool useNewSelectionModel() const override {return false;} -/* virtual std::vector getDisplayModes(void) const;*/ void updateData(const App::Property*) override; void onChanged(const App::Property* p) override; bool setEdit(int ModNum) override; diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp index b3d9a4d5ea..faf8b89b5d 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp @@ -91,6 +91,8 @@ ViewProviderPage::ViewProviderPage() (App::PropertyType::Prop_None), "Grid line spacing in mm"); ShowFrames.setStatus(App::Property::Hidden, true); + // Do not show in property editor why? wf WF: because DisplayMode applies only to coin and we + // don't use coin. DisplayMode.setStatus(App::Property::Hidden, true); m_graphicsScene = new QGSPage(this); @@ -115,24 +117,16 @@ void ViewProviderPage::attach(App::DocumentObject* pcFeat) TechDraw::DrawPage* feature = dynamic_cast(pcFeat); if (feature) { connectGuiRepaint = feature->signalGuiPaint.connect(bnd); - m_pageName = feature->getNameInDocument(); + const char* temp = feature->getNameInDocument(); + if (temp) { + // it could happen that feature is not completely in the document yet and getNameInDocument returns + // nullptr, so we only update m_myName if we got a valid string. + m_pageName = temp; + } m_graphicsScene->setObjectName(QString::fromLocal8Bit(m_pageName.c_str())); } } -void ViewProviderPage::setDisplayMode(const char* ModeName) -{ - ViewProviderDocumentObject::setDisplayMode(ModeName); -} - -std::vector ViewProviderPage::getDisplayModes() const -{ - // get the modes of the father - std::vector StrList = ViewProviderDocumentObject::getDisplayModes(); - StrList.emplace_back("Drawing"); - return StrList; -} - void ViewProviderPage::onChanged(const App::Property* prop) { if (prop == &(ShowGrid)) { diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.h b/src/Mod/TechDraw/Gui/ViewProviderPage.h index c00df10c17..7ac7764a34 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPage.h +++ b/src/Mod/TechDraw/Gui/ViewProviderPage.h @@ -66,7 +66,6 @@ public: App::PropertyDistance GridSpacing; void attach(App::DocumentObject*) override; - void setDisplayMode(const char* ModeName) override; bool canDragObjects() const override; bool canDragObject(App::DocumentObject* docObj) const override; @@ -79,8 +78,6 @@ public: const std::vector& elements) const override; bool useNewSelectionModel() const override { return false; } - /// returns a list of all possible modes - std::vector getDisplayModes() const override; /// Hides the view provider void hide() override; /// Shows the view provider diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp index 5890173caa..e0453cc1bd 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp @@ -59,14 +59,6 @@ ViewProviderProjGroup::~ViewProviderProjGroup() { } -std::vector ViewProviderProjGroup::getDisplayModes() const -{ - // get the modes of the father - std::vector StrList = ViewProviderDrawingView::getDisplayModes(); - StrList.emplace_back("Drawing"); - return StrList; -} - void ViewProviderProjGroup::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { Q_UNUSED(menu); diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.h b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.h index bf4799323e..182c94521f 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.h +++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.h @@ -42,8 +42,6 @@ public: ~ViewProviderProjGroup() override; /// destructor bool useNewSelectionModel() const override {return false;} - /// returns a list of all possible modes - std::vector getDisplayModes() const override; /// Claim all the views for the page std::vector claimChildren() const override; diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp b/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp index ee0ff441d5..488b9c9f32 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp @@ -51,14 +51,6 @@ ViewProviderProjGroupItem::~ViewProviderProjGroupItem() { } -std::vector ViewProviderProjGroupItem::getDisplayModes() const -{ - // get the modes of the father - std::vector StrList = ViewProviderViewPart::getDisplayModes(); - StrList.emplace_back("Drawing"); - return StrList; -} - void ViewProviderProjGroupItem::updateData(const App::Property* prop) { Gui::ViewProviderDocumentObject::updateData(prop); diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.h b/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.h index 238d686dc5..b24e88ad43 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.h +++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.h @@ -43,8 +43,6 @@ public: ~ViewProviderProjGroupItem() override; bool useNewSelectionModel() const override {return false;} - /// returns a list of all possible modes - std::vector getDisplayModes() const override; /// Is called by the tree if the user double click on the object bool doubleClicked() override; diff --git a/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp b/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp index 936148b786..75492b25e8 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp @@ -62,6 +62,8 @@ ViewProviderTemplate::ViewProviderTemplate() : m_myName(std::string()) sPixmap = "TechDraw_TreePageTemplate"; + // Do not show in property editor why? wf WF: because DisplayMode applies only to coin and we + // don't use coin. DisplayMode.setStatus(App::Property::Hidden, true); } diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp b/src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp index e2fecf782a..fef98af60c 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp @@ -41,9 +41,9 @@ ViewProviderViewClip::ViewProviderViewClip() { sPixmap = "actions/TechDraw_ClipGroup"; - // Do not show in property editor - //DisplayMode.StatusBits.set(3, true); - DisplayMode.setStatus(App::Property::ReadOnly, true); + // Do not show in property editor why? wf WF: because DisplayMode applies only to coin and we + // don't use coin. + DisplayMode.setStatus(App::Property::Hidden, true); } ViewProviderViewClip::~ViewProviderViewClip()