Skip to content

Commit 2d264d5

Browse files
Update to tesseract version 0.33.X (#279)
1 parent bd5a056 commit 2d264d5

File tree

5 files changed

+21
-19
lines changed

5 files changed

+21
-19
lines changed

dependencies.rosinstall

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
- git:
22
local-name: ros_industrial_cmake_boilerplate
33
uri: https://github.com/ros-industrial/ros_industrial_cmake_boilerplate.git
4-
version: 0.7.3
4+
version: 0.7.4
55
- git:
66
local-name: boost_plugin_loader
77
uri: https://github.com/tesseract-robotics/boost_plugin_loader.git
8-
version: 0.3.2
8+
version: 0.4.2
99
- git:
1010
local-name: tesseract
1111
uri: https://github.com/tesseract-robotics/tesseract.git
12-
version: 0.32.0
12+
version: 0.33.0
1313
- git:
1414
local-name: trajopt
1515
uri: https://github.com/tesseract-robotics/trajopt.git
16-
version: 0.32.0
16+
version: 0.33.0
1717
- git:
1818
local-name: tesseract_planning
1919
uri: https://github.com/tesseract-robotics/tesseract_planning.git
20-
version: 0.32.0
20+
version: 0.33.0
2121
- git:
2222
local-name: tesseract_qt
2323
uri: https://github.com/tesseract-robotics/tesseract_qt.git
24-
version: 0.32.0
24+
version: 0.33.0
2525
- git:
2626
local-name: descartes_light
2727
uri: https://github.com/swri-robotics/descartes_light.git

dependencies_with_ext.rosinstall

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
- git:
22
local-name: ros_industrial_cmake_boilerplate
33
uri: https://github.com/ros-industrial/ros_industrial_cmake_boilerplate.git
4-
version: 0.7.3
4+
version: 0.7.4
55
- git:
66
local-name: boost_plugin_loader
77
uri: https://github.com/tesseract-robotics/boost_plugin_loader.git
8-
version: 0.3.2
8+
version: 0.4.2
99
- git:
1010
local-name: tesseract_ext
1111
uri: https://github.com/tesseract-robotics/tesseract_ext.git
1212
version: master
1313
- git:
1414
local-name: tesseract
1515
uri: https://github.com/tesseract-robotics/tesseract.git
16-
version: 0.32.0
16+
version: 0.33.0
1717
- git:
1818
local-name: trajopt
1919
uri: https://github.com/tesseract-robotics/trajopt_ros.git
20-
version: 0.32.0
20+
version: 0.33.0
2121
- git:
2222
local-name: tesseract_planning
2323
uri: https://github.com/tesseract-robotics/tesseract_planning.git
24-
version: 0.32.0
24+
version: 0.33.0
2525
- git:
2626
local-name: tesseract_qt
2727
uri: https://github.com/tesseract-robotics/tesseract_qt.git
28-
version: 0.32.0
28+
version: 0.33.0
2929
- git:
3030
local-name: descartes_light
3131
uri: https://github.com/swri-robotics/descartes_light.git

tesseract_planning_server/src/tesseract_planning_server.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ struct TesseractPlanningServer::Implementation
304304
// Generate DOT Graph if requested
305305
if (goal->request.dotgraph)
306306
result.response.dotgraph = planning_server->getTask(plan_future->context->name)
307-
.getDotgraph(plan_future->context->task_infos.getInfoMap());
307+
.getDotgraph(plan_future->context->task_infos->getInfoMap());
308308

309309
try
310310
{

tesseract_rosutils/src/utils.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1992,8 +1992,9 @@ bool fromMsg(tesseract_srdf::KinematicsInformation& kin_info, const tesseract_ms
19921992
tesseract_common::KinematicsPluginInfo fromMsg(const tesseract_msgs::KinematicsPluginInfo& info_msg)
19931993
{
19941994
tesseract_common::KinematicsPluginInfo info;
1995-
info.search_paths.insert(info_msg.search_paths.begin(), info_msg.search_paths.end());
1996-
info.search_libraries.insert(info_msg.search_libraries.begin(), info_msg.search_libraries.end());
1995+
info.search_paths.insert(info.search_paths.end(), info_msg.search_paths.begin(), info_msg.search_paths.end());
1996+
info.search_libraries.insert(
1997+
info.search_libraries.end(), info_msg.search_libraries.begin(), info_msg.search_libraries.end());
19971998

19981999
for (const auto& pair : info_msg.group_fwd_plugins)
19992000
{
@@ -2017,8 +2018,9 @@ tesseract_common::KinematicsPluginInfo fromMsg(const tesseract_msgs::KinematicsP
20172018
tesseract_common::ContactManagersPluginInfo fromMsg(const tesseract_msgs::ContactManagersPluginInfo& info_msg)
20182019
{
20192020
tesseract_common::ContactManagersPluginInfo info;
2020-
info.search_paths.insert(info_msg.search_paths.begin(), info_msg.search_paths.end());
2021-
info.search_libraries.insert(info_msg.search_libraries.begin(), info_msg.search_libraries.end());
2021+
info.search_paths.insert(info.search_paths.end(), info_msg.search_paths.begin(), info_msg.search_paths.end());
2022+
info.search_libraries.insert(
2023+
info.search_libraries.end(), info_msg.search_libraries.begin(), info_msg.search_libraries.end());
20222024
info.discrete_plugin_infos.default_plugin = info_msg.discrete_plugin_container.default_plugin;
20232025
info.discrete_plugin_infos.plugins = fromMsg(info_msg.discrete_plugin_container.plugins);
20242026
info.continuous_plugin_infos.default_plugin = info_msg.continuous_plugin_container.default_plugin;

tesseract_rosutils/test/tesseract_rosutils_unit.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ TEST_F(TesseractROSUtilsUnit, KinematicsInformation) // NOLINT
139139
gts["sander"] = p;
140140
kin_info.group_tcps["manipulator1"] = gts;
141141

142-
kin_info.kinematics_plugin_info.search_paths.insert("/usr/local/lib");
143-
kin_info.kinematics_plugin_info.search_libraries.insert("tesseract_kdl_factories");
142+
kin_info.kinematics_plugin_info.search_paths.emplace_back("/usr/local/lib");
143+
kin_info.kinematics_plugin_info.search_libraries.emplace_back("tesseract_kdl_factories");
144144

145145
{
146146
tesseract_common::PluginInfo info;

0 commit comments

Comments
 (0)