Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: autowarefoundation/autoware_universe
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: autowarefoundation/autoware_universe
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: perception-objects-pointcloud-better-visualization
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.

Commits on Feb 22, 2023

  1. feat(add_perception_objects_pointcloud_publisher) add source files an…

    …d scripts
    
    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Feb 22, 2023
    Copy the full SHA
    955a898 View commit details

Commits on Feb 27, 2023

  1. feat(add_perception_objects_pointcloud_publisher) add to autoware_aut…

    …o_perception_plugin subscription to pointclouds and publishing pointclouds
    
    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Feb 27, 2023
    Copy the full SHA
    8ed1500 View commit details

Commits on Feb 28, 2023

  1. Copy the full SHA
    e6073f1 View commit details
  2. feat(add_perception_objects_pointcloud_publisher) wip add tf, modify …

    …message templated plugins, builds, but not woking correctly . Add rviz lauch file for debugging. modify package.xml
    
    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Feb 28, 2023
    Copy the full SHA
    532d81d View commit details

Commits on Mar 1, 2023

  1. feat(add_perception_objects_pointcloud_publisher) wip

    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Mar 1, 2023
    Copy the full SHA
    39e15a3 View commit details

Commits on Mar 7, 2023

  1. Copy the full SHA
    6d3421c View commit details
  2. Merge remote-tracking branch 'my-fork/feat/add_perception_objects_poi…

    …ntcloud_publisher' into feat/add_perception_objects_pointcloud_publisher
    lexavtanke committed Mar 7, 2023
    Copy the full SHA
    0d52327 View commit details

Commits on Mar 8, 2023

  1. feat(add_perception_objects_pointcloud_publisher) update autoware_aut…

    …o_rviz plugin to publish pointclouds
    
    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Mar 8, 2023
    Copy the full SHA
    d52e249 View commit details
  2. feat(add_perception_objects_pointcloud_publisher) update qos policy, …

    …use objectsCallback to update objects
    
    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Mar 8, 2023
    Copy the full SHA
    7d88491 View commit details
  3. Copy the full SHA
    7ea700d View commit details

Commits on Mar 13, 2023

  1. feat(add_perception_objects_pointcloud_publisher) integrate sync call…

    …back to plugin
    
    hardcoded topic names, one color for all classes of objects
    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Mar 13, 2023
    Copy the full SHA
    2b2cd6a View commit details
  2. Merge remote-tracking branch 'my-fork/feat/add_perception_objects_poi…

    …ntcloud_publisher' into feat/add_perception_objects_pointcloud_publisher
    lexavtanke committed Mar 13, 2023
    Copy the full SHA
    110a01d View commit details

Commits on Mar 14, 2023

  1. feat(add_perception_objects_pointcloud_publisher) add colors to diffe…

    …rent object classes
    
    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Mar 14, 2023
    Copy the full SHA
    d87a654 View commit details

Commits on Mar 15, 2023

  1. feat(add_perception_objects_pointcloud_publisher) add property enable…

    …/disable publish poincloud
    
    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Mar 15, 2023
    Copy the full SHA
    7efbec4 View commit details
  2. feat(add_perception_objects_pointcloud_publisher) disable editing of …

    …input pointcloud
    
    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Mar 15, 2023
    Copy the full SHA
    c3cfa57 View commit details

Commits on Mar 16, 2023

  1. feat(add_perception_objects_pointcloud_publisher) code style formatting

    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Mar 16, 2023
    Copy the full SHA
    e31460b View commit details
  2. feat(add_perception_objects_pointcloud_publisher) update variable names

    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Mar 16, 2023
    Copy the full SHA
    2a30ed3 View commit details
  3. feat(add_perception_objects_pointcloud_publisher) reformat

    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Mar 16, 2023
    Copy the full SHA
    1a2c1b7 View commit details
  4. feat(add_perception_objects_pointcloud_publisher) remove test launch …

    …and config
    
    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Mar 16, 2023
    Copy the full SHA
    5f014b2 View commit details
  5. feat(add_perception_objects_pointcloud_publisher) update readme

    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Mar 16, 2023
    Copy the full SHA
    bcc38d0 View commit details
  6. Copy the full SHA
    52ed35e View commit details
  7. Copy the full SHA
    644255c View commit details

Commits on Mar 17, 2023

  1. feat(add_perception_objects_pointcloud_publisher) fix pre-commit.ci -…

    … pr error
    
    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Mar 17, 2023
    Copy the full SHA
    888baaf View commit details
  2. Merge remote-tracking branch 'my-fork/feat/add_perception_objects_poi…

    …ntcloud_publisher' into feat/add_perception_objects_pointcloud_publisher
    lexavtanke committed Mar 17, 2023
    Copy the full SHA
    e765c7b View commit details
  3. feat(add_perception_objects_pointcloud_publisher) fix typos

    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Mar 17, 2023
    Copy the full SHA
    c55e0e3 View commit details
  4. feat(add_perception_objects_pointcloud_publisher) dependence fix

    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Mar 17, 2023
    Copy the full SHA
    313d9bd View commit details
  5. Copy the full SHA
    38e1104 View commit details
  6. feat(add_perception_objects_pointcloud_publisher) dependency fix

    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Mar 17, 2023
    Copy the full SHA
    f5a4e2e View commit details
  7. Merge remote-tracking branch 'my-fork/feat/add_perception_objects_poi…

    …ntcloud_publisher' into feat/add_perception_objects_pointcloud_publisher
    lexavtanke committed Mar 17, 2023
    Copy the full SHA
    19968c7 View commit details
  8. feat(add_perception_objects_pointcloud_publisher) typo fix

    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Mar 17, 2023
    Copy the full SHA
    50477eb View commit details
  9. Copy the full SHA
    c62b202 View commit details
  10. feat(add_perception_objects_pointcloud_publisher) pcl depend fix

    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Mar 17, 2023
    Copy the full SHA
    9bd2019 View commit details
  11. Merge remote-tracking branch 'my-fork/feat/add_perception_objects_poi…

    …ntcloud_publisher' into feat/add_perception_objects_pointcloud_publisher
    lexavtanke committed Mar 17, 2023
    Copy the full SHA
    3648c96 View commit details
  12. Copy the full SHA
    6303e1b View commit details

Commits on Mar 20, 2023

  1. feat(add_perception_objects_pointcloud_publisher) wip add point_cloud…

    …_common
    
    added point_cloud_common member like in pointcloud_plugin to render pointclouds, add test launch file 
    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Mar 20, 2023
    Copy the full SHA
    7081786 View commit details

Commits on Mar 21, 2023

  1. feat(add_perception_objects_pointcloud_publisher) update add_pointcloud

    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Mar 21, 2023
    Copy the full SHA
    2a5cee7 View commit details
  2. Copy the full SHA
    1a61d7a View commit details
  3. Merge remote-tracking branch 'my-fork/feat/add_perception_objects_poi…

    …ntcloud_publisher' into feat/add_perception_objects_pointcloud_publisher
    lexavtanke committed Mar 21, 2023
    Copy the full SHA
    0eb0039 View commit details
  4. feat(add_perception_objects_pointcloud_publisher) add proper centerp…

    …oint_tiny config
    
    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Mar 21, 2023
    Copy the full SHA
    e304540 View commit details
  5. Copy the full SHA
    17e5849 View commit details

Commits on Mar 22, 2023

  1. feat(add_perception_objects_pointcloud_publisher) update readme

    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Mar 22, 2023
    Copy the full SHA
    c534358 View commit details
  2. feat(add_perception_objects_pointcloud_publisher) code cleaning

    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Mar 22, 2023
    Copy the full SHA
    e87256e View commit details
  3. Merge remote-tracking branch 'my-fork/feat/add_perception_objects_poi…

    …ntcloud_publisher' into feat/add_perception_objects_pointcloud_publisher
    lexavtanke committed Mar 22, 2023
    Copy the full SHA
    d7503f2 View commit details
  4. Copy the full SHA
    94fa7c9 View commit details
  5. feat(add_perception_objects_pointcloud_publisher) fix ci/cd

    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Mar 22, 2023
    Copy the full SHA
    16fdef4 View commit details

Commits on Mar 23, 2023

  1. feat(add_perception_objects_pointcloud_publisher) return state of cen…

    …terpoint confing file
    
    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Mar 23, 2023
    Copy the full SHA
    31af5cd View commit details
  2. Copy the full SHA
    d47a30f View commit details

Commits on Mar 30, 2023

  1. Copy the full SHA
    61967dd View commit details

Commits on Mar 31, 2023

  1. feat(add_perception_objects_pointcloud_publisher) revert child classes

    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Mar 31, 2023
    Copy the full SHA
    4082d58 View commit details
  2. feat(add_perception_objects_pointcloud_publisher) subscription on and…

    … off, but update of the pointcloud topic doesn't work
    
    Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
    lexavtanke committed Mar 31, 2023
    Copy the full SHA
    4b8f479 View commit details
7 changes: 7 additions & 0 deletions common/autoware_perception_rviz_plugin/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -6,6 +6,8 @@ autoware_package()

find_package(Qt5 REQUIRED COMPONENTS Widgets)

find_package(PCL REQUIRED)

set(OD_PLUGIN_LIB_SRC
src/object_detection/detected_objects_display.cpp
src/object_detection/tracked_objects_display.cpp
@@ -46,9 +48,14 @@ ament_auto_add_library(${PROJECT_NAME} SHARED
target_link_libraries(${PROJECT_NAME}
rviz_common::rviz_common
Qt5::Widgets
${PCL_LIBRARIES}
)
target_include_directories(${PROJECT_NAME} PRIVATE include)

target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC
"${PCL_INCLUDE_DIRS}"
)

# Settings to improve the build as suggested on https://github.com/ros2/rviz/blob/ros2/docs/plugin_development.md
target_compile_definitions(${PROJECT_NAME} PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS")
target_compile_definitions(${PROJECT_NAME} PRIVATE "OBJECT_DETECTION_PLUGINS_BUILDING_LIBRARY")
28 changes: 19 additions & 9 deletions common/autoware_perception_rviz_plugin/README.md
Original file line number Diff line number Diff line change
@@ -19,9 +19,10 @@ Example:

#### Input Types

| Name | Type | Description |
| ---- | ------------------------------------------------ | ---------------------- |
| | `autoware_perception_msgs::msg::DetectedObjects` | detection result array |
| Name | Type | Description |
| ---- | ------------------------------------------------ | ------------------------- |
| | `autoware_perception_msgs::msg::DetectedObjects` | detection result array |
| | `sensor_msgs::msg::PointCloud2` | point cloud for filtering |

#### Visualization Result

@@ -31,9 +32,10 @@ Example:

#### Input Types

| Name | Type | Description |
| ---- | ----------------------------------------------- | --------------------- |
| | `autoware_perception_msgs::msg::TrackedObjects` | tracking result array |
| Name | Type | Description |
| ---- | ----------------------------------------------- | ------------------------- |
| | `autoware_perception_msgs::msg::TrackedObjects` | tracking result array |
| | `sensor_msgs::msg::PointCloud2` | point cloud for filtering |

#### Visualization Result

@@ -45,16 +47,24 @@ Overwrite tracking results with detection results.

#### Input Types

| Name | Type | Description |
| ---- | ------------------------------------------------- | ----------------------- |
| | `autoware_perception_msgs::msg::PredictedObjects` | prediction result array |
<<<<<<< HEAD:common/autoware_perception_rviz_plugin/README.md
| Name | Type | Description |
| ---- | ------------------------------------------------------ | ------------------------ |
| | `autoware_perception_msgs::msg::PredictedObjects` | prediction result array |
| | `sensor_msgs::msg::PointCloud2` | pointcloud for filtering |

#### Visualization Result

Overwrite prediction results with tracking results.

![predicted-object-visualization-description](./images/predicted-object-visualization-description.jpg)

### Visualization with active point cloud publishing

Publishing colored point clouds. With colors according to different classes of detected objects, same as polygons.

![visualization-with-pointcloud](./images/3d_pointcloud.png)

## References/External links

[1] <https://gitlab.com/autowarefoundation/autoware.auto/AutowareAuto/-/tree/master/src/tools/visualization/autoware_rviz_plugins>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -16,7 +16,11 @@

#include "autoware_perception_rviz_plugin/object_detection/object_polygon_display_base.hpp"

#include <autoware_perception_msgs/msg/detected_object.hpp>
#include <autoware_perception_msgs/msg/detected_objects.hpp>
#include <sensor_msgs/msg/point_cloud2.hpp>

#include <memory>

namespace autoware
{
@@ -37,6 +41,9 @@ class AUTOWARE_PERCEPTION_RVIZ_PLUGIN_PUBLIC DetectedObjectsDisplay

private:
void processMessage(DetectedObjects::ConstSharedPtr msg) override;
void processPointCloud(
const DetectedObjects::ConstSharedPtr & input_objs_msg,
const sensor_msgs::msg::PointCloud2::ConstSharedPtr & input_pointcloud_msg);
};

} // namespace object_detection
Original file line number Diff line number Diff line change
@@ -32,6 +32,13 @@
#include <geometry_msgs/msg/twist_with_covariance.hpp>
#include <visualization_msgs/msg/marker.hpp>

#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>
#include <boost/geometry/strategies/buffer.hpp>
#include <boost/geometry/strategies/transform.hpp>
#include <boost/polygon/polygon.hpp>

#include <algorithm>
#include <map>
#include <string>
@@ -196,6 +203,10 @@ AUTOWARE_PERCEPTION_RVIZ_PLUGIN_PUBLIC void calc_2d_bounding_box_bottom_line_lis
const autoware_perception_msgs::msg::Shape & shape,
std::vector<geometry_msgs::msg::Point> & points);

AUTOWARE_PERCEPTION_RVIZ_PLUGIN_PUBLIC void calc_2d_bounding_box_bottom_triangle_list(
const autoware_perception_msgs::msg::Shape & shape,
std::vector<geometry_msgs::msg::Point> & points);

AUTOWARE_PERCEPTION_RVIZ_PLUGIN_PUBLIC void calc_2d_bounding_box_bottom_direction_line_list(
const autoware_perception_msgs::msg::Shape & shape,
std::vector<geometry_msgs::msg::Point> & points);
Loading