Skip to content

Commit

Permalink
Merge pull request #82 from ethz-asl/feature/add_py_typed_marker_file
Browse files Browse the repository at this point in the history
Mark pywavemap as a typed extension and address cpplint v2.0 warnings
  • Loading branch information
LionelOtt authored Oct 25, 2024
2 parents 54b2a93 + 7790319 commit d0d64d8
Show file tree
Hide file tree
Showing 98 changed files with 283 additions and 17 deletions.
13 changes: 8 additions & 5 deletions CPPLINT.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@ filter=-legal/copyright
# clang-format.
filter=-build/include_order

# Do not check for unapproved C++11 headers such as <chrono> and <thread>.
# We currently do not have a better alternative (e.g. abseil) that is already
# available, although adding such a dependency would be worth considering in the
# future.
filter=-build/c++11
# Do not forbid using C++11 and C++17 headers that are not approved by Google,
# such as <chrono> and <thread>. These STL components worked well enough for us
# so far that we do not yet see the need to add a dependency that provides
# alternatives (e.g. abseil).
filter=-build/c++11,-build/c++17

# Our project's style expects the contents of a namespace to be indented
filter=-whitespace/indent_namespace
3 changes: 3 additions & 0 deletions examples/cpp/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
Changelog for package wavemap_examples_cpp
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

2.1.1 (2024-10-24)
------------------

2.1.0 (2024-09-16)
------------------
* Extend and improve documentation and examples
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.10)
project(wavemap_examples_cpp VERSION 2.1.0 LANGUAGES CXX)
project(wavemap_examples_cpp VERSION 2.1.1 LANGUAGES CXX)

# Load the wavemap library
# First, try to load it from sources
Expand Down
3 changes: 3 additions & 0 deletions examples/python/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
Changelog for package wavemap_examples_python
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

2.1.1 (2024-10-24)
------------------

2.1.0 (2024-09-16)
------------------
* Initial examples and documentation on how to use wavemap's Python API
Expand Down
5 changes: 5 additions & 0 deletions examples/ros1/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Changelog for package wavemap_examples_ros1
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

2.1.1 (2024-10-24)
------------------
* Address warnings from new cpplint version (v2.0)
* Contributors: Victor Reijgwart

2.1.0 (2024-09-16)
------------------

Expand Down
2 changes: 2 additions & 0 deletions examples/ros1/io/send_map_over_ros.cc
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#include <string>

#include <ros/ros.h>
#include <wavemap_ros_conversions/map_msg_conversions.h>

Expand Down
2 changes: 1 addition & 1 deletion examples/ros1/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<package format="2">
<name>wavemap_examples_ros1</name>
<version>2.1.0</version>
<version>2.1.1</version>
<description>Usages examples for wavemap's ROS1 interface.</description>

<maintainer email="victorr@ethz.ch">Victor Reijgwart</maintainer>
Expand Down
3 changes: 3 additions & 0 deletions interfaces/ros1/wavemap/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
Changelog for package wavemap
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

2.1.1 (2024-10-24)
------------------

2.1.0 (2024-09-16)
------------------

Expand Down
2 changes: 1 addition & 1 deletion interfaces/ros1/wavemap/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<package format="2">
<name>wavemap</name>
<version>2.1.0</version>
<version>2.1.1</version>
<description>Base library for wavemap.</description>

<maintainer email="victorr@ethz.ch">Victor Reijgwart</maintainer>
Expand Down
3 changes: 3 additions & 0 deletions interfaces/ros1/wavemap_all/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
Changelog for package wavemap_all
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

2.1.1 (2024-10-24)
------------------

2.1.0 (2024-09-16)
------------------

Expand Down
2 changes: 1 addition & 1 deletion interfaces/ros1/wavemap_all/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<package format="2">
<name>wavemap_all</name>
<version>2.1.0</version>
<version>2.1.1</version>
<description>Metapackage that builds all wavemap packages.</description>

<maintainer email="victorr@ethz.ch">Victor Reijgwart</maintainer>
Expand Down
3 changes: 3 additions & 0 deletions interfaces/ros1/wavemap_msgs/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
Changelog for package wavemap_msgs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

2.1.1 (2024-10-24)
------------------

2.1.0 (2024-09-16)
------------------

Expand Down
2 changes: 1 addition & 1 deletion interfaces/ros1/wavemap_msgs/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<package format="2">
<name>wavemap_msgs</name>
<version>2.1.0</version>
<version>2.1.1</version>
<description>Message definitions for wavemap's ROS interfaces.</description>

<maintainer email="victorr@ethz.ch">Victor Reijgwart</maintainer>
Expand Down
5 changes: 5 additions & 0 deletions interfaces/ros1/wavemap_ros/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Changelog for package wavemap_ros
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

2.1.1 (2024-10-24)
------------------
* Address warnings from new cpplint version (v2.0)
* Contributors: Victor Reijgwart

2.1.0 (2024-09-16)
------------------

Expand Down
2 changes: 2 additions & 0 deletions interfaces/ros1/wavemap_ros/app/rosbag_processor.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "wavemap_ros/utils/rosbag_processor.h"

#include <string>

#include <glog/logging.h>
#include <rosgraph_msgs/Clock.h>
#include <tf/tfMessage.h>
Expand Down
2 changes: 1 addition & 1 deletion interfaces/ros1/wavemap_ros/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<package format="2">
<name>wavemap_ros</name>
<version>2.1.0</version>
<version>2.1.1</version>
<description>ROS interface for wavemap.</description>

<maintainer email="victorr@ethz.ch">Victor Reijgwart</maintainer>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
#include "wavemap_ros/inputs/depth_image_topic_input.h"

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

#include <cv_bridge/cv_bridge.h>
#include <opencv2/core/eigen.hpp>
#include <sensor_msgs/PointCloud.h>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#include "wavemap_ros/inputs/pointcloud_topic_input.h"

#include <memory>
#include <string>
#include <utility>

#include <cv_bridge/cv_bridge.h>
#include <opencv2/core/eigen.hpp>
#include <sensor_msgs/PointCloud.h>
Expand Down
4 changes: 4 additions & 0 deletions interfaces/ros1/wavemap_ros/src/inputs/ros_input_base.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#include "wavemap_ros/inputs/ros_input_base.h"

#include <memory>
#include <string>
#include <utility>

namespace wavemap {
DECLARE_CONFIG_MEMBERS(RosInputBaseConfig,
(topic_name)
Expand Down
4 changes: 4 additions & 0 deletions interfaces/ros1/wavemap_ros/src/inputs/ros_input_factory.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#include "wavemap_ros/inputs/ros_input_factory.h"

#include <memory>
#include <string>
#include <utility>

#include "wavemap_ros/inputs/depth_image_topic_input.h"
#include "wavemap_ros/inputs/pointcloud_topic_input.h"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#include "wavemap_ros/map_operations/crop_map_operation.h"

#include <memory>
#include <string>
#include <utility>

#include <wavemap/core/map/hashed_blocks.h>
#include <wavemap/core/map/hashed_chunked_wavelet_octree.h>
#include <wavemap/core/map/hashed_wavelet_octree.h>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#include "wavemap_ros/map_operations/map_ros_operation_factory.h"

#include <memory>
#include <string>
#include <utility>

#include "wavemap_ros/map_operations/crop_map_operation.h"
#include "wavemap_ros/map_operations/publish_map_operation.h"
#include "wavemap_ros/map_operations/publish_pointcloud_operation.h"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#include "wavemap_ros/map_operations/publish_map_operation.h"

#include <memory>
#include <string>
#include <utility>

#include <std_srvs/Empty.h>
#include <wavemap/core/utils/profiler_interface.h>
#include <wavemap_msgs/Map.h>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#include "wavemap_ros/map_operations/publish_pointcloud_operation.h"

#include <string>
#include <utility>

#include <sensor_msgs/PointCloud.h>
#include <sensor_msgs/PointCloud2.h>
#include <sensor_msgs/point_cloud_conversion.h>
Expand Down
3 changes: 3 additions & 0 deletions interfaces/ros1/wavemap_ros/src/ros_server.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#include "wavemap_ros/ros_server.h"

#include <memory>
#include <utility>

#include <std_srvs/Trigger.h>
#include <wavemap/core/map/map_factory.h>
#include <wavemap/io/file_conversions.h>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "wavemap_ros/utils/pointcloud_undistorter.h"

#include <string>

#include <wavemap/core/utils/profiler_interface.h>
#include <wavemap/core/utils/undistortion/pointcloud_undistortion.h>
#include <wavemap_ros_conversions/time_conversions.h>
Expand Down
2 changes: 2 additions & 0 deletions interfaces/ros1/wavemap_ros/src/utils/ros_logging_level.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "wavemap_ros/utils/ros_logging_level.h"

#include <string>

namespace wavemap {
RosLoggingLevel::operator LoggingLevel() const {
if (id_ == Id::kDebug) {
Expand Down
2 changes: 2 additions & 0 deletions interfaces/ros1/wavemap_ros/src/utils/rosbag_processor.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "wavemap_ros/utils/rosbag_processor.h"

#include <string>

#include <wavemap/core/utils/profiler_interface.h>

namespace wavemap {
Expand Down
5 changes: 5 additions & 0 deletions interfaces/ros1/wavemap_ros_conversions/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Changelog for package wavemap_ros_conversions
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

2.1.1 (2024-10-24)
------------------
* Address warnings from new cpplint version (v2.0)
* Contributors: Victor Reijgwart

2.1.0 (2024-09-16)
------------------

Expand Down
2 changes: 1 addition & 1 deletion interfaces/ros1/wavemap_ros_conversions/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<package format="2">
<name>wavemap_ros_conversions</name>
<version>2.1.0</version>
<version>2.1.1</version>
<description>Conversions between wavemap and ROS types.</description>

<maintainer email="victorr@ethz.ch">Victor Reijgwart</maintainer>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "wavemap_ros_conversions/config_conversions.h"

#include <string>

namespace wavemap::param::convert {
param::Map toParamMap(const ros::NodeHandle& nh, const std::string& ns) {
XmlRpc::XmlRpcValue xml_rpc_value;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
#include "wavemap_ros_conversions/map_msg_conversions.h"

#include <algorithm>
#include <memory>
#include <stack>
#include <string>
#include <unordered_set>

#include <ros/console.h>
#include <wavemap/core/utils/profiler_interface.h>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#include <memory>
#include <string>
#include <vector>

#include <gtest/gtest.h>
#include <wavemap/core/common.h>
#include <wavemap/core/map/hashed_chunked_wavelet_octree.h>
Expand Down
5 changes: 5 additions & 0 deletions interfaces/ros1/wavemap_rviz_plugin/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Changelog for package wavemap_rviz_plugin
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

2.1.1 (2024-10-24)
------------------
* Address warnings from new cpplint version (v2.0)
* Contributors: Victor Reijgwart

2.1.0 (2024-09-16)
------------------

Expand Down
2 changes: 1 addition & 1 deletion interfaces/ros1/wavemap_rviz_plugin/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<package format="2">
<name>wavemap_rviz_plugin</name>
<version>2.1.0</version>
<version>2.1.1</version>
<description>Plugin to interactively visualize maps published in wavemap's
native format.
</description>
Expand Down
3 changes: 3 additions & 0 deletions interfaces/ros1/wavemap_rviz_plugin/src/utils/listeners.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#include "wavemap_rviz_plugin/utils/listeners.h"

#include <memory>
#include <utility>

#include <glog/logging.h>

namespace wavemap::rviz_plugin {
Expand Down
3 changes: 3 additions & 0 deletions interfaces/ros1/wavemap_rviz_plugin/src/visuals/cell_layer.cc
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#include "wavemap_rviz_plugin/visuals/cell_layer.h"

#include <algorithm>
#include <memory>
#include <sstream>
#include <vector>

#include <OgreCamera.h>
#include <OgreMaterialManager.h>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "wavemap_rviz_plugin/visuals/cell_selector.h"

#include <utility>

#include <wavemap/core/utils/neighbors/grid_neighborhood.h>

namespace wavemap::rviz_plugin {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#include "wavemap_rviz_plugin/visuals/slice_visual.h"

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

#include <ros/console.h>
#include <wavemap/core/indexing/index_conversions.h>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
#include "wavemap_rviz_plugin/visuals/voxel_visual.h"

#include <algorithm>
#include <memory>
#include <string>
#include <utility>
#include <vector>

#include <rviz/properties/parse_color.h>
#include <rviz/render_panel.h>
#include <wavemap/core/indexing/index_conversions.h>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#include "wavemap_rviz_plugin/wavemap_map_display.h"

#include <memory>
#include <string>

#include <OGRE/OgreSceneNode.h>
#include <qfiledialog.h>
#include <rviz/visualization_manager.h>
Expand Down
Loading

0 comments on commit d0d64d8

Please sign in to comment.