Commit 22bc096a authored by Daniel Müller's avatar Daniel Müller

Merge branch 'dev/processing_information_extension' into 'master'

Extended RGBDFrame by adding vector of node processing summary entries, which...

See merge request !5
parents 02cf67c2 f29a3eac
...@@ -5,7 +5,7 @@ project(homer_msgs) ...@@ -5,7 +5,7 @@ project(homer_msgs)
## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz) ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
## is used, also find other catkin packages ## is used, also find other catkin packages
find_package(catkin REQUIRED COMPONENTS find_package(catkin REQUIRED COMPONENTS
# roscpp roscpp
# rospy # rospy
message_generation message_generation
geometry_msgs geometry_msgs
...@@ -52,6 +52,11 @@ find_package(catkin REQUIRED COMPONENTS ...@@ -52,6 +52,11 @@ find_package(catkin REQUIRED COMPONENTS
add_message_files( add_message_files(
FILES FILES
RGBDFrame.msg RGBDFrame.msg
NodeProcessingSummary.msg
ProcessingInfo.msg
# Note: Currently for used for backwards compatibility of e.g. bag files
RGBDFrameOrig.msg
Face.msg Face.msg
HumanPose.msg HumanPose.msg
Person.msg Person.msg
...@@ -98,7 +103,7 @@ generate_messages( ...@@ -98,7 +103,7 @@ generate_messages(
## CATKIN_DEPENDS: catkin_packages dependent projects also need ## CATKIN_DEPENDS: catkin_packages dependent projects also need
## DEPENDS: system dependencies of this project that dependent projects also need ## DEPENDS: system dependencies of this project that dependent projects also need
catkin_package( catkin_package(
# INCLUDE_DIRS include INCLUDE_DIRS include
# LIBRARIES homer_msgs # LIBRARIES homer_msgs
CATKIN_DEPENDS message_runtime geometry_msgs sensor_msgs std_msgs CATKIN_DEPENDS message_runtime geometry_msgs sensor_msgs std_msgs
# DEPENDS system_lib # DEPENDS system_lib
...@@ -110,9 +115,9 @@ catkin_package( ...@@ -110,9 +115,9 @@ catkin_package(
## Specify additional locations of header files ## Specify additional locations of header files
## Your package locations should be listed before other locations ## Your package locations should be listed before other locations
# include_directories(include)
include_directories( include_directories(
${catkin_INCLUDE_DIRS} include
${catkin_INCLUDE_DIRS}
) )
## Declare a cpp library ## Declare a cpp library
......
## homer_msgs (kinetic) - 0.1.5-1 # Package homer_msgs
This package contains messages and services which are used by different nodes in common.
The packages in the `homer_msgs` repository were released into the `kinetic` distro by running `/usr/bin/bloom-release --rosdistro kinetic --track kinetic homer_msgs` on `Thu, 26 Jan 2017 14:48:52 -0000` The documentation for the message and services is contained by the message files itself.
These packages were released:
- `homer_msgs`
- `homer_ptu_msgs`
Version of package(s) in repository `homer_msgs`:
- upstream repository: git@gitlab.uni-koblenz.de:robbie/homer_msgs.git
- release repository: unknown
- rosdistro version: `null`
- old version: `0.1.5-0`
- new version: `0.1.5-1`
Versions of tools used:
- bloom version: `0.5.23`
- catkin_pkg version: `0.2.10`
- rosdep version: `0.11.5`
- rosdistro version: `0.5.0`
- vcstools version: `0.1.39`
## homer_msgs (kinetic) - 0.1.5-0
The packages in the `homer_msgs` repository were released into the `kinetic` distro by running `/usr/bin/bloom-release --rosdistro kinetic --track kinetic homer_msgs` on `Tue, 10 Jan 2017 17:20:07 -0000`
These packages were released:
- `homer_msgs`
- `homer_ptu_msgs`
Version of package(s) in repository `homer_msgs`:
- upstream repository: git@gitlab.uni-koblenz.de:robbie/homer_msgs.git
- release repository: git@gitlab.uni-koblenz.de:robbie/homer_msgs.git
- rosdistro version: `0.1.4-0`
- old version: `0.1.4-0`
- new version: `0.1.5-0`
Versions of tools used:
- bloom version: `0.5.23`
- catkin_pkg version: `0.2.10`
- rosdep version: `0.11.5`
- rosdistro version: `0.5.0`
- vcstools version: `0.1.39`
## homer_msgs (kinetic) - 0.1.4-0
The packages in the `homer_msgs` repository were released into the `kinetic` distro by running `/usr/bin/bloom-release --rosdistro kinetic --track kinetic homer_msgs` on `Wed, 02 Nov 2016 14:20:23 -0000`
These packages were released:
- `homer_msgs`
- `homer_ptu_msgs`
Version of package(s) in repository `homer_msgs`:
- upstream repository: git@gitlab.uni-koblenz.de:robbie/homer_msgs.git
- release repository: git@gitlab.uni-koblenz.de:robbie/homer_msgs.git
- rosdistro version: `0.1.3-0`
- old version: `0.1.3-0`
- new version: `0.1.4-0`
Versions of tools used:
- bloom version: `0.5.23`
- catkin_pkg version: `0.2.10`
- rosdep version: `0.11.5`
- rosdistro version: `0.5.0`
- vcstools version: `0.1.39`
## homer_msgs (kinetic) - 0.1.3-0
The packages in the `homer_msgs` repository were released into the `kinetic` distro by running `/usr/bin/bloom-release --rosdistro kinetic --track kinetic homer_msgs` on `Wed, 02 Nov 2016 13:55:17 -0000`
These packages were released:
- `homer_msgs`
- `homer_ptu_msgs`
Version of package(s) in repository `homer_msgs`:
- upstream repository: git@gitlab.uni-koblenz.de:robbie/homer_msgs.git
- release repository: git@gitlab.uni-koblenz.de:robbie/homer_msgs.git
- rosdistro version: `0.1.2-0`
- old version: `0.1.2-0`
- new version: `0.1.3-0`
Versions of tools used:
- bloom version: `0.5.23`
- catkin_pkg version: `0.2.10`
- rosdep version: `0.11.5`
- rosdistro version: `0.5.0`
- vcstools version: `0.1.39`
## homer_msgs (kinetic) - 0.1.2-0
The packages in the `homer_msgs` repository were released into the `kinetic` distro by running `/usr/bin/bloom-release --rosdistro kinetic --track kinetic homer_msgs` on `Wed, 02 Nov 2016 13:33:39 -0000`
These packages were released:
- `homer_msgs`
- `homer_ptu_msgs`
Version of package(s) in repository `homer_msgs`:
- upstream repository: git@gitlab.uni-koblenz.de:robbie/homer_msgs.git
- release repository: git@gitlab.uni-koblenz.de:robbie/homer_msgs.git
- rosdistro version: `0.1.1-1`
- old version: `0.1.1-1`
- new version: `0.1.2-0`
Versions of tools used:
- bloom version: `0.5.23`
- catkin_pkg version: `0.2.10`
- rosdep version: `0.11.5`
- rosdistro version: `0.5.0`
- vcstools version: `0.1.39`
## homer_msgs (kinetic) - 0.1.1-1
The packages in the `homer_msgs` repository were released into the `kinetic` distro by running `/usr/bin/bloom-release --rosdistro kinetic --track kinetic homer_msgs --edit` on `Tue, 01 Nov 2016 12:54:29 -0000`
The `homer_msgs` package was released.
Version of package(s) in repository `homer_msgs`:
- upstream repository: git@gitlab.uni-koblenz.de:robbie/homer_msgs.git
- release repository: git@gitlab.uni-koblenz.de:robbie/homer_msgs.git
- rosdistro version: `0.1.1-0`
- old version: `0.1.1-0`
- new version: `0.1.1-1`
Versions of tools used:
- bloom version: `0.5.23`
- catkin_pkg version: `0.2.10`
- rosdep version: `0.11.5`
- rosdistro version: `0.5.0`
- vcstools version: `0.1.39`
## homer_msgs (kinetic) - 0.1.1-0
The packages in the `homer_msgs` repository were released into the `kinetic` distro by running `/usr/bin/bloom-release --rosdistro kinetic --track kinetic homer_msgs` on `Tue, 01 Nov 2016 12:13:07 -0000`
The `homer_msgs` package was released.
Version of package(s) in repository `homer_msgs`:
- upstream repository: git@gitlab.uni-koblenz.de:robbie/homer_msgs.git
- release repository: unknown
- rosdistro version: `null`
- old version: `null`
- new version: `0.1.1-0`
Versions of tools used:
- bloom version: `0.5.23`
- catkin_pkg version: `0.2.10`
- rosdep version: `0.11.5`
- rosdistro version: `0.4.7`
- vcstools version: `0.1.39`
# Package homer_msgs
This package contains messages and services which are used by different nodes in common.
The documentation for the message and services is contained by the message files itself.
#pragma once
#include <ros/ros.h>
#include <homer_msgs/NodeProcessingSummary.h>
#include <homer_msgs/ProcessingInfo.h>
namespace processing_log
{
/**
* This message should be called on msg receival.
*/
homer_msgs::NodeProcessingSummary& create_entry_for_this_node(homer_msgs::RGBDFrame& frame)
{
const auto receiving_time = ros::Time::now();
frame.processing_log.emplace_back();
auto& log = frame.processing_log.back();
log.receiving_time = receiving_time;
log.node_name = ros::this_node::getName();
return log;
};
homer_msgs::ProcessingInfo& create_new_task(homer_msgs::NodeProcessingSummary& summary)
{
summary.tasks.emplace_back();
return summary.tasks.back();
}
} // namespace processing_log
# Basic information, usually used for node name and message handling times
string node_name
time receiving_time
time sending_time
# Log times of sub tasks executed by e.g. node
homer_msgs/ProcessingInfo[] tasks
string task_name
time starting_time
time ending_time
sensor_msgs/PointCloud2 point_cloud
sensor_msgs/Image rgb_image
sensor_msgs/Image range_image
# Log, which nodes processed given frame
homer_msgs/NodeProcessingSummary[] processing_log
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment