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

change old DAG implementation to pass unit tests

Browse Source
This commit is contained in:
wmayer 2017-01-22 15:32:31 +01:00
parent 0afb7b6a32
commit db0fe5b200
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/App/DocumentObject.cpp
View File

@ -559,17 +559,21 @@ void DocumentObject::unsetupObject()
ext->onExtendedUnsetupObject();
}
void App::DocumentObject::_removeBackLink(DocumentObject* rmfObj)
void App::DocumentObject::_removeBackLink(DocumentObject* rmvObj)
{
#ifndef USE_OLD_DAG
_inList.erase(std::remove(_inList.begin(), _inList.end(), rmfObj), _inList.end());
_inList.erase(std::remove(_inList.begin(), _inList.end(), rmvObj), _inList.end());
#else
(void)rmvObj;
#endif
}
void App::DocumentObject::_addBackLink(DocumentObject* newObje)
void App::DocumentObject::_addBackLink(DocumentObject* newObj)
{
#ifndef USE_OLD_DAG
if ( std::find(_inList.begin(), _inList.end(), newObje) == _inList.end() )
_inList.push_back(newObje);
if ( std::find(_inList.begin(), _inList.end(), newObj) == _inList.end() )
_inList.push_back(newObj);
#else
(void)newObj;
#endif //USE_OLD_DAG
}

4
src/App/DocumentPyImp.cpp
View File

@ -508,7 +508,6 @@ Py::List DocumentPy::getToplogicalSortedObjects(void) const
Py::List DocumentPy::getRootObjects(void) const
{
#ifndef USE_OLD_DAG
std::vector<DocumentObject*> objs = getDocumentPtr()->getRootObjects();
Py::List res;
@ -517,9 +516,6 @@ Py::List DocumentPy::getRootObjects(void) const
res.append(Py::Object((*It)->getPyObject(), true));
return res;
#else
return Py::List();
#endif
}
Py::Int DocumentPy::getUndoMode(void) const