Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(autoware_auto_perception_rviz_plugin): move headers to a separate directory #5921

Merged
merged 5 commits into from
Jan 15, 2024
Merged

fix(autoware_auto_perception_rviz_plugin): move headers to a separate directory #5921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f666441
fix(autoware_auto_perception_rviz_plugin): move headers to a separate…
esteve Dec 19, 2023
3c92d1f
style(pre-commit): autofix
pre-commit-ci[bot] Dec 19, 2023
e06d236
fix(autoware_auto_perception_rviz_plugin): fix include
esteve Dec 20, 2023
a6af857
style(pre-commit): autofix
pre-commit-ci[bot] Dec 20, 2023
c59bd04
fix(autoware_auto_perception_rviz_plugin): fix header paths in CMakeL…
esteve Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions common/autoware_auto_perception_rviz_plugin/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ set(OD_PLUGIN_LIB_SRC
)

set(OD_PLUGIN_LIB_HEADERS
include/visibility_control.hpp
include/autoware_auto_perception_rviz_plugin/visibility_control.hpp
)
set(OD_PLUGIN_LIB_HEADERS_TO_WRAP
include/object_detection/detected_objects_display.hpp
include/object_detection/tracked_objects_display.hpp
include/object_detection/predicted_objects_display.hpp
include/autoware_auto_perception_rviz_plugin/object_detection/detected_objects_display.hpp
include/autoware_auto_perception_rviz_plugin/object_detection/tracked_objects_display.hpp
include/autoware_auto_perception_rviz_plugin/object_detection/predicted_objects_display.hpp
)

set(COMMON_HEADERS
include/common/color_alpha_property.hpp
include/object_detection/object_polygon_detail.hpp
include/object_detection/object_polygon_display_base.hpp
include/autoware_auto_perception_rviz_plugin/common/color_alpha_property.hpp
include/autoware_auto_perception_rviz_plugin/object_detection/object_polygon_detail.hpp
include/autoware_auto_perception_rviz_plugin/object_detection/object_polygon_display_base.hpp
)

set(COMMON_SRC
Expand Down
9 changes: 5 additions & 4 deletions ...n/include/common/color_alpha_property.hpp → ...iz_plugin/common/color_alpha_property.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef COMMON__COLOR_ALPHA_PROPERTY_HPP_
#define COMMON__COLOR_ALPHA_PROPERTY_HPP_
#ifndef AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__COMMON__COLOR_ALPHA_PROPERTY_HPP_
#define AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__COMMON__COLOR_ALPHA_PROPERTY_HPP_

#include "autoware_auto_perception_rviz_plugin/visibility_control.hpp"

#include <rviz_common/display.hpp>
#include <rviz_common/properties/color_property.hpp>
#include <rviz_common/properties/float_property.hpp>
#include <visibility_control.hpp>

#include <std_msgs/msg/color_rgba.hpp>

Expand Down Expand Up @@ -55,4 +56,4 @@ class AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN_PUBLIC ColorAlphaProperty
} // namespace rviz_plugins
} // namespace autoware

#endif // COMMON__COLOR_ALPHA_PROPERTY_HPP_
#endif // AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__COMMON__COLOR_ALPHA_PROPERTY_HPP_
8 changes: 4 additions & 4 deletions ...ct_detection/detected_objects_display.hpp → ...ct_detection/detected_objects_display.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef OBJECT_DETECTION__DETECTED_OBJECTS_DISPLAY_HPP_
#define OBJECT_DETECTION__DETECTED_OBJECTS_DISPLAY_HPP_
#ifndef AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__DETECTED_OBJECTS_DISPLAY_HPP_
#define AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__DETECTED_OBJECTS_DISPLAY_HPP_

#include <object_detection/object_polygon_display_base.hpp>
#include "autoware_auto_perception_rviz_plugin/object_detection/object_polygon_display_base.hpp"

#include <autoware_auto_perception_msgs/msg/detected_objects.hpp>

Expand Down Expand Up @@ -43,4 +43,4 @@ class AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN_PUBLIC DetectedObjectsDisplay
} // namespace rviz_plugins
} // namespace autoware

#endif // OBJECT_DETECTION__DETECTED_OBJECTS_DISPLAY_HPP_
#endif // AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__DETECTED_OBJECTS_DISPLAY_HPP_
9 changes: 5 additions & 4 deletions ...bject_detection/object_polygon_detail.hpp → ...bject_detection/object_polygon_detail.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
/// \brief This file defines some helper functions used by ObjectPolygonDisplayBase class
#ifndef OBJECT_DETECTION__OBJECT_POLYGON_DETAIL_HPP_
#define OBJECT_DETECTION__OBJECT_POLYGON_DETAIL_HPP_
#ifndef AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__OBJECT_POLYGON_DETAIL_HPP_
#define AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__OBJECT_POLYGON_DETAIL_HPP_

#include "autoware_auto_perception_rviz_plugin/visibility_control.hpp"

#include <rclcpp/logging.hpp>
#include <rclcpp/rclcpp.hpp>
#include <visibility_control.hpp>

#include <autoware_auto_perception_msgs/msg/detected_object.hpp>
#include <autoware_auto_perception_msgs/msg/object_classification.hpp>
Expand Down Expand Up @@ -252,4 +253,4 @@ AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN_PUBLIC
} // namespace rviz_plugins
} // namespace autoware

#endif // OBJECT_DETECTION__OBJECT_POLYGON_DETAIL_HPP_
#endif // AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__OBJECT_POLYGON_DETAIL_HPP_
12 changes: 6 additions & 6 deletions ...detection/object_polygon_display_base.hpp → ...detection/object_polygon_display_base.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef OBJECT_DETECTION__OBJECT_POLYGON_DISPLAY_BASE_HPP_
#define OBJECT_DETECTION__OBJECT_POLYGON_DISPLAY_BASE_HPP_
#ifndef AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__OBJECT_POLYGON_DISPLAY_BASE_HPP_
#define AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__OBJECT_POLYGON_DISPLAY_BASE_HPP_

#include "common/color_alpha_property.hpp"
#include "autoware_auto_perception_rviz_plugin/common/color_alpha_property.hpp"
#include "autoware_auto_perception_rviz_plugin/object_detection/object_polygon_detail.hpp"
#include "autoware_auto_perception_rviz_plugin/visibility_control.hpp"

#include <object_detection/object_polygon_detail.hpp>
#include <rviz_common/display.hpp>
#include <rviz_common/properties/color_property.hpp>
#include <rviz_common/properties/enum_property.hpp>
#include <rviz_common/properties/float_property.hpp>
#include <rviz_default_plugins/displays/marker/marker_common.hpp>
#include <rviz_default_plugins/displays/marker_array/marker_array_display.hpp>
#include <visibility_control.hpp>

#include <autoware_auto_perception_msgs/msg/object_classification.hpp>
#include <unique_identifier_msgs/msg/uuid.hpp>
Expand Down Expand Up @@ -449,4 +449,4 @@ class AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN_PUBLIC ObjectPolygonDisplayBase
} // namespace rviz_plugins
} // namespace autoware

#endif // OBJECT_DETECTION__OBJECT_POLYGON_DISPLAY_BASE_HPP_
#endif // AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__OBJECT_POLYGON_DISPLAY_BASE_HPP_
8 changes: 4 additions & 4 deletions ...t_detection/predicted_objects_display.hpp → ...t_detection/predicted_objects_display.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef OBJECT_DETECTION__PREDICTED_OBJECTS_DISPLAY_HPP_
#define OBJECT_DETECTION__PREDICTED_OBJECTS_DISPLAY_HPP_
#ifndef AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__PREDICTED_OBJECTS_DISPLAY_HPP_
#define AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__PREDICTED_OBJECTS_DISPLAY_HPP_

#include <object_detection/object_polygon_display_base.hpp>
#include "autoware_auto_perception_rviz_plugin/object_detection/object_polygon_display_base.hpp"

#include <autoware_auto_perception_msgs/msg/predicted_objects.hpp>

Expand Down Expand Up @@ -153,4 +153,4 @@ class AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN_PUBLIC PredictedObjectsDisplay
} // namespace rviz_plugins
} // namespace autoware

#endif // OBJECT_DETECTION__PREDICTED_OBJECTS_DISPLAY_HPP_
#endif // AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__PREDICTED_OBJECTS_DISPLAY_HPP_
8 changes: 4 additions & 4 deletions ...ect_detection/tracked_objects_display.hpp → ...ect_detection/tracked_objects_display.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef OBJECT_DETECTION__TRACKED_OBJECTS_DISPLAY_HPP_
#define OBJECT_DETECTION__TRACKED_OBJECTS_DISPLAY_HPP_
#ifndef AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__TRACKED_OBJECTS_DISPLAY_HPP_
#define AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__TRACKED_OBJECTS_DISPLAY_HPP_

#include <object_detection/object_polygon_display_base.hpp>
#include "autoware_auto_perception_rviz_plugin/object_detection/object_polygon_display_base.hpp"

#include <autoware_auto_perception_msgs/msg/tracked_objects.hpp>

Expand Down Expand Up @@ -114,4 +114,4 @@ class AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN_PUBLIC TrackedObjectsDisplay
} // namespace rviz_plugins
} // namespace autoware

#endif // OBJECT_DETECTION__TRACKED_OBJECTS_DISPLAY_HPP_
#endif // AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__TRACKED_OBJECTS_DISPLAY_HPP_
6 changes: 3 additions & 3 deletions ...viz_plugin/include/visibility_control.hpp → ...eption_rviz_plugin/visibility_control.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
//
// Co-developed by Tier IV, Inc. and Apex.AI, Inc.

#ifndef VISIBILITY_CONTROL_HPP_
#define VISIBILITY_CONTROL_HPP_
#ifndef AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__VISIBILITY_CONTROL_HPP_
#define AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__VISIBILITY_CONTROL_HPP_

#if defined(__WIN32)
#if defined(AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN_BUILDING_DLL) || \
Expand All @@ -40,4 +40,4 @@
#error "Unsupported Build Configuration"
#endif // defined(_WINDOWS)

#endif // VISIBILITY_CONTROL_HPP_
#endif // AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__VISIBILITY_CONTROL_HPP_
2 changes: 1 addition & 1 deletion common/autoware_auto_perception_rviz_plugin/src/common/color_alpha_property.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
//
// Co-developed by Tier IV, Inc. and Apex.AI, Inc.

#include "common/color_alpha_property.hpp"
#include "autoware_auto_perception_rviz_plugin/common/color_alpha_property.hpp"

#include <memory>

Expand Down
2 changes: 1 addition & 1 deletion ...on/autoware_auto_perception_rviz_plugin/src/object_detection/detected_objects_display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
//
// Co-developed by Tier IV, Inc. and Apex.AI, Inc.

#include <object_detection/detected_objects_display.hpp>
#include "autoware_auto_perception_rviz_plugin/object_detection/detected_objects_display.hpp"

#include <memory>

Expand Down
3 changes: 2 additions & 1 deletion common/autoware_auto_perception_rviz_plugin/src/object_detection/object_polygon_detail.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License..

#include "autoware_auto_perception_rviz_plugin/object_detection/object_polygon_detail.hpp"

#include <Eigen/Core>
#include <Eigen/Eigen>
#include <object_detection/object_polygon_detail.hpp>

#include <geometry_msgs/msg/transform_stamped.hpp>

Expand Down
2 changes: 1 addition & 1 deletion ...n/autoware_auto_perception_rviz_plugin/src/object_detection/predicted_objects_display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include <object_detection/predicted_objects_display.hpp>
#include "autoware_auto_perception_rviz_plugin/object_detection/predicted_objects_display.hpp"

#include <memory>
#include <set>
Expand Down
2 changes: 1 addition & 1 deletion common/autoware_auto_perception_rviz_plugin/src/object_detection/tracked_objects_display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
//
// Co-developed by Tier IV, Inc. and Apex.AI, Inc.

#include <object_detection/tracked_objects_display.hpp>
#include "autoware_auto_perception_rviz_plugin/object_detection/tracked_objects_display.hpp"

#include <memory>

Expand Down
Loading