Skip to content

Commit 435c21b

Browse files
author
M. Fatih Cırıt
committed
rename package to autoware_overlay_rviz_plugin
Signed-off-by: M. Fatih Cırıt <mfc@leodrive.ai>
1 parent b3745a2 commit 435c21b

37 files changed

+60
-60
lines changed

common/autoware_overlay_rviz_plugin/autoware_vehicle_overlay_rviz_plugin/CMakeLists.txt common/autoware_overlay_rviz_plugin/autoware_overlay_rviz_plugin/CMakeLists.txt

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

44
# find dependencies
55
find_package(ament_cmake_auto REQUIRED)
@@ -136,5 +136,5 @@ install(
136136
add_definitions(-DQT_NO_KEYWORDS)
137137

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

common/autoware_overlay_rviz_plugin/autoware_vehicle_overlay_rviz_plugin/README.md common/autoware_overlay_rviz_plugin/autoware_overlay_rviz_plugin/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# awf_2d_overlay_vehicle
1+
# autoware_overlay_rviz_plugin
22

33
Plugin for displaying 2D overlays over the RViz2 3D scene.
44

common/autoware_overlay_rviz_plugin/autoware_vehicle_overlay_rviz_plugin/include/gear_display.hpp common/autoware_overlay_rviz_plugin/autoware_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 autoware_vehicle_overlay_rviz_plugin
32+
namespace autoware_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 autoware_vehicle_overlay_rviz_plugin
47+
} // namespace autoware_overlay_rviz_plugin
4848

4949
#endif // GEAR_DISPLAY_HPP_

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
#include <string>
7070
#endif
7171

72-
namespace autoware_vehicle_overlay_rviz_plugin
72+
namespace autoware_overlay_rviz_plugin
7373
{
7474
class OverlayTextDisplay
7575
: public rviz_common::RosTopicDisplay<autoware_overlay_msgs::msg::OverlayText>
@@ -80,7 +80,7 @@ class OverlayTextDisplay
8080
virtual ~OverlayTextDisplay();
8181

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

8585
int texture_width_;
8686
int texture_height_;
@@ -152,6 +152,6 @@ protected Q_SLOTS:
152152
private:
153153
void processMessage(autoware_overlay_msgs::msg::OverlayText::ConstSharedPtr msg) override;
154154
};
155-
} // namespace autoware_vehicle_overlay_rviz_plugin
155+
} // namespace autoware_overlay_rviz_plugin
156156

157157
#endif // OVERLAY_TEXT_DISPLAY_HPP_

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
#include <memory>
7171
#include <string>
7272

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

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

141141
#endif // OVERLAY_UTILS_HPP_

common/autoware_overlay_rviz_plugin/autoware_vehicle_overlay_rviz_plugin/include/signal_display.hpp common/autoware_overlay_rviz_plugin/autoware_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 autoware_vehicle_overlay_rviz_plugin
42+
namespace autoware_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-
autoware_vehicle_overlay_rviz_plugin::OverlayObject::SharedPtr overlay_;
73+
autoware_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_;
@@ -120,6 +120,6 @@ private Q_SLOTS:
120120
const autoware_perception_msgs::msg::TrafficSignalArray::ConstSharedPtr msg);
121121
void drawWidget(QImage & hud);
122122
};
123-
} // namespace autoware_vehicle_overlay_rviz_plugin
123+
} // namespace autoware_overlay_rviz_plugin
124124

125125
#endif // SIGNAL_DISPLAY_HPP_

common/autoware_overlay_rviz_plugin/autoware_vehicle_overlay_rviz_plugin/include/speed_display.hpp common/autoware_overlay_rviz_plugin/autoware_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 autoware_vehicle_overlay_rviz_plugin
32+
namespace autoware_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 autoware_vehicle_overlay_rviz_plugin
47+
} // namespace autoware_overlay_rviz_plugin
4848

4949
#endif // SPEED_DISPLAY_HPP_

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

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

33-
namespace autoware_vehicle_overlay_rviz_plugin
33+
namespace autoware_overlay_rviz_plugin
3434
{
3535

3636
class SpeedLimitDisplay
@@ -47,6 +47,6 @@ class SpeedLimitDisplay
4747
QColor gray = QColor(194, 194, 194);
4848
};
4949

50-
} // namespace autoware_vehicle_overlay_rviz_plugin
50+
} // namespace autoware_overlay_rviz_plugin
5151

5252
#endif // SPEED_LIMIT_DISPLAY_HPP_

common/autoware_overlay_rviz_plugin/autoware_vehicle_overlay_rviz_plugin/include/steering_wheel_display.hpp common/autoware_overlay_rviz_plugin/autoware_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 autoware_vehicle_overlay_rviz_plugin
32+
namespace autoware_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 autoware_vehicle_overlay_rviz_plugin
52+
} // namespace autoware_overlay_rviz_plugin
5353

5454
#endif // STEERING_WHEEL_DISPLAY_HPP_

common/autoware_overlay_rviz_plugin/autoware_vehicle_overlay_rviz_plugin/include/traffic_display.hpp common/autoware_overlay_rviz_plugin/autoware_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 autoware_vehicle_overlay_rviz_plugin
34+
namespace autoware_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 autoware_vehicle_overlay_rviz_plugin
60+
} // namespace autoware_overlay_rviz_plugin
6161

6262
#endif // TRAFFIC_DISPLAY_HPP_

common/autoware_overlay_rviz_plugin/autoware_vehicle_overlay_rviz_plugin/include/turn_signals_display.hpp common/autoware_overlay_rviz_plugin/autoware_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 autoware_vehicle_overlay_rviz_plugin
35+
namespace autoware_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 autoware_vehicle_overlay_rviz_plugin
61+
} // namespace autoware_overlay_rviz_plugin
6262

6363
#endif // TURN_SIGNALS_DISPLAY_HPP_

common/autoware_overlay_rviz_plugin/autoware_vehicle_overlay_rviz_plugin/package.xml common/autoware_overlay_rviz_plugin/autoware_overlay_rviz_plugin/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>autoware_vehicle_overlay_rviz_plugin</name>
4+
<name>autoware_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
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<library path="autoware_overlay_rviz_plugin">
2+
<class name="autoware_overlay_rviz_plugin/SignalDisplay" type="autoware_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/autoware_overlay_rviz_plugin/autoware_vehicle_overlay_rviz_plugin/src/gear_display.cpp common/autoware_overlay_rviz_plugin/autoware_overlay_rviz_plugin/src/gear_display.cpp

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

34-
namespace autoware_vehicle_overlay_rviz_plugin
34+
namespace autoware_overlay_rviz_plugin
3535
{
3636

3737
GearDisplay::GearDisplay() : current_gear_(0)
3838
{
3939
std::string package_path =
40-
ament_index_cpp::get_package_share_directory("autoware_vehicle_overlay_rviz_plugin");
40+
ament_index_cpp::get_package_share_directory("autoware_overlay_rviz_plugin");
4141
std::string font_path = package_path + "/assets/font/Quicksand/static/Quicksand-Regular.ttf";
4242
std::string font_path2 = package_path + "/assets/font/Quicksand/static/Quicksand-Bold.ttf";
4343
int fontId = QFontDatabase::addApplicationFont(
@@ -96,4 +96,4 @@ void GearDisplay::drawGearIndicator(QPainter & painter, const QRectF & backgroun
9696
painter.drawText(gearRect, Qt::AlignCenter, QString::fromStdString(gearString));
9797
}
9898

99-
} // namespace autoware_vehicle_overlay_rviz_plugin
99+
} // namespace autoware_overlay_rviz_plugin

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

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

70-
namespace autoware_vehicle_overlay_rviz_plugin
70+
namespace autoware_overlay_rviz_plugin
7171
{
7272
OverlayTextDisplay::OverlayTextDisplay()
7373
: texture_width_(0),
@@ -212,7 +212,7 @@ void OverlayTextDisplay::update(float /*wall_dt*/, float /*ros_dt*/)
212212

213213
overlay_->updateTextureSize(texture_width_, texture_height_);
214214
{
215-
autoware_vehicle_overlay_rviz_plugin::ScopedPixelBuffer buffer = overlay_->getBuffer();
215+
autoware_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);
@@ -297,7 +297,7 @@ void OverlayTextDisplay::processMessage(autoware_overlay_msgs::msg::OverlayText:
297297
static int count = 0;
298298
std::stringstream ss;
299299
ss << "OverlayTextDisplayObject" << count++;
300-
overlay_.reset(new autoware_vehicle_overlay_rviz_plugin::OverlayObject(ss.str()));
300+
overlay_.reset(new autoware_overlay_rviz_plugin::OverlayObject(ss.str()));
301301
overlay_->show();
302302
}
303303
if (overlay_) {
@@ -550,8 +550,8 @@ void OverlayTextDisplay::updateLineWidth()
550550
}
551551
}
552552

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

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

common/autoware_overlay_rviz_plugin/autoware_vehicle_overlay_rviz_plugin/src/overlay_utils.cpp common/autoware_overlay_rviz_plugin/autoware_overlay_rviz_plugin/src/overlay_utils.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252

5353
#include <rviz_common/logging.hpp>
5454

55-
namespace autoware_vehicle_overlay_rviz_plugin
55+
namespace autoware_overlay_rviz_plugin
5656
{
5757
ScopedPixelBuffer::ScopedPixelBuffer(Ogre::HardwarePixelBufferSharedPtr pixel_buffer)
5858
: pixel_buffer_(pixel_buffer)
@@ -264,4 +264,4 @@ unsigned int OverlayObject::getTextureHeight() const
264264
return 0;
265265
}
266266
}
267-
} // namespace autoware_vehicle_overlay_rviz_plugin
267+
} // namespace autoware_overlay_rviz_plugin

common/autoware_overlay_rviz_plugin/autoware_vehicle_overlay_rviz_plugin/src/signal_display.cpp common/autoware_overlay_rviz_plugin/autoware_overlay_rviz_plugin/src/signal_display.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include <mutex>
3434
#include <string>
3535

36-
namespace autoware_vehicle_overlay_rviz_plugin
36+
namespace autoware_overlay_rviz_plugin
3737
{
3838

3939
SignalDisplay::SignalDisplay()
@@ -47,7 +47,7 @@ SignalDisplay::SignalDisplay()
4747
property_top_ = new rviz_common::properties::IntProperty(
4848
"Top", 10, "Top position of the overlay", this, SLOT(updateOverlayPosition()));
4949
property_signal_color_ = new rviz_common::properties::ColorProperty(
50-
"Signal Color", QColor(25, 18, 89), "Color of the signal arrows", this,
50+
"Signal Color", QColor("25, 18, 89"), "Color of the signal arrows", this,
5151
SLOT(updateOverlayColor()));
5252

5353
// Initialize the component displays
@@ -68,7 +68,7 @@ void SignalDisplay::onInitialize()
6868
static int count = 0;
6969
std::stringstream ss;
7070
ss << "SignalDisplayObject" << count++;
71-
overlay_.reset(new autoware_vehicle_overlay_rviz_plugin::OverlayObject(ss.str()));
71+
overlay_.reset(new autoware_overlay_rviz_plugin::OverlayObject(ss.str()));
7272
overlay_->show();
7373
updateOverlaySize();
7474
updateOverlayPosition();
@@ -206,7 +206,7 @@ void SignalDisplay::update(float /* wall_dt */, float /* ros_dt */)
206206
if (!overlay_) {
207207
return;
208208
}
209-
autoware_vehicle_overlay_rviz_plugin::ScopedPixelBuffer buffer = overlay_->getBuffer();
209+
autoware_overlay_rviz_plugin::ScopedPixelBuffer buffer = overlay_->getBuffer();
210210
QImage hud = buffer.getQImage(*overlay_);
211211
hud.fill(Qt::transparent);
212212
drawWidget(hud);
@@ -516,7 +516,7 @@ void SignalDisplay::topic_updated_traffic()
516516
});
517517
}
518518

519-
} // namespace autoware_vehicle_overlay_rviz_plugin
519+
} // namespace autoware_overlay_rviz_plugin
520520

521521
#include <pluginlib/class_list_macros.hpp>
522-
PLUGINLIB_EXPORT_CLASS(autoware_vehicle_overlay_rviz_plugin::SignalDisplay, rviz_common::Display)
522+
PLUGINLIB_EXPORT_CLASS(autoware_overlay_rviz_plugin::SignalDisplay, rviz_common::Display)

common/autoware_overlay_rviz_plugin/autoware_vehicle_overlay_rviz_plugin/src/speed_display.cpp common/autoware_overlay_rviz_plugin/autoware_overlay_rviz_plugin/src/speed_display.cpp

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

34-
namespace autoware_vehicle_overlay_rviz_plugin
34+
namespace autoware_overlay_rviz_plugin
3535
{
3636

3737
SpeedDisplay::SpeedDisplay() : current_speed_(0.0)
3838
{
3939
std::string package_path =
40-
ament_index_cpp::get_package_share_directory("autoware_vehicle_overlay_rviz_plugin");
40+
ament_index_cpp::get_package_share_directory("autoware_overlay_rviz_plugin");
4141
std::string font_path = package_path + "/assets/font/Quicksand/static/Quicksand-Regular.ttf";
4242
std::string font_path2 = package_path + "/assets/font/Quicksand/static/Quicksand-Bold.ttf";
4343
int fontId = QFontDatabase::addApplicationFont(
@@ -107,4 +107,4 @@ void SpeedDisplay::drawSpeedDisplay(QPainter & painter, const QRectF & backgroun
107107
painter.drawText(unitPos, speedUnit);
108108
}
109109

110-
} // namespace autoware_vehicle_overlay_rviz_plugin
110+
} // namespace autoware_overlay_rviz_plugin

common/autoware_overlay_rviz_plugin/autoware_vehicle_overlay_rviz_plugin/src/speed_limit_display.cpp common/autoware_overlay_rviz_plugin/autoware_overlay_rviz_plugin/src/speed_limit_display.cpp

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

34-
namespace autoware_vehicle_overlay_rviz_plugin
34+
namespace autoware_overlay_rviz_plugin
3535
{
3636

3737
SpeedLimitDisplay::SpeedLimitDisplay() : current_limit(0.0), current_speed_(0.0)
3838
{
3939
std::string package_path =
40-
ament_index_cpp::get_package_share_directory("autoware_vehicle_overlay_rviz_plugin");
40+
ament_index_cpp::get_package_share_directory("autoware_overlay_rviz_plugin");
4141
std::string font_path = package_path + "/assets/font/Quicksand/static/Quicksand-Regular.ttf";
4242
std::string font_path2 = package_path + "/assets/font/Quicksand/static/Quicksand-Bold.ttf";
4343
int fontId = QFontDatabase::addApplicationFont(
@@ -147,4 +147,4 @@ void SpeedLimitDisplay::drawSpeedLimitIndicator(QPainter & painter, const QRectF
147147
painter.drawText(innerCircleRect, Qt::AlignCenter, text);
148148
}
149149

150-
} // namespace autoware_vehicle_overlay_rviz_plugin
150+
} // namespace autoware_overlay_rviz_plugin

common/autoware_overlay_rviz_plugin/autoware_vehicle_overlay_rviz_plugin/src/steering_wheel_display.cpp common/autoware_overlay_rviz_plugin/autoware_overlay_rviz_plugin/src/steering_wheel_display.cpp

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

34-
namespace autoware_vehicle_overlay_rviz_plugin
34+
namespace autoware_overlay_rviz_plugin
3535
{
3636

3737
SteeringWheelDisplay::SteeringWheelDisplay()
3838
{
3939
// Load the Quicksand font
4040
std::string package_path =
41-
ament_index_cpp::get_package_share_directory("autoware_vehicle_overlay_rviz_plugin");
41+
ament_index_cpp::get_package_share_directory("autoware_overlay_rviz_plugin");
4242
std::string font_path = package_path + "/assets/font/Quicksand/static/Quicksand-Regular.ttf";
4343
std::string font_path2 = package_path + "/assets/font/Quicksand/static/Quicksand-Bold.ttf";
4444
int fontId = QFontDatabase::addApplicationFont(
@@ -121,4 +121,4 @@ QImage SteeringWheelDisplay::coloredImage(const QImage & source, const QColor &
121121
return result;
122122
}
123123

124-
} // namespace autoware_vehicle_overlay_rviz_plugin
124+
} // namespace autoware_overlay_rviz_plugin

0 commit comments

Comments
 (0)