suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PartDesign: Adopt primitive preview

Browse Source 
The preview was developed when the "one feature only" visibility rule was not yet introduced. This commit maks it work again.
This commit is contained in:
Stefan Tröger 2016-04-09 10:54:26 +02:00
parent 6bf31e841e
commit 8b0d53358a
4 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp
View File

@ -621,10 +621,7 @@ TaskPrimitiveParameters::TaskPrimitiveParameters(ViewProviderPrimitive* Primitiv
//make sure the relevant things are visible
cs_visibility = vp->isVisible();
vp->Visibility.setValue(true);
if(prm->BaseFeature.getValue()) {
Gui::Application::Instance->activeDocument()->getViewProvider(prm->BaseFeature.getValue())->setVisible(true);
}
parameter = new TaskDatumParameters(vp);
Content.push_back(parameter);
@ -659,12 +656,7 @@ bool TaskPrimitiveParameters::accept()
ViewProviderDatumCoordinateSystem* vp = static_cast<ViewProviderDatumCoordinateSystem*>(
Gui::Application::Instance->activeDocument()->getViewProvider(cs));
vp->setVisible(cs_visibility);
auto* prm = static_cast<PartDesign::FeaturePrimitive*>(vp_prm->getObject());
if(prm->BaseFeature.getValue()) {
Gui::Application::Instance->activeDocument()->getViewProvider(prm->BaseFeature.getValue())->setVisible(false);
}
connection.disconnect();
return true;
}
@ -679,15 +671,9 @@ bool TaskPrimitiveParameters::reject() {
ViewProviderDatumCoordinateSystem* vp = static_cast<ViewProviderDatumCoordinateSystem*>(
Gui::Application::Instance->activeDocument()->getViewProvider(cs));
if(vp) {
if(vp)
vp->setVisible(cs_visibility);
auto* prm = static_cast<PartDesign::FeaturePrimitive*>(vp_prm->getObject());
if(prm->BaseFeature.getValue()) {
Gui::Application::Instance->activeDocument()->getViewProvider(prm->BaseFeature.getValue())->setVisible(false);
}
}
connection.disconnect();
return true;
}

10
src/Mod/PartDesign/Gui/ViewProvider.cpp
View File

@ -25,6 +25,7 @@
#ifndef _PreComp_
# include <QMessageBox>
#include <Inventor/nodes/SoSwitch.h>
#endif
#include <Gui/Command.h>
@ -237,3 +238,12 @@ void ViewProvider::setBodyMode(bool bodymode) {
prop->setStatus(App::Property::Hidden, bodymode);
}
}
void ViewProvider::makeTemporaryVisible(bool onoff)
{
//make sure to not use the overridden versions, as they change proeprties
if(onoff)
Gui::ViewProvider::show();
else
Gui::ViewProvider::hide();
}

6
src/Mod/PartDesign/Gui/ViewProvider.h
View File

@ -52,6 +52,12 @@ public:
//visual properties, not the features. Hence setting body mode to true will hide most
//viewprovider properties.
void setBodyMode(bool bodymode);
//makes this viewprovider visible in the scene graph without chaning any properties,
//not the visibility one and also not the display mode. This can be used to show the
//shape of this viewprovider from other viewproviders without doing anything to the
//document and properties.
void makeTemporaryVisible(bool);
protected:
virtual bool setEdit(int ModNum);

5
src/Mod/PartDesign/Gui/ViewProviderAddSub.cpp
View File

@ -34,6 +34,7 @@
#include <Gui/Command.h>
#include <Gui/Application.h>
#include <Gui/BitmapFactory.h>
#include <Gui/Document.h>
#include <Base/Console.h>
#include <Inventor/nodes/SoSeparator.h>
#include <Inventor/nodes/SoSwitch.h>
@ -282,4 +283,8 @@ void ViewProviderAddSub::setPreviewDisplayMode(bool onoff) {
if(!onoff) {
setDisplayMaskMode(displayMode.c_str());
}
App::DocumentObject* obj = static_cast<PartDesign::Feature*>(getObject())->BaseFeature.getValue();
if(obj)
static_cast<PartDesignGui::ViewProvider*>(Gui::Application::Instance->getViewProvider(obj))->makeTemporaryVisible(onoff);
}