From be66fe2f3a0e476a89349f76dd3e782b7e92edfb Mon Sep 17 00:00:00 2001
From: Sergi Hernandez Juan <shernand@iri.upc.edu>
Date: Mon, 16 Nov 2020 12:34:51 +0100
Subject: [PATCH] Added the iri_ prefix to the package.
---
CMakeLists.txt | 4 ++--
README.md | 10 +++++-----
launch/spawn_sign.launch | 2 +-
launch/spawn_test.launch | 4 ++--
package.xml | 6 +++---
urdf/materials.xacro | 2 +-
urdf/sign.xacro | 2 +-
urdf/signs/sign_macro.xacro | 6 +++---
urdf/test2020.xacro | 2 +-
9 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5fdbb24..40ae4c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8.3)
-project(sign_description)
+project(iri_sign_description)
## Compile as C++11, supported in ROS Kinetic and newer
# add_compile_options(-std=c++11)
@@ -100,7 +100,7 @@ find_package(catkin REQUIRED)
## DEPENDS: system dependencies of this project that dependent projects also need
catkin_package(
# INCLUDE_DIRS include
-# LIBRARIES sign_description
+# LIBRARIES iri_sign_description
# CATKIN_DEPENDS other_catkin_pkg
# DEPENDS system_lib
)
diff --git a/README.md b/README.md
index bbdaced..2466a2c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sign_description
+# iri_sign_description
This package contains the urdf and launch files to load road sign images, which can be used in simulation.
@@ -11,7 +11,7 @@ roscd && cd ../src
Clone the repository:
```
-git clone https://gitlab.iri.upc.edu/mobile_robotics/adc/simulator/sign_description.git
+git clone https://gitlab.iri.upc.edu/mobile_robotics/adc/simulator/iri_sign_description.git
```
Install all ROS dependencies with the following commands:
@@ -57,7 +57,7 @@ This package file includes a launch file named spawn_sign.launch which is intend
To spawn a traffic sign from an other launch file, include the following lines:
```
- <include file="$(find sign_description)/launch/spawn_sign.launch">
+ <include file="$(find iri_sign_description)/launch/spawn_sign.launch">
<arg name="name" value="$(arg name)"/>
<arg name="model" value="$(arg model)"/>
<arg name="tag" value="$(arg tag)"/>
@@ -72,7 +72,7 @@ To spawn a traffic sign from an other launch file, include the following lines:
A test launch file is provided to visualize the traffic sign in RVIZ. To use it, execute the following command:
```
-roslaunch sign_description spawn_test.launch
+roslaunch iri_sign_description spawn_test.launch
```
## Disclaimer
@@ -85,4 +85,4 @@ This package is distributed in the hope that it will be useful, but without any
In no event unless required by applicable law the author will be liable to you for damages, including any general, special, incidental or consequential damages arising out of the use or inability to use the program (including but not limited to loss of data or data being rendered inaccurate or losses sustained by you or third parties or a failure of the program to operate with any other programs), even if the author has been advised of the possibility of such damages.
You should have received a copy of the GNU Lesser General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>
\ No newline at end of file
+along with this program. If not, see <http://www.gnu.org/licenses/>
diff --git a/launch/spawn_sign.launch b/launch/spawn_sign.launch
index cc156a6..66d9f48 100644
--- a/launch/spawn_sign.launch
+++ b/launch/spawn_sign.launch
@@ -10,7 +10,7 @@
<arg name="parent" default="map"/>
<param name="$(arg name)_description"
- command="$(find xacro)/xacro '$(find sign_description)/urdf/$(arg model).xacro'
+ command="$(find xacro)/xacro '$(find iri_sign_description)/urdf/$(arg model).xacro'
name:=$(arg name)
tag:=$(arg tag)
type:=$(arg type)">
diff --git a/launch/spawn_test.launch b/launch/spawn_test.launch
index f8b1b30..f54fbd6 100644
--- a/launch/spawn_test.launch
+++ b/launch/spawn_test.launch
@@ -9,7 +9,7 @@
<arg name="yaw" default="3.14159"/>
<arg name="parent" default="map"/>
- <include file="$(find sign_description)/launch/spawn_sign.launch">
+ <include file="$(find iri_sign_description)/launch/spawn_sign.launch">
<arg name="name" value="$(arg name)"/>
<arg name="model" value="$(arg model)"/>
<arg name="tag" value="$(arg tag)"/>
@@ -21,6 +21,6 @@
</include>
<node name="$(arg name)_rviz" pkg="rviz" type="rviz"
- args="-d $(find sign_description)/rviz/$(arg name).rviz"/>
+ args="-d $(find iri_sign_description)/rviz/$(arg name).rviz"/>
</launch>
diff --git a/package.xml b/package.xml
index 06fec06..990600d 100644
--- a/package.xml
+++ b/package.xml
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<package>
- <name>sign_description</name>
+ <name>iri_sign_description</name>
<version>0.0.0</version>
- <description>The sign_description package contains urdf and dae files to build up road signs</description>
+ <description>The iri_sign_description package contains urdf and dae files to build up road signs</description>
<!-- One maintainer tag required, multiple allowed, one person per tag -->
<!-- Example: -->
@@ -18,7 +18,7 @@
<!-- Url tags are optional, but multiple are allowed, one per tag -->
<!-- Optional attribute type can be: website, bugtracker, or repository -->
<!-- Example: -->
- <!-- <url type="website">http://wiki.ros.org/sign_description</url> -->
+ <!-- <url type="website">http://wiki.ros.org/iri_sign_description</url> -->
<!-- Author tags are optional, multiple are allowed, one per tag -->
diff --git a/urdf/materials.xacro b/urdf/materials.xacro
index e0074bc..1cd0cd6 100644
--- a/urdf/materials.xacro
+++ b/urdf/materials.xacro
@@ -37,4 +37,4 @@
<color rgba="0.4 0.4 0.4 1.0"/>
</material>
-</root>
\ No newline at end of file
+</root>
diff --git a/urdf/sign.xacro b/urdf/sign.xacro
index ebd173e..46b3a47 100644
--- a/urdf/sign.xacro
+++ b/urdf/sign.xacro
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<robot name="$(arg name)" xmlns:xacro="http://www.ros.org/wiki/xacro">
- <xacro:include filename="$(find sign_description)/urdf/signs/sign_macro.xacro" />
+ <xacro:include filename="$(find iri_sign_description)/urdf/signs/sign_macro.xacro" />
<xacro:sign name="$(arg name)"
tag_dae="$(arg tag)"
diff --git a/urdf/signs/sign_macro.xacro b/urdf/signs/sign_macro.xacro
index 05db448..ed1590c 100644
--- a/urdf/signs/sign_macro.xacro
+++ b/urdf/signs/sign_macro.xacro
@@ -2,7 +2,7 @@
<root xmlns:xacro="http://www.ros.org/wiki/xacro">
- <xacro:include filename="$(find sign_description)/urdf/materials.xacro" />
+ <xacro:include filename="$(find iri_sign_description)/urdf/materials.xacro" />
<xacro:property name="PI" value="3.1415926535897931" />
<xacro:property name="box_width" value="0.07" />
@@ -65,7 +65,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0"/>
<geometry>
- <mesh filename="package://sign_description/urdf/signs/dae/${tag_dae}.dae" scale="${tag_size} 1.0 ${tag_size}"/>
+ <mesh filename="package://iri_sign_description/urdf/signs/dae/${tag_dae}.dae" scale="${tag_size} 1.0 ${tag_size}"/>
</geometry>
</visual>
</link>
@@ -95,7 +95,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0"/>
<geometry>
- <mesh filename="package://sign_description/urdf/signs/dae/${top_panel_dae}.dae" scale="${top_panel_width} 1.0 ${top_panel_height}"/>
+ <mesh filename="package://iri_sign_description/urdf/signs/dae/${top_panel_dae}.dae" scale="${top_panel_width} 1.0 ${top_panel_height}"/>
<!--<box size="${top_panel_width} ${delta} ${top_panel_height}"/>-->
</geometry>
<material name="${box_material}"/>
diff --git a/urdf/test2020.xacro b/urdf/test2020.xacro
index 69affce..e55d54d 100644
--- a/urdf/test2020.xacro
+++ b/urdf/test2020.xacro
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<robot name="$(arg name)" xmlns:xacro="http://www.ros.org/wiki/xacro">
- <xacro:include filename="$(find sign_description)/urdf/signs/sign_macro.xacro" />
+ <xacro:include filename="$(find iri_sign_description)/urdf/signs/sign_macro.xacro" />
<link name="$(arg parent)">
</link>
--
GitLab