From dcbdec3bd78c2543a107e41c5f0a900614022f34 Mon Sep 17 00:00:00 2001
From: Fabian Reister <fabian.reister@kit.edu>
Date: Thu, 11 Nov 2021 08:55:48 +0100
Subject: [PATCH] source: renaming all occurences of 'Armar6RT' to 'armar6_rt'
---
.../RobotAPI/components/ArViz/Example/ArVizExample.cpp | 4 ++--
.../components/NaturalIKTest/NaturalIKTest.cpp | 10 +++++-----
.../gui-plugins/ArVizDrawerGui/Elements/RobotWidget.ui | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/source/RobotAPI/components/ArViz/Example/ArVizExample.cpp b/source/RobotAPI/components/ArViz/Example/ArVizExample.cpp
index 87966a2f7..c05ba4c73 100644
--- a/source/RobotAPI/components/ArViz/Example/ArVizExample.cpp
+++ b/source/RobotAPI/components/ArViz/Example/ArVizExample.cpp
@@ -155,7 +155,7 @@ namespace armarx
pos.y() = i * 200.0f;
viz::Robot robot = viz::Robot(name)
.position(pos)
- .file("Armar6RT", "Armar6RT/robotmodel/Armar6-SH/Armar6-RightHand-v3.xml")
+ .file("armar6_rt", "armar6_rt/robotmodel/Armar6-SH/Armar6-RightHand-v3.xml")
.overrideColor(simox::Color::green(64 + i * 8));
layer.add(robot);
@@ -266,7 +266,7 @@ namespace armarx
viz::Robot robot = viz::Robot("robot")
.position(pos)
- .file("Armar6RT", "Armar6RT/robotmodel/Armar6-SH/Armar6-SH.xml");
+ .file("armar6_rt", "armar6_rt/robotmodel/Armar6-SH/Armar6-SH.xml");
// Full model
if (true)
diff --git a/source/RobotAPI/components/NaturalIKTest/NaturalIKTest.cpp b/source/RobotAPI/components/NaturalIKTest/NaturalIKTest.cpp
index 65fa2f6dd..8eb4b47b2 100644
--- a/source/RobotAPI/components/NaturalIKTest/NaturalIKTest.cpp
+++ b/source/RobotAPI/components/NaturalIKTest/NaturalIKTest.cpp
@@ -300,8 +300,8 @@ namespace armarx
void NaturalIKTest::testTaskRun()
{
- CMakePackageFinder finder("Armar6RT");
- std::string robotFile = finder.getDataDir() + "/Armar6RT/robotmodel/Armar6-SH/Armar6-SH.xml";
+ CMakePackageFinder finder("armar6_rt");
+ std::string robotFile = finder.getDataDir() + "/armar6_rt/robotmodel/Armar6-SH/Armar6-SH.xml";
ARMARX_IMPORTANT << "loading robot from " << robotFile;
VirtualRobot::RobotPtr robot = VirtualRobot::RobotIO::loadRobot(robotFile);
@@ -584,12 +584,12 @@ namespace armarx
viz::Layer layer_robot = arviz.layer("Robot");
viz::Robot vizrobot = viz::Robot("robot")
.position(Eigen::Vector3f::Zero())
- .file("Armar6RT", "Armar6RT/robotmodel/Armar6-SH/Armar6-SH.xml");
+ .file("armar6_rt", "armar6_rt/robotmodel/Armar6-SH/Armar6-SH.xml");
vizrobot.useFullModel();
layer_robot.add(vizrobot);
- CMakePackageFinder finder("Armar6RT");
- std::string robotFile = finder.getDataDir() + "/Armar6RT/robotmodel/Armar6-SH/Armar6-SH.xml";
+ CMakePackageFinder finder("armar6_rt");
+ std::string robotFile = finder.getDataDir() + "/armar6_rt/robotmodel/Armar6-SH/Armar6-SH.xml";
ARMARX_IMPORTANT << "loading robot from " << robotFile;
VirtualRobot::RobotPtr robot = VirtualRobot::RobotIO::loadRobot(robotFile);
diff --git a/source/RobotAPI/gui-plugins/ArVizDrawerGui/Elements/RobotWidget.ui b/source/RobotAPI/gui-plugins/ArVizDrawerGui/Elements/RobotWidget.ui
index 0858c31b0..b81a24c97 100644
--- a/source/RobotAPI/gui-plugins/ArVizDrawerGui/Elements/RobotWidget.ui
+++ b/source/RobotAPI/gui-plugins/ArVizDrawerGui/Elements/RobotWidget.ui
@@ -53,17 +53,17 @@
</property>
<item>
<property name="text">
- <string>Armar6RT/robotmodel/Armar6-SH/Armar6-SH.xml</string>
+ <string>armar6_rt/robotmodel/Armar6-SH/Armar6-SH.xml</string>
</property>
</item>
<item>
<property name="text">
- <string>Armar6RT/robotmodel/Armar6-SH/Armar6-RightHand-v3.xml</string>
+ <string>armar6_rt/robotmodel/Armar6-SH/Armar6-RightHand-v3.xml</string>
</property>
</item>
<item>
<property name="text">
- <string>Armar6RT/robotmodel/Armar6-SH/Armar6-LeftHand-v3.xml</string>
+ <string>armar6_rt/robotmodel/Armar6-SH/Armar6-LeftHand-v3.xml</string>
</property>
</item>
</widget>
--
GitLab