kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge branch 'refs/heads/master' into jriegel/develop-fem

Browse Source 
Conflicts:
	src/Mod/Fem/App/FemMeshShapeNetgenObject.cpp
	src/Mod/Fem/App/FemMeshShapeNetgenObject.h
	src/Mod/Fem/Gui/AppFemGuiPy.cpp
	src/Mod/Fem/Gui/Command.cpp
	src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.cpp
	src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.h
	src/Mod/Fem/Gui/TaskTetParameter.cpp
	src/Mod/Fem/Gui/TaskTetParameter.h
	src/Mod/Fem/Gui/TaskTetParameter.ui
	src/Mod/Fem/Gui/ViewProviderAnalysis.cpp
	src/Mod/Fem/Gui/ViewProviderAnalysis.h
	src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.cpp
	src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.h
This commit is contained in:
jriegel
2013-06-26 19:02:15 +02:00
parent 514c72e156 93bc329cb7
commit 212964634a
123 changed files with 6137 additions and 2296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Gui/Application.cpp
View File

@@ -800,19 +800,19 @@ Gui::Document* Application::getDocument(const App::Document* pDoc) const
return 0;
}
void Application::showViewProvider(App::DocumentObject* obj)
void Application::showViewProvider(const App::DocumentObject* obj)
{
ViewProvider* vp = getViewProvider(obj);
if (vp) vp->show();
}
void Application::hideViewProvider(App::DocumentObject* obj)
void Application::hideViewProvider(const App::DocumentObject* obj)
{
ViewProvider* vp = getViewProvider(obj);
if (vp) vp->hide();
}
Gui::ViewProvider* Application::getViewProvider(App::DocumentObject* obj) const
Gui::ViewProvider* Application::getViewProvider(const App::DocumentObject* obj) const
{
App::Document* doc = obj->getDocument();
if (doc) {