From 851d051bdcfd20a02a7d50fc644639accfb92e26 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Sun, 27 Jun 2021 17:29:28 +0200
Subject: [PATCH] Update ObjectFinder and ObjectInfo to structure of
PriorKnowledgeData
---
source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp | 4 ++--
source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.h | 8 +++++---
source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp b/source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp
index 2e026dd21..f964364b9 100644
--- a/source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp
+++ b/source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp
@@ -57,7 +57,7 @@ namespace armarx
bool ObjectFinder::isDatasetDirValid(const path& path) const
{
- return path.filename() != "Scenes" and std::filesystem::is_directory(path);
+ return std::filesystem::is_directory(path);
}
@@ -401,7 +401,7 @@ namespace armarx
ObjectFinder::path ObjectFinder::_rootDirAbs() const
{
- return packageDataDir / packageName;
+ return packageDataDir / packageName / "objects";
}
ObjectFinder::path ObjectFinder::_rootDirRel() const
diff --git a/source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.h b/source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.h
index 0bef06671..18c23dbdb 100644
--- a/source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.h
+++ b/source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.h
@@ -15,17 +15,19 @@
namespace armarx
{
/**
- * @brief Used to find objects in the ArmarX objects repository [1].
+ * @brief Used to find objects in the ArmarX objects repository [1] (formerly [2]).
*
- * @see [1] https://gitlab.com/ArmarX/ArmarXObjects
+ * @see [1] https://gitlab.com/ArmarX/PriorKnowledgeData
+ * @see [2] https://gitlab.com/ArmarX/ArmarXObjects
*/
class ObjectFinder : Logging
{
public:
using path = std::filesystem::path;
- inline static const std::string DefaultObjectsPackageName = "ArmarXObjects";
+ inline static const std::string DefaultObjectsPackageName = "PriorKnowledgeData";
public:
+
ObjectFinder(const std::string& objectsPackageName = DefaultObjectsPackageName);
ObjectFinder(ObjectFinder&&) = default;
diff --git a/source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp b/source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp
index 348a5b254..c68e1b271 100644
--- a/source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp
+++ b/source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp
@@ -57,7 +57,7 @@ namespace armarx
ObjectInfo::path ObjectInfo::objectDirectory() const
{
- return path(_packageName) / _id.dataset() / _id.className();
+ return path(_packageName) / "objects" / _id.dataset() / _id.className();
}
PackageFileLocation ObjectInfo::file(const std::string& _extension, const std::string& suffix) const
--
GitLab