Skip to content
Snippets Groups Projects
Commit 25474699 authored by Fabian Reister's avatar Fabian Reister
Browse files

fixes due to changes in simox: some methods are now const

parent 33e59cb0
Branches fix/obstacle_awareness
No related tags found
No related merge requests found
......@@ -90,7 +90,7 @@ namespace armarx
return _root;
}
bool RemoteRobot::hasRobotNode(const std::string& robotNodeName)
bool RemoteRobot::hasRobotNode(const std::string& robotNodeName) const
{
if (_cachedNodes.find(name) == _cachedNodes.end())
{
......@@ -103,7 +103,7 @@ namespace armarx
}
bool RemoteRobot::hasRobotNode(RobotNodePtr robotNode)
bool RemoteRobot::hasRobotNode(RobotNodePtr robotNode) const
{
return this->hasRobotNode(robotNode->getName());
......@@ -159,7 +159,7 @@ namespace armarx
}
}
bool RemoteRobot::hasRobotNodeSet(const std::string& name)
bool RemoteRobot::hasRobotNodeSet(const std::string& name) const
{
return _robot->hasRobotNodeSet(name);
}
......@@ -539,17 +539,17 @@ namespace armarx
// Private (unused methods)
bool RemoteRobot::hasEndEffector(const std::string& endEffectorName)
bool RemoteRobot::hasEndEffector(const std::string& endEffectorName) const
{
return false;
}
EndEffectorPtr RemoteRobot::getEndEffector(const std::string& endEffectorName)
EndEffectorPtr RemoteRobot::getEndEffector(const std::string& endEffectorName) const
{
return EndEffectorPtr();
}
void RemoteRobot::getEndEffectors(std::vector<EndEffectorPtr>& storeEEF) {}
void RemoteRobot::getEndEffectors(std::vector<EndEffectorPtr>& storeEEF) const {}
void RemoteRobot::setRootNode(RobotNodePtr node) {}
void RemoteRobot::registerRobotNode(RobotNodePtr node) {}
void RemoteRobot::deregisterRobotNode(RobotNodePtr node) {}
......
......@@ -145,13 +145,13 @@ namespace armarx
VirtualRobot::RobotNodePtr getRootNode() const override;
bool hasRobotNode(const std::string& robotNodeName) override;
bool hasRobotNode(VirtualRobot::RobotNodePtr) override;
bool hasRobotNode(const std::string& robotNodeName) const override;
bool hasRobotNode(VirtualRobot::RobotNodePtr) const override;
VirtualRobot::RobotNodePtr getRobotNode(const std::string& robotNodeName) const override;
void getRobotNodes(std::vector< VirtualRobot::RobotNodePtr >& storeNodes, bool clearVector = true) const override;
bool hasRobotNodeSet(const std::string& name) override;
bool hasRobotNodeSet(const std::string& name) const override;
VirtualRobot::RobotNodeSetPtr getRobotNodeSet(const std::string& nodeSetName) const override;
void getRobotNodeSets(std::vector<VirtualRobot::RobotNodeSetPtr>& storeNodeSet) const override;
......@@ -223,11 +223,11 @@ namespace armarx
protected:
/// Not implemented yet
bool hasEndEffector(const std::string& endEffectorName) override;
bool hasEndEffector(const std::string& endEffectorName) const override;
/// Not implemented yet
VirtualRobot::EndEffectorPtr getEndEffector(const std::string& endEffectorName) override;
VirtualRobot::EndEffectorPtr getEndEffector(const std::string& endEffectorName) const override;
/// Not implemented yet
void getEndEffectors(std::vector<VirtualRobot::EndEffectorPtr>& storeEEF) override;
void getEndEffectors(std::vector<VirtualRobot::EndEffectorPtr>& storeEEF) const override;
/// Not implemented yet
void setRootNode(VirtualRobot::RobotNodePtr node) override;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment