Skip to content

Commit

Permalink
feat(tier4_planning_rviz_plugin): move footprint plugin to path (#2971)
Browse files Browse the repository at this point in the history
* feat(tier4_rviz_plugin): simplify tier4_planning_rviz_plugin

Signed-off-by: yutaka <purewater0901@gmail.com>

* update

Signed-off-by: yutaka <purewater0901@gmail.com>

---------

Signed-off-by: yutaka <purewater0901@gmail.com>
  • Loading branch information
purewater0901 authored Mar 1, 2023
1 parent a2c62dc commit f76977a
Show file tree
Hide file tree
Showing 8 changed files with 409 additions and 614 deletions.
3 changes: 0 additions & 3 deletions common/tier4_planning_rviz_plugin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ ament_auto_add_library(tier4_planning_rviz_plugin SHARED
include/path/display.hpp
src/path/display.cpp
# footprint
include/path_footprint/display_base.hpp
include/path_footprint/display.hpp
src/path_footprint/display.cpp
include/pose_with_uuid_stamped/display.hpp
src/pose_with_uuid_stamped/display.cpp
include/mission_checkpoint/mission_checkpoint.hpp
Expand Down
19 changes: 19 additions & 0 deletions common/tier4_planning_rviz_plugin/include/path/display.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
#include <autoware_auto_planning_msgs/msg/path_with_lane_id.hpp>
#include <autoware_auto_planning_msgs/msg/trajectory.hpp>

#include <memory>
#include <utility>
#include <vector>

namespace
Expand Down Expand Up @@ -158,6 +160,23 @@ class AutowarePathWithLaneIdDisplay
: public AutowarePathWithDrivableAreaDisplay<autoware_auto_planning_msgs::msg::PathWithLaneId>
{
Q_OBJECT
public:
AutowarePathWithLaneIdDisplay();
~AutowarePathWithLaneIdDisplay();

private:
void preprocessMessageDetail(
const autoware_auto_planning_msgs::msg::PathWithLaneId::ConstSharedPtr msg_ptr) override;
void processMessageDetail(
const autoware_auto_planning_msgs::msg::PathWithLaneId::ConstSharedPtr msg_ptr,
const size_t p_idx) override;

rviz_common::properties::BoolProperty property_lane_id_view_;
rviz_common::properties::FloatProperty property_lane_id_scale_;

using LaneIdObject =
std::pair<std::unique_ptr<Ogre::SceneNode>, std::unique_ptr<rviz_rendering::MovableText>>;
std::vector<LaneIdObject> lane_id_obj_ptrs_;
};

class AutowarePathDisplay
Expand Down
436 changes: 319 additions & 117 deletions common/tier4_planning_rviz_plugin/include/path/display_base.hpp

Large diffs are not rendered by default.

This file was deleted.

Loading

0 comments on commit f76977a

Please sign in to comment.