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

+ introduce proper enum for property status to replace plain integers

Browse Source
This commit is contained in:
wmayer
2016-01-01 15:36:24 +01:00
parent 9f19d5611a
commit 750897c20e
15 changed files with 80 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Gui/ViewProviderDocumentObjectGroup.cpp
View File

@@ -162,7 +162,7 @@ void ViewProviderDocumentObjectGroup::hide(void)
{
// when reading the Visibility property from file then do not hide the
// objects of this group because they have stored their visibility status, too
if (!Visibility.StatusBits.test(9) && this->visible) {
if (!Visibility.testStatus(App::Property::User1) && this->visible) {
App::DocumentObject * group = getObject();
if (group && group->getTypeId().isDerivedFrom(App::DocumentObjectGroup::getClassTypeId())) {
const std::vector<App::DocumentObject*> & links = static_cast<App::DocumentObjectGroup*>
@@ -183,7 +183,7 @@ void ViewProviderDocumentObjectGroup::show(void)
{
// when reading the Visibility property from file then do not hide the
// objects of this group because they have stored their visibility status, too
if (!Visibility.StatusBits.test(9) && !this->visible) {
if (!Visibility.testStatus(App::Property::User1) && !this->visible) {
App::DocumentObject * group = getObject();
if (group && group->getTypeId().isDerivedFrom(App::DocumentObjectGroup::getClassTypeId())) {
const std::vector<App::DocumentObject*> & links = static_cast<App::DocumentObjectGroup*>
@@ -207,9 +207,9 @@ bool ViewProviderDocumentObjectGroup::isShow(void) const
void ViewProviderDocumentObjectGroup::Restore(Base::XMLReader &reader)
{
Visibility.StatusBits.set(9); // tmp. set
Visibility.setStatus(App::Property::User1, true); // tmp. set
ViewProviderDocumentObject::Restore(reader);
Visibility.StatusBits.reset(9); // unset
Visibility.setStatus(App::Property::User1, false); // unset
}
/**