Skip to content

Commit 4927ec3

Browse files
author
KhalilSelyan
committed
refactor: rename all files and classes to align with updated naming conventions
1 parent 7e77488 commit 4927ec3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+89
-82
lines changed

common/awf_vehicle_rviz_plugin/rviz_2d_overlay_msgs/CMakeLists.txt common/autoware_overlay_rviz_plugin/autoware_overlay_msgs/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.5)
2-
project(rviz_2d_overlay_msgs)
2+
project(autoware_overlay_msgs)
33

44
if (NOT CMAKE_CXX_STANDARD)
55
set(CMAKE_CXX_STANDARD 17)

common/awf_vehicle_rviz_plugin/rviz_2d_overlay_msgs/package.xml common/autoware_overlay_rviz_plugin/autoware_overlay_msgs/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
4-
<name>rviz_2d_overlay_msgs</name>
4+
<name>autoware_overlay_msgs</name>
55
<version>1.3.0</version>
66
<description>Messages describing 2D overlays for RVIZ, extracted/derived from the jsk_visualization package.</description>
77
<maintainer email="team-spatzenhirn@uni-ulm.de">Team Spatzenhirn</maintainer>

common/awf_vehicle_rviz_plugin/awf_2d_overlay_vehicle/CMakeLists.txt common/autoware_overlay_rviz_plugin/autoware_vehicle_overlay_rviz_plugin/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.8)
2-
project(awf_2d_overlay_vehicle)
2+
project(autoware_vehicle_overlay_rviz_plugin)
33

44
# find dependencies
55
find_package(ament_cmake_auto REQUIRED)
@@ -9,7 +9,7 @@ find_package(tier4_planning_msgs REQUIRED)
99
find_package(autoware_perception_msgs REQUIRED)
1010
ament_auto_find_build_dependencies()
1111

12-
find_package(rviz_2d_overlay_msgs REQUIRED)
12+
find_package(autoware_overlay_msgs REQUIRED)
1313

1414
find_package(rviz_common REQUIRED)
1515
find_package(rviz_rendering REQUIRED)
@@ -90,7 +90,7 @@ ament_target_dependencies(
9090
PUBLIC
9191
rviz_common
9292
rviz_rendering
93-
rviz_2d_overlay_msgs
93+
autoware_overlay_msgs
9494
autoware_auto_vehicle_msgs
9595
tier4_planning_msgs
9696
autoware_perception_msgs
@@ -136,5 +136,5 @@ install(
136136
add_definitions(-DQT_NO_KEYWORDS)
137137

138138
ament_package(
139-
CONFIG_EXTRAS "awf_2d_overlay_vehicle-extras.cmake"
139+
CONFIG_EXTRAS "autoware_vehicle_overlay_rviz_plugin-extras.cmake"
140140
)

common/awf_vehicle_rviz_plugin/awf_2d_overlay_vehicle/include/gear_display.hpp common/autoware_overlay_rviz_plugin/autoware_vehicle_overlay_rviz_plugin/include/gear_display.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <OgreMaterial.h>
3030
#include <OgreTexture.h>
3131

32-
namespace awf_2d_overlay_vehicle
32+
namespace autoware_vehicle_overlay_rviz_plugin
3333
{
3434

3535
class GearDisplay
@@ -44,6 +44,6 @@ class GearDisplay
4444
QColor gray = QColor(194, 194, 194);
4545
};
4646

47-
} // namespace awf_2d_overlay_vehicle
47+
} // namespace autoware_vehicle_overlay_rviz_plugin
4848

4949
#endif // GEAR_DISPLAY_HPP_

common/awf_vehicle_rviz_plugin/awf_2d_overlay_vehicle/include/overlay_text_display.hpp common/autoware_overlay_rviz_plugin/autoware_vehicle_overlay_rviz_plugin/include/overlay_text_display.hpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
#ifndef OVERLAY_TEXT_DISPLAY_HPP_
5151
#define OVERLAY_TEXT_DISPLAY_HPP_
5252

53-
#include "rviz_2d_overlay_msgs/msg/overlay_text.hpp"
53+
#include "autoware_overlay_msgs/msg/overlay_text.hpp"
5454
#ifndef Q_MOC_RUN
5555
#include "overlay_utils.hpp"
5656

@@ -69,18 +69,18 @@
6969
#include <string>
7070
#endif
7171

72-
namespace awf_2d_overlay_vehicle
72+
namespace autoware_vehicle_overlay_rviz_plugin
7373
{
7474
class OverlayTextDisplay
75-
: public rviz_common::RosTopicDisplay<rviz_2d_overlay_msgs::msg::OverlayText>
75+
: public rviz_common::RosTopicDisplay<autoware_overlay_msgs::msg::OverlayText>
7676
{
7777
Q_OBJECT
7878
public:
7979
OverlayTextDisplay();
8080
virtual ~OverlayTextDisplay();
8181

8282
protected:
83-
awf_2d_overlay_vehicle::OverlayObject::SharedPtr overlay_;
83+
autoware_vehicle_overlay_rviz_plugin::OverlayObject::SharedPtr overlay_;
8484

8585
int texture_width_;
8686
int texture_height_;
@@ -150,8 +150,8 @@ protected Q_SLOTS:
150150
void updateLineWidth();
151151

152152
private:
153-
void processMessage(rviz_2d_overlay_msgs::msg::OverlayText::ConstSharedPtr msg) override;
153+
void processMessage(autoware_overlay_msgs::msg::OverlayText::ConstSharedPtr msg) override;
154154
};
155-
} // namespace awf_2d_overlay_vehicle
155+
} // namespace autoware_vehicle_overlay_rviz_plugin
156156

157157
#endif // OVERLAY_TEXT_DISPLAY_HPP_

common/awf_vehicle_rviz_plugin/awf_2d_overlay_vehicle/include/overlay_utils.hpp common/autoware_overlay_rviz_plugin/autoware_vehicle_overlay_rviz_plugin/include/overlay_utils.hpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
#include <QColor>
5555
#include <QImage>
5656

57-
#include "rviz_2d_overlay_msgs/msg/overlay_text.hpp"
57+
#include "autoware_overlay_msgs/msg/overlay_text.hpp"
5858

5959
#include <OgreHardwarePixelBuffer.h>
6060
#include <OgreMaterialManager.h>
@@ -70,7 +70,7 @@
7070
#include <memory>
7171
#include <string>
7272

73-
namespace awf_2d_overlay_vehicle
73+
namespace autoware_vehicle_overlay_rviz_plugin
7474
{
7575
class OverlayObject;
7676

@@ -90,15 +90,15 @@ class ScopedPixelBuffer
9090
};
9191

9292
enum class VerticalAlignment : uint8_t {
93-
CENTER = rviz_2d_overlay_msgs::msg::OverlayText::CENTER,
94-
TOP = rviz_2d_overlay_msgs::msg::OverlayText::TOP,
95-
BOTTOM = rviz_2d_overlay_msgs::msg::OverlayText::BOTTOM,
93+
CENTER = autoware_overlay_msgs::msg::OverlayText::CENTER,
94+
TOP = autoware_overlay_msgs::msg::OverlayText::TOP,
95+
BOTTOM = autoware_overlay_msgs::msg::OverlayText::BOTTOM,
9696
};
9797

9898
enum class HorizontalAlignment : uint8_t {
99-
LEFT = rviz_2d_overlay_msgs::msg::OverlayText::LEFT,
100-
RIGHT = rviz_2d_overlay_msgs::msg::OverlayText::RIGHT,
101-
CENTER = rviz_2d_overlay_msgs::msg::OverlayText::CENTER
99+
LEFT = autoware_overlay_msgs::msg::OverlayText::LEFT,
100+
RIGHT = autoware_overlay_msgs::msg::OverlayText::RIGHT,
101+
CENTER = autoware_overlay_msgs::msg::OverlayText::CENTER
102102
};
103103

104104
/**
@@ -136,6 +136,6 @@ class OverlayObject
136136
Ogre::MaterialPtr panel_material_;
137137
Ogre::TexturePtr texture_;
138138
};
139-
} // namespace awf_2d_overlay_vehicle
139+
} // namespace autoware_vehicle_overlay_rviz_plugin
140140

141141
#endif // OVERLAY_UTILS_HPP_

common/awf_vehicle_rviz_plugin/awf_2d_overlay_vehicle/include/signal_display.hpp common/autoware_overlay_rviz_plugin/autoware_vehicle_overlay_rviz_plugin/include/signal_display.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#include <mutex>
4040
#endif
4141

42-
namespace awf_2d_overlay_vehicle
42+
namespace autoware_vehicle_overlay_rviz_plugin
4343
{
4444
class SignalDisplay : public rviz_common::Display
4545
{
@@ -70,7 +70,7 @@ private Q_SLOTS:
7070

7171
private:
7272
std::mutex mutex_;
73-
awf_2d_overlay_vehicle::OverlayObject::SharedPtr overlay_;
73+
autoware_vehicle_overlay_rviz_plugin::OverlayObject::SharedPtr overlay_;
7474
rviz_common::properties::IntProperty * property_width_;
7575
rviz_common::properties::IntProperty * property_height_;
7676
rviz_common::properties::IntProperty * property_left_;
@@ -119,6 +119,6 @@ private Q_SLOTS:
119119
const autoware_perception_msgs::msg::TrafficSignalArray::ConstSharedPtr msg);
120120
void drawWidget(QImage & hud);
121121
};
122-
} // namespace awf_2d_overlay_vehicle
122+
} // namespace autoware_vehicle_overlay_rviz_plugin
123123

124124
#endif // SIGNAL_DISPLAY_HPP_

common/awf_vehicle_rviz_plugin/awf_2d_overlay_vehicle/include/speed_display.hpp common/autoware_overlay_rviz_plugin/autoware_vehicle_overlay_rviz_plugin/include/speed_display.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <OgreMaterial.h>
3030
#include <OgreTexture.h>
3131

32-
namespace awf_2d_overlay_vehicle
32+
namespace autoware_vehicle_overlay_rviz_plugin
3333
{
3434

3535
class SpeedDisplay
@@ -44,6 +44,6 @@ class SpeedDisplay
4444
QColor gray = QColor(194, 194, 194);
4545
};
4646

47-
} // namespace awf_2d_overlay_vehicle
47+
} // namespace autoware_vehicle_overlay_rviz_plugin
4848

4949
#endif // SPEED_DISPLAY_HPP_

common/awf_vehicle_rviz_plugin/awf_2d_overlay_vehicle/include/speed_limit_display.hpp common/autoware_overlay_rviz_plugin/autoware_vehicle_overlay_rviz_plugin/include/speed_limit_display.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <OgreMaterial.h>
3030
#include <OgreTexture.h>
3131

32-
namespace awf_2d_overlay_vehicle
32+
namespace autoware_vehicle_overlay_rviz_plugin
3333
{
3434

3535
class SpeedLimitDisplay
@@ -44,6 +44,6 @@ class SpeedLimitDisplay
4444
QColor gray = QColor(194, 194, 194);
4545
};
4646

47-
} // namespace awf_2d_overlay_vehicle
47+
} // namespace autoware_vehicle_overlay_rviz_plugin
4848

4949
#endif // SPEED_LIMIT_DISPLAY_HPP_

common/awf_vehicle_rviz_plugin/awf_2d_overlay_vehicle/include/steering_wheel_display.hpp common/autoware_overlay_rviz_plugin/autoware_vehicle_overlay_rviz_plugin/include/steering_wheel_display.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <OgreMaterial.h>
3030
#include <OgreTexture.h>
3131

32-
namespace awf_2d_overlay_vehicle
32+
namespace autoware_vehicle_overlay_rviz_plugin
3333
{
3434

3535
class SteeringWheelDisplay
@@ -49,6 +49,6 @@ class SteeringWheelDisplay
4949
QImage coloredImage(const QImage & source, const QColor & color);
5050
};
5151

52-
} // namespace awf_2d_overlay_vehicle
52+
} // namespace autoware_vehicle_overlay_rviz_plugin
5353

5454
#endif // STEERING_WHEEL_DISPLAY_HPP_

common/awf_vehicle_rviz_plugin/awf_2d_overlay_vehicle/include/traffic_display.hpp common/autoware_overlay_rviz_plugin/autoware_vehicle_overlay_rviz_plugin/include/traffic_display.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <OgreMaterial.h>
3232
#include <OgreTexture.h>
3333

34-
namespace awf_2d_overlay_vehicle
34+
namespace autoware_vehicle_overlay_rviz_plugin
3535
{
3636

3737
class TrafficDisplay
@@ -57,6 +57,6 @@ class TrafficDisplay
5757
QImage coloredImage(const QImage & source, const QColor & color);
5858
};
5959

60-
} // namespace awf_2d_overlay_vehicle
60+
} // namespace autoware_vehicle_overlay_rviz_plugin
6161

6262
#endif // TRAFFIC_DISPLAY_HPP_

common/awf_vehicle_rviz_plugin/awf_2d_overlay_vehicle/include/turn_signals_display.hpp common/autoware_overlay_rviz_plugin/autoware_vehicle_overlay_rviz_plugin/include/turn_signals_display.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
#include <chrono>
3434

35-
namespace awf_2d_overlay_vehicle
35+
namespace autoware_vehicle_overlay_rviz_plugin
3636
{
3737

3838
class TurnSignalsDisplay
@@ -58,6 +58,6 @@ class TurnSignalsDisplay
5858
const std::chrono::milliseconds blink_interval_{500}; // Blink interval in milliseconds
5959
};
6060

61-
} // namespace awf_2d_overlay_vehicle
61+
} // namespace autoware_vehicle_overlay_rviz_plugin
6262

6363
#endif // TURN_SIGNALS_DISPLAY_HPP_

common/awf_vehicle_rviz_plugin/awf_2d_overlay_vehicle/package.xml common/autoware_overlay_rviz_plugin/autoware_vehicle_overlay_rviz_plugin/package.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
4-
<name>awf_2d_overlay_vehicle</name>
4+
<name>autoware_vehicle_overlay_rviz_plugin</name>
55
<version>0.0.1</version>
66
<description>
77
RViz2 plugin for 2D overlays in the 3D view. Mainly a port of the JSK overlay plugin
@@ -14,7 +14,7 @@
1414
<depend>autoware_auto_vehicle_msgs</depend>
1515
<depend>autoware_perception_msgs</depend>
1616
<depend>boost</depend>
17-
<depend>rviz_2d_overlay_msgs</depend>
17+
<depend>autoware_overlay_msgs</depend>
1818
<depend>rviz_common</depend>
1919
<depend>rviz_ogre_vendor</depend>
2020
<depend>rviz_rendering</depend>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<library path="autoware_vehicle_overlay_rviz_plugin">
2+
<class name="autoware_vehicle_overlay_rviz_plugin/SignalDisplay" type="autoware_vehicle_overlay_rviz_plugin::SignalDisplay" base_class_type="rviz_common::Display">
3+
<description>Signal overlay plugin for the 3D view.</description>
4+
</class>
5+
</library>

common/awf_vehicle_rviz_plugin/awf_2d_overlay_vehicle/src/gear_display.cpp common/autoware_overlay_rviz_plugin/autoware_vehicle_overlay_rviz_plugin/src/gear_display.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,13 @@
3131
#include <memory>
3232
#include <string>
3333

34-
namespace awf_2d_overlay_vehicle
34+
namespace autoware_vehicle_overlay_rviz_plugin
3535
{
3636

3737
GearDisplay::GearDisplay() : current_gear_(0)
3838
{
39-
std::string package_path = ament_index_cpp::get_package_share_directory("awf_2d_overlay_vehicle");
39+
std::string package_path =
40+
ament_index_cpp::get_package_share_directory("autoware_vehicle_overlay_rviz_plugin");
4041
std::string font_path = package_path + "/assets/font/Quicksand/static/Quicksand-Regular.ttf";
4142
std::string font_path2 = package_path + "/assets/font/Quicksand/static/Quicksand-Bold.ttf";
4243
int fontId = QFontDatabase::addApplicationFont(
@@ -95,4 +96,4 @@ void GearDisplay::drawGearIndicator(QPainter & painter, const QRectF & backgroun
9596
painter.drawText(gearRect, Qt::AlignCenter, QString::fromStdString(gearString));
9697
}
9798

98-
} // namespace awf_2d_overlay_vehicle
99+
} // namespace autoware_vehicle_overlay_rviz_plugin

common/awf_vehicle_rviz_plugin/awf_2d_overlay_vehicle/src/overlay_text_display.cpp common/autoware_overlay_rviz_plugin/autoware_vehicle_overlay_rviz_plugin/src/overlay_text_display.cpp

+15-14
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
#include <regex>
6868
#include <sstream>
6969

70-
namespace awf_2d_overlay_vehicle
70+
namespace autoware_vehicle_overlay_rviz_plugin
7171
{
7272
OverlayTextDisplay::OverlayTextDisplay()
7373
: texture_width_(0),
@@ -105,15 +105,15 @@ OverlayTextDisplay::OverlayTextDisplay()
105105
hor_alignment_property_ = new rviz_common::properties::EnumProperty(
106106
"hor_alignment", "left", "horizontal alignment of the overlay", this,
107107
SLOT(updateHorizontalAlignment()));
108-
hor_alignment_property_->addOption("left", rviz_2d_overlay_msgs::msg::OverlayText::LEFT);
109-
hor_alignment_property_->addOption("center", rviz_2d_overlay_msgs::msg::OverlayText::CENTER);
110-
hor_alignment_property_->addOption("right", rviz_2d_overlay_msgs::msg::OverlayText::RIGHT);
108+
hor_alignment_property_->addOption("left", autoware_overlay_msgs::msg::OverlayText::LEFT);
109+
hor_alignment_property_->addOption("center", autoware_overlay_msgs::msg::OverlayText::CENTER);
110+
hor_alignment_property_->addOption("right", autoware_overlay_msgs::msg::OverlayText::RIGHT);
111111
ver_alignment_property_ = new rviz_common::properties::EnumProperty(
112112
"ver_alignment", "top", "vertical alignment of the overlay", this,
113113
SLOT(updateVerticalAlignment()));
114-
ver_alignment_property_->addOption("top", rviz_2d_overlay_msgs::msg::OverlayText::TOP);
115-
ver_alignment_property_->addOption("center", rviz_2d_overlay_msgs::msg::OverlayText::CENTER);
116-
ver_alignment_property_->addOption("bottom", rviz_2d_overlay_msgs::msg::OverlayText::BOTTOM);
114+
ver_alignment_property_->addOption("top", autoware_overlay_msgs::msg::OverlayText::TOP);
115+
ver_alignment_property_->addOption("center", autoware_overlay_msgs::msg::OverlayText::CENTER);
116+
ver_alignment_property_->addOption("bottom", autoware_overlay_msgs::msg::OverlayText::BOTTOM);
117117
width_property_ = new rviz_common::properties::IntProperty(
118118
"width", 128, "width position", this, SLOT(updateWidth()));
119119
width_property_->setMin(0);
@@ -212,7 +212,7 @@ void OverlayTextDisplay::update(float /*wall_dt*/, float /*ros_dt*/)
212212

213213
overlay_->updateTextureSize(texture_width_, texture_height_);
214214
{
215-
awf_2d_overlay_vehicle::ScopedPixelBuffer buffer = overlay_->getBuffer();
215+
autoware_vehicle_overlay_rviz_plugin::ScopedPixelBuffer buffer = overlay_->getBuffer();
216216
QImage Hud = buffer.getQImage(*overlay_, bg_color_);
217217
QPainter painter(&Hud);
218218
painter.setRenderHint(QPainter::Antialiasing, true);
@@ -288,7 +288,7 @@ void OverlayTextDisplay::reset()
288288
}
289289
}
290290

291-
void OverlayTextDisplay::processMessage(rviz_2d_overlay_msgs::msg::OverlayText::ConstSharedPtr msg)
291+
void OverlayTextDisplay::processMessage(autoware_overlay_msgs::msg::OverlayText::ConstSharedPtr msg)
292292
{
293293
if (!isEnabled()) {
294294
return;
@@ -297,13 +297,13 @@ void OverlayTextDisplay::processMessage(rviz_2d_overlay_msgs::msg::OverlayText::
297297
static int count = 0;
298298
std::stringstream ss;
299299
ss << "OverlayTextDisplayObject" << count++;
300-
overlay_.reset(new awf_2d_overlay_vehicle::OverlayObject(ss.str()));
300+
overlay_.reset(new autoware_vehicle_overlay_rviz_plugin::OverlayObject(ss.str()));
301301
overlay_->show();
302302
}
303303
if (overlay_) {
304-
if (msg->action == rviz_2d_overlay_msgs::msg::OverlayText::DELETE) {
304+
if (msg->action == autoware_overlay_msgs::msg::OverlayText::DELETE) {
305305
overlay_->hide();
306-
} else if (msg->action == rviz_2d_overlay_msgs::msg::OverlayText::ADD) {
306+
} else if (msg->action == autoware_overlay_msgs::msg::OverlayText::ADD) {
307307
overlay_->show();
308308
}
309309
}
@@ -550,7 +550,8 @@ void OverlayTextDisplay::updateLineWidth()
550550
}
551551
}
552552

553-
} // namespace awf_2d_overlay_vehicle
553+
} // namespace autoware_vehicle_overlay_rviz_plugin
554554

555555
#include <pluginlib/class_list_macros.hpp>
556-
PLUGINLIB_EXPORT_CLASS(awf_2d_overlay_vehicle::OverlayTextDisplay, rviz_common::Display)
556+
PLUGINLIB_EXPORT_CLASS(
557+
autoware_vehicle_overlay_rviz_plugin::OverlayTextDisplay, rviz_common::Display)

0 commit comments

Comments
 (0)