From: Walter Fetter Lages <w.fetter@ieee.org>
Date: Mon, 25 Jul 2022 01:18:25 +0000 (-0300)
Subject: Change rviz configuration to config directory.
X-Git-Url: http://git.ece.ufrgs.br/?a=commitdiff_plain;h=737ab9e0c66a5e8c1ead1b2760cb925c12fdacdf;p=q2d.git

Change rviz configuration to config directory.
---

diff --git a/q2d_description/rviz/display.rviz b/q2d_description/config/display.rviz
similarity index 100%
rename from q2d_description/rviz/display.rviz
rename to q2d_description/config/display.rviz
diff --git a/q2d_description/launch/display.launch.py b/q2d_description/launch/display.launch.py
index e80799e..645a58a 100644
--- a/q2d_description/launch/display.launch.py
+++ b/q2d_description/launch/display.launch.py
@@ -15,7 +15,7 @@ def generate_launch_description():
         with open(urdf_path,'r') as infp:
                 robot_desc=infp.read()
 
-        rviz_file_name = 'rviz/display.rviz'
+        rviz_file_name = 'config/display.rviz'
         rviz_path=os.path.join(get_package_share_directory('q2d_description'),rviz_file_name)
 
         return LaunchDescription([
diff --git a/q2d_description/launch/display.launch.xml b/q2d_description/launch/display.launch.xml
index ffbd828..d91bd82 100644
--- a/q2d_description/launch/display.launch.xml
+++ b/q2d_description/launch/display.launch.xml
@@ -3,5 +3,5 @@
 	<node pkg="tf2_ros" exec="static_transform_publisher" name="q2d_origin_publisher" args="0 0 0 0 0 0 1 map origin_link" />
 	<node if="$(var use_gui)" name="joint_state_publisher" pkg="joint_state_publisher_gui" exec="joint_state_publisher_gui" />
 	<include file="$(find-pkg-share q2d_description)/launch/q2d.launch.xml"/>
-	<node name="rviz" pkg="rviz2" exec="rviz2" args="-d $(find-pkg-share q2d_description)/rviz/display.rviz" />
+	<node name="rviz" pkg="rviz2" exec="rviz2" args="-d $(find-pkg-share q2d_description)/config/display.rviz" />
 </launch>
diff --git a/q2d_teleop/rviz/display.rviz b/q2d_teleop/config/display.rviz
similarity index 100%
rename from q2d_teleop/rviz/display.rviz
rename to q2d_teleop/config/display.rviz
diff --git a/q2d_teleop/launch/display.launch.xml b/q2d_teleop/launch/display.launch.xml
index 2c73b72..04effa4 100644
--- a/q2d_teleop/launch/display.launch.xml
+++ b/q2d_teleop/launch/display.launch.xml
@@ -25,5 +25,5 @@
 <launch>
         <include file="$(find-pkg-share q2d_description)/launch/q2d.launch.xml" />
 	<node pkg="tf2_ros" exec="static_transform_publisher" name="q2d_origin_publisher" args="0 0 0 0 0 0 1 map origin_link" />
-        <node name="rviz" pkg="rviz2" exec="rviz2" args="-d $(find-pkg-share q2d_teleop)/rviz/display.rviz" />
+        <node name="rviz" pkg="rviz2" exec="rviz2" args="-d $(find-pkg-share q2d_teleop)/config/display.rviz" />
 </launch>