From 64a7ccc9f8167189e66a0abfc9246128a65903f6 Mon Sep 17 00:00:00 2001 From: HankWong-guangdong <82137658+HankWong-guangdong@users.noreply.github.com> Date: Sun, 11 Apr 2021 08:53:36 +0800 Subject: [PATCH 01/13] Create image_render_panel.h The render window for image display plugin --- src/rviz/image_render_panel.h | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/rviz/image_render_panel.h diff --git a/src/rviz/image_render_panel.h b/src/rviz/image_render_panel.h new file mode 100644 index 0000000000..48b7a90ba8 --- /dev/null +++ b/src/rviz/image_render_panel.h @@ -0,0 +1,11 @@ +#include "rviz/render_panel.h" +namespace rviz { +class ImageRenderPanel ：public RenderPanel { +public: +ImageRenderPanel（QWidget* parent = nullptr); +protected: +void mouseMoveEvent(QMouseEvent* event)override; +void mousePressEvent(QMouseEvent* event)override; +void mouseReleaseEvent(QMouseEvent* event)override; +} +} From 4914629c8b89886b9c33323e635fc8b6139619b7 Mon Sep 17 00:00:00 2001 From: HankWong-guangdong <82137658+HankWong-guangdong@users.noreply.github.com> Date: Sun, 11 Apr 2021 09:22:09 +0800 Subject: [PATCH 02/13] Create image_render_panel.cpp --- src/rviz/image_render_panel.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/rviz/image_render_panel.cpp diff --git a/src/rviz/image_render_panel.cpp b/src/rviz/image_render_panel.cpp new file mode 100644 index 0000000000..d5a25a9939 --- /dev/null +++ b/src/rviz/image_render_panel.cpp @@ -0,0 +1,16 @@ +#include "image_render_panel.h" +namespace rviz { +ImageRenderPanel::ImageRenderPanel(QWidget* parent):RenderPanel(parent) {} +ImageRenderPanel::mouseMoveEvent(QMouseEvent* event) +{ + QWidget::mouseMoveEvent(event); +} +ImageRenderPanel::mousePressEvent(QMouseEvent* event) +{ + QWidget::mousePressEvent(event); +} +ImageRenderPanel::mouseMoveEvent(QMouseEvent* event) +{ + QWidget::mouseMoveEvent(event); +} +} From cf0caa591dd9eb5d369848f79807d0489da0dbb3 Mon Sep 17 00:00:00 2001 From: HankWong-guangdong <82137658+HankWong-guangdong@users.noreply.github.com> Date: Sun, 11 Apr 2021 09:30:36 +0800 Subject: [PATCH 03/13] Update image_render_panel.cpp not only for the image display plugin --- src/rviz/image_render_panel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rviz/image_render_panel.cpp b/src/rviz/image_render_panel.cpp index d5a25a9939..288768d853 100644 --- a/src/rviz/image_render_panel.cpp +++ b/src/rviz/image_render_panel.cpp @@ -9,8 +9,8 @@ ImageRenderPanel::mousePressEvent(QMouseEvent* event) { QWidget::mousePressEvent(event); } -ImageRenderPanel::mouseMoveEvent(QMouseEvent* event) +ImageRenderPanel::mouseReleaseEvent(QMouseEvent* event) { - QWidget::mouseMoveEvent(event); + QWidget::mouseReleaseEvent(event); } } From 66e72d6ca1f761cf1337a408e0ee89b68d2ee34b Mon Sep 17 00:00:00 2001 From: HankWong-guangdong <82137658+HankWong-guangdong@users.noreply.github.com> Date: Sun, 11 Apr 2021 09:34:38 +0800 Subject: [PATCH 04/13] Update CMakeLists.txt --- src/rviz/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rviz/CMakeLists.txt b/src/rviz/CMakeLists.txt index bfde3bcabd..66302a0cec 100644 --- a/src/rviz/CMakeLists.txt +++ b/src/rviz/CMakeLists.txt @@ -122,6 +122,7 @@ add_library(${PROJECT_NAME} tool_properties_panel.cpp yaml_config_reader.cpp yaml_config_writer.cpp + image_render_panel.cpp ${ENV_CONFIG_FILE} ) From 4fa84b1d6797bb0176aa6e591ce9cdd0e6e201f4 Mon Sep 17 00:00:00 2001 From: HankWong-guangdong <82137658+HankWong-guangdong@users.noreply.github.com> Date: Sun, 11 Apr 2021 09:37:09 +0800 Subject: [PATCH 05/13] Update image_display.h --- src/rviz/default_plugin/image_display.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rviz/default_plugin/image_display.h b/src/rviz/default_plugin/image_display.h index 4e89e1ed62..81119ffd1b 100644 --- a/src/rviz/default_plugin/image_display.h +++ b/src/rviz/default_plugin/image_display.h @@ -39,7 +39,7 @@ #include "rviz/image/image_display_base.h" #include "rviz/image/ros_image_texture.h" -#include "rviz/render_panel.h" +#include "rviz/image_render_panel.h" #include "rviz/properties/bool_property.h" #include "rviz/properties/float_property.h" @@ -86,7 +86,7 @@ public Q_SLOTS: ROSImageTexture texture_; - RenderPanel* render_panel_; + ImageRenderPanel* render_panel_; private: void clear(); From 356b4437467d137322a552a1d10e6b93a4fcab36 Mon Sep 17 00:00:00 2001 From: HankWong-guangdong <82137658+HankWong-guangdong@users.noreply.github.com> Date: Sun, 11 Apr 2021 09:40:49 +0800 Subject: [PATCH 06/13] Update image_display.cpp --- src/rviz/default_plugin/image_display.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rviz/default_plugin/image_display.cpp b/src/rviz/default_plugin/image_display.cpp index 5baa42040e..d2d1706ba3 100644 --- a/src/rviz/default_plugin/image_display.cpp +++ b/src/rviz/default_plugin/image_display.cpp @@ -44,7 +44,7 @@ #include "rviz/display_context.h" #include "rviz/frame_manager.h" -#include "rviz/render_panel.h" +#include "rviz/image_render_panel.h" #include "rviz/validate_floats.h" #include @@ -115,7 +115,7 @@ void ImageDisplay::onInitialize() img_scene_node_->attachObject(screen_rect_); } - render_panel_ = new RenderPanel(); + render_panel_ = new ImageRenderPanel(); render_panel_->getRenderWindow()->setAutoUpdated(false); render_panel_->getRenderWindow()->setActive(false); From 837bc74d65d9d4f624a5f48bf84e3a029ad0631b Mon Sep 17 00:00:00 2001 From: HankWong-guangdong <82137658+HankWong-guangdong@users.noreply.github.com> Date: Mon, 12 Apr 2021 19:41:39 +0800 Subject: [PATCH 07/13] Update image_render_panel.h --- src/rviz/image_render_panel.h | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/rviz/image_render_panel.h b/src/rviz/image_render_panel.h index 48b7a90ba8..63fca6affd 100644 --- a/src/rviz/image_render_panel.h +++ b/src/rviz/image_render_panel.h @@ -1,11 +1,17 @@ +#ifndef RVIZ_IMAGE_RENDER_PANEL_H +#define RVIZ_IMAGE_RENDER_PANEL_H + #include "rviz/render_panel.h" namespace rviz { -class ImageRenderPanel ：public RenderPanel { -public: -ImageRenderPanel（QWidget* parent = nullptr); -protected: -void mouseMoveEvent(QMouseEvent* event)override; -void mousePressEvent(QMouseEvent* event)override; -void mouseReleaseEvent(QMouseEvent* event)override; -} + class ImageRenderPanel ：public RenderPanel { + public: + ImageRenderPanel(QWidget* parent = nullptr); + ~ImageRenderPanel() override; + protected: + void mouseMoveEvent(QMouseEvent* event) override; + void mousePressEvent(QMouseEvent* event) override; + void mouseReleaseEvent(QMouseEvent* event) override; +}; } + +#endif // RVIZ_IMAGE_RENDER_PANEL_H From f7be49b55cef8fbcc5adb4799bf0f3351f5e304a Mon Sep 17 00:00:00 2001 From: HankWong-guangdong <82137658+HankWong-guangdong@users.noreply.github.com> Date: Mon, 12 Apr 2021 20:26:27 +0800 Subject: [PATCH 08/13] Create image_render_panel.cpp --- src/rviz/image_render_panel.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/rviz/image_render_panel.cpp b/src/rviz/image_render_panel.cpp index 288768d853..f922b2c910 100644 --- a/src/rviz/image_render_panel.cpp +++ b/src/rviz/image_render_panel.cpp @@ -1,14 +1,21 @@ #include "image_render_panel.h" namespace rviz { ImageRenderPanel::ImageRenderPanel(QWidget* parent):RenderPanel(parent) {} + +ImageRenderPanel::~ImageRenderPanel() +{ +} + ImageRenderPanel::mouseMoveEvent(QMouseEvent* event) { QWidget::mouseMoveEvent(event); } + ImageRenderPanel::mousePressEvent(QMouseEvent* event) { QWidget::mousePressEvent(event); } + ImageRenderPanel::mouseReleaseEvent(QMouseEvent* event) { QWidget::mouseReleaseEvent(event); From 4c7991baf429e7e1e93ffe3bf195f63192a3d619 Mon Sep 17 00:00:00 2001 From: HankWong-guangdong <82137658+HankWong-guangdong@users.noreply.github.com> Date: Mon, 12 Apr 2021 20:31:08 +0800 Subject: [PATCH 09/13] Update image_render_panel.cpp --- src/rviz/image_render_panel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rviz/image_render_panel.cpp b/src/rviz/image_render_panel.cpp index f922b2c910..3683c39747 100644 --- a/src/rviz/image_render_panel.cpp +++ b/src/rviz/image_render_panel.cpp @@ -6,17 +6,17 @@ ImageRenderPanel::~ImageRenderPanel() { } -ImageRenderPanel::mouseMoveEvent(QMouseEvent* event) +void ImageRenderPanel::mouseMoveEvent(QMouseEvent* event) { QWidget::mouseMoveEvent(event); } -ImageRenderPanel::mousePressEvent(QMouseEvent* event) +void ImageRenderPanel::mousePressEvent(QMouseEvent* event) { QWidget::mousePressEvent(event); } -ImageRenderPanel::mouseReleaseEvent(QMouseEvent* event) +void ImageRenderPanel::mouseReleaseEvent(QMouseEvent* event) { QWidget::mouseReleaseEvent(event); } From b481095d6c2e54501e450b5ab9056903b25a5950 Mon Sep 17 00:00:00 2001 From: HankWong-guangdong <82137658+HankWong-guangdong@users.noreply.github.com> Date: Mon, 12 Apr 2021 20:38:20 +0800 Subject: [PATCH 10/13] Update image_render_panel.cpp --- src/rviz/image_render_panel.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/rviz/image_render_panel.cpp b/src/rviz/image_render_panel.cpp index 3683c39747..739de9c83a 100644 --- a/src/rviz/image_render_panel.cpp +++ b/src/rviz/image_render_panel.cpp @@ -1,6 +1,7 @@ #include "image_render_panel.h" + namespace rviz { -ImageRenderPanel::ImageRenderPanel(QWidget* parent):RenderPanel(parent) {} +ImageRenderPanel::ImageRenderPanel(QWidget* parent) : RenderPanel(parent) {} ImageRenderPanel::~ImageRenderPanel() { From 21825677e0f45611fdc0fd11bd1f30d0c73a4507 Mon Sep 17 00:00:00 2001 From: HankWong-guangdong <82137658+HankWong-guangdong@users.noreply.github.com> Date: Mon, 12 Apr 2021 21:11:19 +0800 Subject: [PATCH 11/13] Update image_render_panel.h --- src/rviz/image_render_panel.h | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/rviz/image_render_panel.h b/src/rviz/image_render_panel.h index 63fca6affd..24d12e8ba1 100644 --- a/src/rviz/image_render_panel.h +++ b/src/rviz/image_render_panel.h @@ -2,16 +2,19 @@ #define RVIZ_IMAGE_RENDER_PANEL_H #include "rviz/render_panel.h" -namespace rviz { - class ImageRenderPanel ：public RenderPanel { - public: - ImageRenderPanel(QWidget* parent = nullptr); - ~ImageRenderPanel() override; - protected: - void mouseMoveEvent(QMouseEvent* event) override; - void mousePressEvent(QMouseEvent* event) override; - void mouseReleaseEvent(QMouseEvent* event) override; +namespace rviz +{ +class ImageRenderPanel ：public RenderPanel +{ +public: + ImageRenderPanel(QWidget* parent = nullptr); + ~ImageRenderPanel() override; + +protected: + void mouseMoveEvent(QMouseEvent* event) override; + void mousePressEvent(QMouseEvent* event) override; + void mouseReleaseEvent(QMouseEvent* event) override; }; -} +} // namespace rviz #endif // RVIZ_IMAGE_RENDER_PANEL_H From 99024c3ba8520b012177110a5bbd38f4f8252f86 Mon Sep 17 00:00:00 2001 From: HankWong-guangdong <82137658+HankWong-guangdong@users.noreply.github.com> Date: Mon, 12 Apr 2021 21:19:18 +0800 Subject: [PATCH 12/13] Update image_render_panel.cpp --- src/rviz/image_render_panel.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/rviz/image_render_panel.cpp b/src/rviz/image_render_panel.cpp index 739de9c83a..ec402fc61b 100644 --- a/src/rviz/image_render_panel.cpp +++ b/src/rviz/image_render_panel.cpp @@ -1,7 +1,10 @@ #include "image_render_panel.h" -namespace rviz { -ImageRenderPanel::ImageRenderPanel(QWidget* parent) : RenderPanel(parent) {} +namespace rviz +{ +ImageRenderPanel::ImageRenderPanel(QWidget* parent) : RenderPanel(parent) +{ +} ImageRenderPanel::~ImageRenderPanel() { @@ -21,4 +24,4 @@ void ImageRenderPanel::mouseReleaseEvent(QMouseEvent* event) { QWidget::mouseReleaseEvent(event); } -} +} // namespace rviz From 779555137ae958e2b2e95513d20f361e9b759735 Mon Sep 17 00:00:00 2001 From: HankWong-guangdong <82137658+HankWong-guangdong@users.noreply.github.com> Date: Mon, 12 Apr 2021 21:25:18 +0800 Subject: [PATCH 13/13] Update image_render_panel.h --- src/rviz/image_render_panel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rviz/image_render_panel.h b/src/rviz/image_render_panel.h index 24d12e8ba1..fbd32b6ff0 100644 --- a/src/rviz/image_render_panel.h +++ b/src/rviz/image_render_panel.h @@ -4,7 +4,7 @@ #include "rviz/render_panel.h" namespace rviz { -class ImageRenderPanel ：public RenderPanel +class ImageRenderPanel : public RenderPanel { public: ImageRenderPanel(QWidget* parent = nullptr);