From 18406e593468b3e8cfb1cfe28c52e57f2f612ce0 Mon Sep 17 00:00:00 2001
From: armar-user <armar6@kit>
Date: Tue, 12 Jul 2022 15:38:59 +0200
Subject: [PATCH] on armar6: fixing default param for VirtualRobot::BaseIO
RobotDescription (committed by FR)
---
.../libraries/core/remoterobot/RemoteRobot.cpp | 6 +++---
.../libraries/core/remoterobot/RemoteRobot.h | 18 ++++++++++++++----
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.cpp b/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.cpp
index 4f0f563e7..635c12212 100644
--- a/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.cpp
+++ b/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.cpp
@@ -363,12 +363,12 @@ namespace armarx
return robo;
}
- VirtualRobot::RobotPtr RemoteRobot::createLocalClone(RobotStateComponentInterfacePrx robotStatePrx, const std::string& filename, const Ice::StringSeq packages, VirtualRobot::RobotIO::RobotDescription loadMode)
+ VirtualRobot::RobotPtr RemoteRobot::createLocalClone(RobotStateComponentInterfacePrx robotStatePrx, const std::string& filename, const Ice::StringSeq packages, VirtualRobot::BaseIO::RobotDescription loadMode)
{
return createLocalClone(robotStatePrx->getSynchronizedRobot(), filename, robotStatePrx->getScaling(), packages, loadMode);
}
- RobotPtr RemoteRobot::createLocalClone(SharedRobotInterfacePrx sharedRobotPrx, std::string filename, float scaling, const Ice::StringSeq packages, VirtualRobot::RobotIO::RobotDescription loadMode)
+ RobotPtr RemoteRobot::createLocalClone(SharedRobotInterfacePrx sharedRobotPrx, std::string filename, float scaling, const Ice::StringSeq packages, VirtualRobot::BaseIO::RobotDescription loadMode)
{
RobotPtr result;
@@ -438,7 +438,7 @@ namespace armarx
return result;
}
- RobotPtr RemoteRobot::createLocalCloneFromFile(RobotStateComponentInterfacePrx robotStatePrx, RobotIO::RobotDescription loadMode)
+ RobotPtr RemoteRobot::createLocalCloneFromFile(RobotStateComponentInterfacePrx robotStatePrx, BaseIO::RobotDescription loadMode)
{
return createLocalClone(robotStatePrx, robotStatePrx->getRobotFilename(), robotStatePrx->getArmarXPackages(), loadMode);
}
diff --git a/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h b/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h
index 734db7407..5f5164bd2 100644
--- a/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h
+++ b/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h
@@ -180,9 +180,19 @@ namespace armarx
The loadMode specifies in which mode the model should be loaded. Refer to simox for more information (only matters if filename was passed in).
@see createLocalCloneFromFile(), synchronizeLocalClone()
*/
- static VirtualRobot::RobotPtr createLocalClone(RobotStateComponentInterfacePrx robotStatePrx, const std::string& filename = std::string(), const Ice::StringSeq packages = Ice::StringSeq(), VirtualRobot::RobotIO::RobotDescription loadMode = VirtualRobot::RobotIO::eFull);
-
- static VirtualRobot::RobotPtr createLocalClone(SharedRobotInterfacePrx sharedRobotPrx, std::string filename = std::string(), float scaling = 1.0f, const Ice::StringSeq packages = Ice::StringSeq(), VirtualRobot::RobotIO::RobotDescription loadMode = VirtualRobot::RobotIO::eFull);
+ static VirtualRobot::RobotPtr createLocalClone(
+ RobotStateComponentInterfacePrx robotStatePrx,
+ const std::string& filename = "",
+ const Ice::StringSeq packages = {},
+ VirtualRobot::BaseIO::RobotDescription loadMode = VirtualRobot::BaseIO::RobotDescription::eFull);
+
+ static VirtualRobot::RobotPtr createLocalClone(
+ SharedRobotInterfacePrx sharedRobotPrx,
+ std::string filename = "",
+ float scaling = 1.0f,
+ const Ice::StringSeq packages = {},
+ VirtualRobot::BaseIO::RobotDescription loadMode = VirtualRobot::BaseIO::RobotDescription::eFull
+ );
/**
* @brief This is a convenience function for createLocalClone, which automatically gets the filename from the RobotStateComponent,
@@ -192,7 +202,7 @@ namespace armarx
* @return new robot clone
* @see createLocalClone(), synchronizeLocalClone()
*/
- static VirtualRobot::RobotPtr createLocalCloneFromFile(RobotStateComponentInterfacePrx robotStatePrx, VirtualRobot::RobotIO::RobotDescription loadMode = VirtualRobot::RobotIO::eFull);
+ static VirtualRobot::RobotPtr createLocalCloneFromFile(RobotStateComponentInterfacePrx robotStatePrx, VirtualRobot::BaseIO::RobotDescription loadMode = VirtualRobot::BaseIO::eFull);
/*!
--
GitLab