Skip to content

Commit

Permalink
Fix derived class calls wrong parent method
Browse files Browse the repository at this point in the history
  • Loading branch information
WandererFan authored and wwmayer committed Mar 7, 2019
1 parent 7b5458b commit b5c3ca2
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/Mod/TechDraw/Gui/ViewProviderDimension.cpp
Expand Up @@ -137,7 +137,7 @@ void ViewProviderDimension::onChanged(const App::Property* p)
qgiv->updateView(true);
}
}
Gui::ViewProviderDocumentObject::onChanged(p);
ViewProviderDrawingView::onChanged(p);
}

TechDraw::DrawViewDimension* ViewProviderDimension::getViewObject() const
Expand Down
6 changes: 3 additions & 3 deletions src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp
Expand Up @@ -71,18 +71,18 @@ ViewProviderProjGroup::~ViewProviderProjGroup()
void ViewProviderProjGroup::attach(App::DocumentObject *pcFeat)
{
// call parent attach method
ViewProviderDocumentObject::attach(pcFeat);
ViewProviderDrawingView::attach(pcFeat);
}

void ViewProviderProjGroup::setDisplayMode(const char* ModeName)
{
ViewProviderDocumentObject::setDisplayMode(ModeName);
ViewProviderDrawingView::setDisplayMode(ModeName);
}

std::vector<std::string> ViewProviderProjGroup::getDisplayModes(void) const
{
// get the modes of the father
std::vector<std::string> StrList = ViewProviderDocumentObject::getDisplayModes();
std::vector<std::string> StrList = ViewProviderDrawingView::getDisplayModes();
StrList.push_back("Drawing");
return StrList;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp
Expand Up @@ -68,13 +68,13 @@ void ViewProviderProjGroupItem::attach(App::DocumentObject *pcFeat)

void ViewProviderProjGroupItem::setDisplayMode(const char* ModeName)
{
ViewProviderDocumentObject::setDisplayMode(ModeName);
ViewProviderViewPart::setDisplayMode(ModeName);
}

std::vector<std::string> ViewProviderProjGroupItem::getDisplayModes(void) const
{
// get the modes of the father
std::vector<std::string> StrList = ViewProviderDocumentObject::getDisplayModes();
std::vector<std::string> StrList = ViewProviderViewPart::getDisplayModes();
StrList.push_back("Drawing");
return StrList;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp
Expand Up @@ -137,13 +137,13 @@ void ViewProviderViewPart::attach(App::DocumentObject *pcFeat)

void ViewProviderViewPart::setDisplayMode(const char* ModeName)
{
ViewProviderDocumentObject::setDisplayMode(ModeName);
ViewProviderDrawingView::setDisplayMode(ModeName);
}

std::vector<std::string> ViewProviderViewPart::getDisplayModes(void) const
{
// get the modes of the father
std::vector<std::string> StrList = ViewProviderDocumentObject::getDisplayModes();
std::vector<std::string> StrList = ViewProviderDrawingView::getDisplayModes();

return StrList;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp
Expand Up @@ -73,13 +73,13 @@ void ViewProviderViewSection::attach(App::DocumentObject *pcFeat)

void ViewProviderViewSection::setDisplayMode(const char* ModeName)
{
ViewProviderDocumentObject::setDisplayMode(ModeName);
ViewProviderViewPart::setDisplayMode(ModeName);
}

std::vector<std::string> ViewProviderViewSection::getDisplayModes(void) const
{
// get the modes of the father
std::vector<std::string> StrList = ViewProviderDocumentObject::getDisplayModes();
std::vector<std::string> StrList = ViewProviderViewPart::getDisplayModes();

return StrList;
}
Expand Down

0 comments on commit b5c3ca2

Please sign in to comment.