Resolve "Update ObjectFinder to PriorKnowledgeData"
3 unresolved threads
3 unresolved threads
Closes #59 (closed)
Edited by Rainer Kartmann
Merge request reports
Activity
added feature label
added 6 commits
- 851d051b - Update ObjectFinder and ObjectInfo to structure of PriorKnowledgeData
- c59190cc - Add getters for files, fix output
- b8b7bd32 - Extend ArmarXObjectsTest
- 0ce84bcb - Add articulated simox XML in ObjectClass
- bbbf3875 - Update default config
- dc425aa2 - Try to resolve object IDs without dataset
By ARMAR-6 on 2021-06-28T12:37:13 (imported from GitLab)
Toggle commit listCherry picked from armem/use-prior-knowledge-data
57 57 58 58 ObjectInfo::path ObjectInfo::objectDirectory() const 59 59 { 60 return path(_packageName) / _id.dataset() / _id.className(); 60 return path(_packageName) / "objects" / _id.dataset() / _id.className(); Duplicate of "objects".
What do you mean? Where's the other one?
I also think it might be better to give the ObjectInfo a root dir for the objects instead of the package data dir. In that case, we won't need the "objects" here.
Edited by Rainer Kartmannchanged this line in version 3 of the diff
By ARMAR-6 on 2021-06-28T17:07:13 (imported from GitLab)
232 242 { 233 243 if (_logError) 234 244 { 235 ARMARX_WARNING << "Expected simox object file for object '" << *this << "': " << simoxXML().absolutePath; 245 ARMARX_WARNING << "Expected simox object file for object " << *this << ": " << simoxXML().absolutePath; 236 246 } 237 247 result = false; 238 248 } 239 if (!fs::is_regular_file(wavefrontObj().absolutePath)) 249 if (false and not fs::is_regular_file(wavefrontObj().absolutePath)) added 1 commit
- 50fd9bc9 - Update floor object ID, fix height (was +1, now is -1)
By ARMAR-6 on 2021-06-28T12:50:20 (imported from GitLab)
401 401 402 402 ObjectFinder::path ObjectFinder::_rootDirAbs() const 403 403 { 404 return packageDataDir / packageName; 404 return packageDataDir / packageName / "objects"; changed this line in version 3 of the diff
By ARMAR-6 on 2021-06-28T17:07:13 (imported from GitLab)
added 1 commit
- a2fed110 - Improve handling of "objects" dir, finding articulated objects
By ARMAR-6 on 2021-06-28T17:07:14 (imported from GitLab)
mentioned in commit 1a711741
Please register or sign in to reply