Skip to content

Commit 61f8638

Browse files
naiveHobonaiveHobo
committed
General refactoring
1 parent 54b1043 commit 61f8638

File tree

6 files changed

+38
-38
lines changed

6 files changed

+38
-38
lines changed

‎nav2_bringup/bringup/rviz/nav2_default_view.rviz‎

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Panels:
88
- /TF1/Frames1
99
- /TF1/Tree1
1010
Splitter Ratio: 0.5833333134651184
11-
Tree Height: 592
11+
Tree Height: 606
1212
- Class: rviz_common/Selection
1313
Name: Selection
1414
- Class: rviz_common/Tool Properties
@@ -94,6 +94,8 @@ Visualization Manager:
9494
Value: true
9595
imu_link:
9696
Value: true
97+
map:
98+
Value: true
9799
odom:
98100
Value: true
99101
wheel_left_link:
@@ -106,7 +108,29 @@ Visualization Manager:
106108
Show Axes: true
107109
Show Names: false
108110
Tree:
109-
{}
111+
map:
112+
odom:
113+
base_footprint:
114+
base_link:
115+
base_scan:
116+
{}
117+
camera_link:
118+
camera_depth_frame:
119+
camera_depth_optical_frame:
120+
{}
121+
camera_rgb_frame:
122+
camera_rgb_optical_frame:
123+
{}
124+
caster_back_left_link:
125+
{}
126+
caster_back_right_link:
127+
{}
128+
imu_link:
129+
{}
130+
wheel_left_link:
131+
{}
132+
wheel_right_link:
133+
{}
110134
Update Interval: 0
111135
Value: true
112136
- Alpha: 1
@@ -187,12 +211,6 @@ Visualization Manager:
187211
History Policy: Keep Last
188212
Reliability Policy: Reliable
189213
Value: /map
190-
Update Topic:
191-
Depth: 5
192-
Durability Policy: Volatile
193-
History Policy: Keep Last
194-
Reliability Policy: Reliable
195-
Value: /map_updates
196214
Use Timestamp: false
197215
Value: true
198216
- Alpha: 1
@@ -212,7 +230,7 @@ Visualization Manager:
212230
Value: true
213231
- Class: rviz_common/Group
214232
Displays:
215-
- Alpha: 0.30000001192092896
233+
- Alpha: 0.3
216234
Class: rviz_default_plugins/Map
217235
Color Scheme: costmap
218236
Draw Behind: false
@@ -224,12 +242,6 @@ Visualization Manager:
224242
History Policy: Keep Last
225243
Reliability Policy: Reliable
226244
Value: /global_costmap/costmap
227-
Update Topic:
228-
Depth: 5
229-
Durability Policy: Volatile
230-
History Policy: Keep Last
231-
Reliability Policy: Reliable
232-
Value: /global_costmap/costmap_updates
233245
Use Timestamp: false
234246
Value: true
235247
- Alpha: 1
@@ -320,12 +332,6 @@ Visualization Manager:
320332
History Policy: Keep Last
321333
Reliability Policy: Reliable
322334
Value: /local_costmap/costmap
323-
Update Topic:
324-
Depth: 5
325-
Durability Policy: Volatile
326-
History Policy: Keep Last
327-
Reliability Policy: Reliable
328-
Value: /local_costmap/costmap_updates
329335
Use Timestamp: false
330336
Value: true
331337
- Alpha: 1
@@ -535,7 +541,7 @@ Window Geometry:
535541
Hide Right Dock: true
536542
Navigation 2:
537543
collapsed: false
538-
QMainWindow State: 000000ff00000000fd00000004000000000000016a0000034afc020000000afb0000001200530065006c0065006300740069006f006e00000001e10000009b0000005c00fffffffb0000001e0054006f006f006c002000500072006f007000650072007400690065007302000001ed000001df00000185000000a3fb000000120056006900650077007300200054006f006f02000001df000002110000018500000122fb000000200054006f006f006c002000500072006f0070006500720074006900650073003203000002880000011d000002210000017afb000000100044006900730070006c006100790073010000003d0000028d000000c900fffffffb0000002000730065006c0065006300740069006f006e00200062007500660066006500720200000138000000aa0000023a00000294fb00000014005700690064006500530074006500720065006f02000000e6000000d2000003ee0000030bfb0000000c004b0069006e0065006300740200000186000001060000030c00000261fb00000018004e0061007600690067006100740069006f006e0020003201000002d0000000b7000000b700fffffffb0000001e005200650061006c00730065006e0073006500430061006d00650072006100000002c6000000c10000002800ffffff000000010000010f0000034afc0200000003fb0000001e0054006f006f006c002000500072006f00700065007200740069006500730100000041000000780000000000000000fb0000000a00560069006500770073000000003d0000034a000000a400fffffffb0000001200530065006c0065006300740069006f006e010000025a000000b200000000000000000000000200000490000000a9fc0100000001fb0000000a00560069006500770073030000004e00000080000002e10000019700000003000004420000003efc0100000002fb0000000800540069006d00650100000000000004420000000000000000fb0000000800540069006d00650100000000000004500000000000000000000004990000034a00000004000000040000000800000008fc0000000100000002000000010000000a0054006f006f006c00730100000000ffffffff0000000000000000
544+
QMainWindow State: 000000ff00000000fd00000004000000000000016a0000034afc020000000afb0000001200530065006c0065006300740069006f006e00000001e10000009b0000005c00fffffffb0000001e0054006f006f006c002000500072006f007000650072007400690065007302000001ed000001df00000185000000a3fb000000120056006900650077007300200054006f006f02000001df000002110000018500000122fb000000200054006f006f006c002000500072006f0070006500720074006900650073003203000002880000011d000002210000017afb000000100044006900730070006c006100790073010000003d0000029b000000c900fffffffb0000002000730065006c0065006300740069006f006e00200062007500660066006500720200000138000000aa0000023a00000294fb00000014005700690064006500530074006500720065006f02000000e6000000d2000003ee0000030bfb0000000c004b0069006e0065006300740200000186000001060000030c00000261fb00000018004e0061007600690067006100740069006f006e0020003201000002de000000a90000008100fffffffb0000001e005200650061006c00730065006e0073006500430061006d00650072006100000002c6000000c10000002800ffffff000000010000010f0000034afc0200000003fb0000001e0054006f006f006c002000500072006f00700065007200740069006500730100000041000000780000000000000000fb0000000a00560069006500770073000000003d0000034a000000a400fffffffb0000001200530065006c0065006300740069006f006e010000025a000000b200000000000000000000000200000490000000a9fc0100000001fb0000000a00560069006500770073030000004e00000080000002e10000019700000003000004420000003efc0100000002fb0000000800540069006d00650100000000000004420000000000000000fb0000000800540069006d00650100000000000004500000000000000000000004990000034a00000004000000040000000800000008fc0000000100000002000000010000000a0054006f006f006c00730100000000ffffffff0000000000000000
539545
RealsenseCamera:
540546
collapsed: false
541547
Selection:
@@ -545,5 +551,5 @@ Window Geometry:
545551
Views:
546552
collapsed: true
547553
Width: 1545
548-
X: 375
549-
Y: 118
554+
X: 696
555+
Y: 229

‎nav2_rviz_plugins/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ set(nav2_rviz_plugins_headers_to_moc
3737
include/nav2_rviz_plugins/goal_common
3838
include/nav2_rviz_plugins/goal_tool.hpp
3939
include/nav2_rviz_plugins/nav2_panel.hpp
40-
include/nav2_rviz_plugins/flat_weighted_arrows_array.hpp
41-
include/nav2_rviz_plugins/particle_cloud_display.hpp
40+
include/nav2_rviz_plugins/particle_cloud_display/flat_weighted_arrows_array.hpp
41+
include/nav2_rviz_plugins/particle_cloud_display/particle_cloud_display.hpp
4242
)
4343

4444
include_directories(
@@ -50,8 +50,8 @@ set(library_name ${PROJECT_NAME})
5050
add_library(${library_name} SHARED
5151
src/goal_tool.cpp
5252
src/nav2_panel.cpp
53-
src/flat_weighted_arrows_array.cpp
54-
src/particle_cloud_display.cpp
53+
src/particle_cloud_display/flat_weighted_arrows_array.cpp
54+
src/particle_cloud_display/particle_cloud_display.cpp
5555
${nav2_rviz_plugins_headers_to_moc}
5656
)
5757

‎nav2_rviz_plugins/include/nav2_rviz_plugins/flat_weighted_arrows_array.hpp‎ renamed to ‎nav2_rviz_plugins/include/nav2_rviz_plugins/particle_cloud_display/flat_weighted_arrows_array.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/*
22
* Copyright (c) 2012, Willow Garage, Inc.
33
* Copyright (c) 2018, Bosch Software Innovations GmbH.
4-
* Copyright (c) 2020, Sarthak Mittal
54
* All rights reserved.
65
*
76
* Redistribution and use in source and binary forms, with or without
@@ -55,7 +54,7 @@
5554
#include <OgreVector3.h>
5655
#include <OgreQuaternion.h>
5756

58-
#include "nav2_rviz_plugins/particle_cloud_display.hpp"
57+
#include "nav2_rviz_plugins/particle_cloud_display/particle_cloud_display.hpp"
5958

6059
namespace nav2_rviz_plugins
6160
{

‎nav2_rviz_plugins/include/nav2_rviz_plugins/particle_cloud_display.hpp‎ renamed to ‎nav2_rviz_plugins/include/nav2_rviz_plugins/particle_cloud_display/particle_cloud_display.hpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/*
22
* Copyright (c) 2012, Willow Garage, Inc.
33
* Copyright (c) 2018, Bosch Software Innovations GmbH.
4-
* Copyright (c) 2020, Sarthak Mittal
54
* All rights reserved.
65
*
76
* Redistribution and use in source and binary forms, with or without
@@ -55,9 +54,6 @@
5554
#include "rviz_rendering/objects/shape.hpp"
5655
#include "rviz_common/message_filter_display.hpp"
5756

58-
// TODO(botteroa): Originally the display extended the MessageFilterDisplay. Revisit when available.
59-
// #include "rviz_common/message_filter_display.hpp"
60-
6157
namespace Ogre
6258
{
6359
class ManualObject;

‎nav2_rviz_plugins/src/flat_weighted_arrows_array.cpp‎ renamed to ‎nav2_rviz_plugins/src/particle_cloud_display/flat_weighted_arrows_array.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
// See the License for the specific language governing permissions and
4444
// limitations under the License.
4545

46-
#include "nav2_rviz_plugins/flat_weighted_arrows_array.hpp"
46+
#include "nav2_rviz_plugins/particle_cloud_display/flat_weighted_arrows_array.hpp"
4747

4848
#include <vector>
4949
#include <string>

‎nav2_rviz_plugins/src/particle_cloud_display.cpp‎ renamed to ‎nav2_rviz_plugins/src/particle_cloud_display/particle_cloud_display.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/*
22
* Copyright (c) 2012, Willow Garage, Inc.
33
* Copyright (c) 2018, Bosch Software Innovations GmbH.
4-
* Copyright (c) 2020, Sarthak Mittal
54
* All rights reserved.
65
*
76
* Redistribution and use in source and binary forms, with or without
@@ -44,7 +43,7 @@
4443
// See the License for the specific language governing permissions and
4544
// limitations under the License.
4645

47-
#include "nav2_rviz_plugins/particle_cloud_display.hpp"
46+
#include "nav2_rviz_plugins/particle_cloud_display/particle_cloud_display.hpp"
4847

4948
#include <memory>
5049
#include <string>
@@ -63,7 +62,7 @@
6362
#include "rviz_rendering/objects/arrow.hpp"
6463
#include "rviz_rendering/objects/axes.hpp"
6564

66-
#include "nav2_rviz_plugins/flat_weighted_arrows_array.hpp"
65+
#include "nav2_rviz_plugins/particle_cloud_display/flat_weighted_arrows_array.hpp"
6766

6867
namespace nav2_rviz_plugins
6968
{

0 commit comments

Comments
 (0)