Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix logo in nav2 panel #4505

Merged
merged 2 commits into from
Jun 28, 2024
Merged

Fix logo in nav2 panel #4505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4495693
Fix logo in nav2 panel
ajtudela Jun 28, 2024
67c5c73
Move icon
ajtudela Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 doc/nav2_logo_small.png → ...plugins/icons/classes/nav2_logo_small.png
View file
Open in desktop
File renamed without changes
1 change: 0 additions & 1 deletion nav2_rviz_plugins/include/nav2_rviz_plugins/nav2_panel.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,6 @@ private Q_SLOTS:
QState * paused_wp_{nullptr};
QState * resumed_wp_{nullptr};

QImage * image_{nullptr};
QLabel * imgDisplayLabel_{nullptr};

// The following states are added to allow for the state of the button to only expose reset
Expand Down
5 changes: 3 additions & 2 deletions nav2_rviz_plugins/src/nav2_panel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include "nav2_rviz_plugins/goal_common.hpp"
#include "nav2_rviz_plugins/utils.hpp"
#include "rviz_common/display_context.hpp"
#include "rviz_common/load_resource.hpp"
#include "ament_index_cpp/get_package_share_directory.hpp"
#include "yaml-cpp/yaml.h"
#include "geometry_msgs/msg/pose2_d.hpp"
Expand Down Expand Up @@ -523,9 +524,9 @@ Nav2Panel::Nav2Panel(QWidget * parent)
QVBoxLayout * group_box_layout = new QVBoxLayout;

QGroupBox * groupBox = new QGroupBox(tr("Tools for WP-Following"));
image_ = new QImage("src/navigation2/doc/nav2_logo_small.png");
imgDisplayLabel_ = new QLabel("");
imgDisplayLabel_->setPixmap(QPixmap::fromImage(*image_));
imgDisplayLabel_->setPixmap(
rviz_common::loadPixmap("package://nav2_rviz_plugins/icons/classes/nav2_logo_small.png"));

status_layout->addWidget(navigation_status_indicator_);
status_layout->addWidget(localization_status_indicator_);
Expand Down
Loading