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

restore old DAG implementation and fix some build failures

Browse Source
This commit is contained in:
wmayer 2017-01-22 13:31:49 +01:00
parent f21fa3e17f
commit 172206f58e
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/App/CMakeLists.txt
View File

@ -15,7 +15,7 @@ ENDIF(DOCDIR)
add_definitions(-DBOOST_${Boost_VERSION})
#if you want to use the old DAG structure uncomment this line
#add_definitions(-DUSE_OLD_DAG)
add_definitions(-DUSE_OLD_DAG)
#write relevant cmake variables to a file for later access with python. Exportet are all variables
#starting with BUILD. As the variable only exists if the user set it to ON a dict is useless, we

23
src/App/DocumentObject.cpp
View File

@ -321,16 +321,18 @@ bool DocumentObject::_isInInListRecursive(const DocumentObject* /*act*/,
if (_isInInListRecursive(obj, test, checkObj, depth - 1))
return true;
}
#else
(void)test;
(void)checkObj;
(void)depth;
#endif
return false;
#endif
}
bool DocumentObject::isInInListRecursive(DocumentObject *linkTo) const
{
#ifndef USE_OLD_DAG
return _isInInListRecursive(this, linkTo, this, getDocument()->countObjects());
#endif
}
bool DocumentObject::isInInList(DocumentObject *linkTo) const
@ -340,10 +342,13 @@ bool DocumentObject::isInInList(DocumentObject *linkTo) const
return true;
else
return false;
#else
(void)linkTo;
return false;
#endif
}
bool DocumentObject::_isInOutListRecursive(const DocumentObject *act,
bool DocumentObject::_isInOutListRecursive(const DocumentObject* act,
const DocumentObject* test,
const DocumentObject* checkObj, int depth) const
{
@ -363,16 +368,19 @@ bool DocumentObject::_isInOutListRecursive(const DocumentObject *act,
if (_isInOutListRecursive(obj, test, checkObj, depth - 1))
return true;
}
#else
(void)act;
(void)test;
(void)checkObj;
(void)depth;
#endif
return false;
#endif
}
bool DocumentObject::isInOutListRecursive(DocumentObject *linkTo) const
{
#ifndef USE_OLD_DAG
return _isInOutListRecursive(this, linkTo, this, getDocument()->countObjects());
#endif
}
void DocumentObject::onLostLinkToObject(DocumentObject*)
@ -393,7 +401,6 @@ void DocumentObject::setDocument(App::Document* doc)
void DocumentObject::onBeforeChange(const Property* prop)
{
// Store current name in oldLabel, to be able to easily retrieve old name of document object later
// when renaming expressions.
if (prop == &Label)