From 84c6e50dfff1bf2316f4e53a771b4b9b55b8080b Mon Sep 17 00:00:00 2001
From: Mirko Waechter <waechter@kit.edu>
Date: Fri, 17 Oct 2014 10:17:13 +0200
Subject: [PATCH] Adapted paths to new data paths
---
source/RobotAPI/components/units/HeadIKUnit.cpp | 2 +-
source/RobotAPI/statecharts/motioncontrol/MotionControl.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/source/RobotAPI/components/units/HeadIKUnit.cpp b/source/RobotAPI/components/units/HeadIKUnit.cpp
index 3cb080ad5..e3bdc087d 100644
--- a/source/RobotAPI/components/units/HeadIKUnit.cpp
+++ b/source/RobotAPI/components/units/HeadIKUnit.cpp
@@ -44,7 +44,7 @@ namespace armarx
//std::string robotModelFile;
- //ArmarXDataPath::getAbsolutePath("data/Armar3/robotmodel/ArmarIII.xml", robotModelFile);
+ //ArmarXDataPath::getAbsolutePath("Armar3/robotmodel/ArmarIII.xml", robotModelFile);
//localRobot = VirtualRobot::RobotIO::loadRobot(robotModelFile.c_str(), VirtualRobot::RobotIO::eStructure);
//VirtualRobot::RobotPtr robotSnapshot(new RemoteRobot(remoteRobotPrx));
//localRobot->setConfig(robotSnapshot->getConfig());
diff --git a/source/RobotAPI/statecharts/motioncontrol/MotionControl.cpp b/source/RobotAPI/statecharts/motioncontrol/MotionControl.cpp
index eae6c79d0..dcbdd72b4 100644
--- a/source/RobotAPI/statecharts/motioncontrol/MotionControl.cpp
+++ b/source/RobotAPI/statecharts/motioncontrol/MotionControl.cpp
@@ -501,7 +501,7 @@ void CalculateJointAngleConfiguration::run()
//VirtualRobot::RobotPtr robot = robotPtr->clone("CalculateTCPPoseClone");
//std::string robotModelFile;
//ArmarXDataPath::getAbsolutePath("Armar4/robotmodel/ArmarIV.xml", robotModelFile);
- //ArmarXDataPath::getAbsolutePath("data/Armar3/robotmodel/ArmarIII.xml", robotModelFile);
+ //ArmarXDataPath::getAbsolutePath("Armar3/robotmodel/ArmarIII.xml", robotModelFile);
//VirtualRobot::RobotPtr robot = VirtualRobot::RobotIO::loadRobot(robotModelFile.c_str());
std::string kinChainName = getInput<std::string>("kinematicChainName");
--
GitLab