Skip to content

Commit b60975f

Browse files
estevepre-commit-ci[bot]
esteve
and
pre-commit-ci[bot]
authored
fix(autoware_auto_perception_rviz_plugin): move headers to a separate directory (#5921)
* fix(autoware_auto_perception_rviz_plugin): move headers to a separate directory Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp> * style(pre-commit): autofix * fix(autoware_auto_perception_rviz_plugin): fix include Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp> * style(pre-commit): autofix * fix(autoware_auto_perception_rviz_plugin): fix header paths in CMakeLists.txt Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp> --------- Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent 5ab1804 commit b60975f

13 files changed

+44
-41
lines changed

‎common/autoware_auto_perception_rviz_plugin/CMakeLists.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ set(OD_PLUGIN_LIB_SRC
1313
)
1414

1515
set(OD_PLUGIN_LIB_HEADERS
16-
include/visibility_control.hpp
16+
include/autoware_auto_perception_rviz_plugin/visibility_control.hpp
1717
)
1818
set(OD_PLUGIN_LIB_HEADERS_TO_WRAP
19-
include/object_detection/detected_objects_display.hpp
20-
include/object_detection/tracked_objects_display.hpp
21-
include/object_detection/predicted_objects_display.hpp
19+
include/autoware_auto_perception_rviz_plugin/object_detection/detected_objects_display.hpp
20+
include/autoware_auto_perception_rviz_plugin/object_detection/tracked_objects_display.hpp
21+
include/autoware_auto_perception_rviz_plugin/object_detection/predicted_objects_display.hpp
2222
)
2323

2424
set(COMMON_HEADERS
25-
include/common/color_alpha_property.hpp
26-
include/object_detection/object_polygon_detail.hpp
27-
include/object_detection/object_polygon_display_base.hpp
25+
include/autoware_auto_perception_rviz_plugin/common/color_alpha_property.hpp
26+
include/autoware_auto_perception_rviz_plugin/object_detection/object_polygon_detail.hpp
27+
include/autoware_auto_perception_rviz_plugin/object_detection/object_polygon_display_base.hpp
2828
)
2929

3030
set(COMMON_SRC

‎common/autoware_auto_perception_rviz_plugin/include/common/color_alpha_property.hpp ‎common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/common/color_alpha_property.hpp

+5-4
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
14-
#ifndef COMMON__COLOR_ALPHA_PROPERTY_HPP_
15-
#define COMMON__COLOR_ALPHA_PROPERTY_HPP_
14+
#ifndef AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__COMMON__COLOR_ALPHA_PROPERTY_HPP_
15+
#define AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__COMMON__COLOR_ALPHA_PROPERTY_HPP_
16+
17+
#include "autoware_auto_perception_rviz_plugin/visibility_control.hpp"
1618

1719
#include <rviz_common/display.hpp>
1820
#include <rviz_common/properties/color_property.hpp>
1921
#include <rviz_common/properties/float_property.hpp>
20-
#include <visibility_control.hpp>
2122

2223
#include <std_msgs/msg/color_rgba.hpp>
2324

@@ -55,4 +56,4 @@ class AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN_PUBLIC ColorAlphaProperty
5556
} // namespace rviz_plugins
5657
} // namespace autoware
5758

58-
#endif // COMMON__COLOR_ALPHA_PROPERTY_HPP_
59+
#endif // AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__COMMON__COLOR_ALPHA_PROPERTY_HPP_

‎common/autoware_auto_perception_rviz_plugin/include/object_detection/detected_objects_display.hpp ‎common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/object_detection/detected_objects_display.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
14-
#ifndef OBJECT_DETECTION__DETECTED_OBJECTS_DISPLAY_HPP_
15-
#define OBJECT_DETECTION__DETECTED_OBJECTS_DISPLAY_HPP_
14+
#ifndef AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__DETECTED_OBJECTS_DISPLAY_HPP_
15+
#define AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__DETECTED_OBJECTS_DISPLAY_HPP_
1616

17-
#include <object_detection/object_polygon_display_base.hpp>
17+
#include "autoware_auto_perception_rviz_plugin/object_detection/object_polygon_display_base.hpp"
1818

1919
#include <autoware_auto_perception_msgs/msg/detected_objects.hpp>
2020

@@ -43,4 +43,4 @@ class AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN_PUBLIC DetectedObjectsDisplay
4343
} // namespace rviz_plugins
4444
} // namespace autoware
4545

46-
#endif // OBJECT_DETECTION__DETECTED_OBJECTS_DISPLAY_HPP_
46+
#endif // AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__DETECTED_OBJECTS_DISPLAY_HPP_

‎common/autoware_auto_perception_rviz_plugin/include/object_detection/object_polygon_detail.hpp ‎common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/object_detection/object_polygon_detail.hpp

+5-4
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414
/// \brief This file defines some helper functions used by ObjectPolygonDisplayBase class
15-
#ifndef OBJECT_DETECTION__OBJECT_POLYGON_DETAIL_HPP_
16-
#define OBJECT_DETECTION__OBJECT_POLYGON_DETAIL_HPP_
15+
#ifndef AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__OBJECT_POLYGON_DETAIL_HPP_
16+
#define AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__OBJECT_POLYGON_DETAIL_HPP_
17+
18+
#include "autoware_auto_perception_rviz_plugin/visibility_control.hpp"
1719

1820
#include <rclcpp/logging.hpp>
1921
#include <rclcpp/rclcpp.hpp>
20-
#include <visibility_control.hpp>
2122

2223
#include <autoware_auto_perception_msgs/msg/detected_object.hpp>
2324
#include <autoware_auto_perception_msgs/msg/object_classification.hpp>
@@ -252,4 +253,4 @@ AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN_PUBLIC
252253
} // namespace rviz_plugins
253254
} // namespace autoware
254255

255-
#endif // OBJECT_DETECTION__OBJECT_POLYGON_DETAIL_HPP_
256+
#endif // AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__OBJECT_POLYGON_DETAIL_HPP_

‎common/autoware_auto_perception_rviz_plugin/include/object_detection/object_polygon_display_base.hpp ‎common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/object_detection/object_polygon_display_base.hpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
14-
#ifndef OBJECT_DETECTION__OBJECT_POLYGON_DISPLAY_BASE_HPP_
15-
#define OBJECT_DETECTION__OBJECT_POLYGON_DISPLAY_BASE_HPP_
14+
#ifndef AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__OBJECT_POLYGON_DISPLAY_BASE_HPP_
15+
#define AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__OBJECT_POLYGON_DISPLAY_BASE_HPP_
1616

17-
#include "common/color_alpha_property.hpp"
17+
#include "autoware_auto_perception_rviz_plugin/common/color_alpha_property.hpp"
18+
#include "autoware_auto_perception_rviz_plugin/object_detection/object_polygon_detail.hpp"
19+
#include "autoware_auto_perception_rviz_plugin/visibility_control.hpp"
1820

19-
#include <object_detection/object_polygon_detail.hpp>
2021
#include <rviz_common/display.hpp>
2122
#include <rviz_common/properties/color_property.hpp>
2223
#include <rviz_common/properties/enum_property.hpp>
2324
#include <rviz_common/properties/float_property.hpp>
2425
#include <rviz_default_plugins/displays/marker/marker_common.hpp>
2526
#include <rviz_default_plugins/displays/marker_array/marker_array_display.hpp>
26-
#include <visibility_control.hpp>
2727

2828
#include <autoware_auto_perception_msgs/msg/object_classification.hpp>
2929
#include <unique_identifier_msgs/msg/uuid.hpp>
@@ -449,4 +449,4 @@ class AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN_PUBLIC ObjectPolygonDisplayBase
449449
} // namespace rviz_plugins
450450
} // namespace autoware
451451

452-
#endif // OBJECT_DETECTION__OBJECT_POLYGON_DISPLAY_BASE_HPP_
452+
#endif // AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__OBJECT_POLYGON_DISPLAY_BASE_HPP_

‎common/autoware_auto_perception_rviz_plugin/include/object_detection/predicted_objects_display.hpp ‎common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/object_detection/predicted_objects_display.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
14-
#ifndef OBJECT_DETECTION__PREDICTED_OBJECTS_DISPLAY_HPP_
15-
#define OBJECT_DETECTION__PREDICTED_OBJECTS_DISPLAY_HPP_
14+
#ifndef AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__PREDICTED_OBJECTS_DISPLAY_HPP_
15+
#define AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__PREDICTED_OBJECTS_DISPLAY_HPP_
1616

17-
#include <object_detection/object_polygon_display_base.hpp>
17+
#include "autoware_auto_perception_rviz_plugin/object_detection/object_polygon_display_base.hpp"
1818

1919
#include <autoware_auto_perception_msgs/msg/predicted_objects.hpp>
2020

@@ -153,4 +153,4 @@ class AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN_PUBLIC PredictedObjectsDisplay
153153
} // namespace rviz_plugins
154154
} // namespace autoware
155155

156-
#endif // OBJECT_DETECTION__PREDICTED_OBJECTS_DISPLAY_HPP_
156+
#endif // AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__PREDICTED_OBJECTS_DISPLAY_HPP_

‎common/autoware_auto_perception_rviz_plugin/include/object_detection/tracked_objects_display.hpp ‎common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/object_detection/tracked_objects_display.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
14-
#ifndef OBJECT_DETECTION__TRACKED_OBJECTS_DISPLAY_HPP_
15-
#define OBJECT_DETECTION__TRACKED_OBJECTS_DISPLAY_HPP_
14+
#ifndef AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__TRACKED_OBJECTS_DISPLAY_HPP_
15+
#define AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__TRACKED_OBJECTS_DISPLAY_HPP_
1616

17-
#include <object_detection/object_polygon_display_base.hpp>
17+
#include "autoware_auto_perception_rviz_plugin/object_detection/object_polygon_display_base.hpp"
1818

1919
#include <autoware_auto_perception_msgs/msg/tracked_objects.hpp>
2020

@@ -114,4 +114,4 @@ class AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN_PUBLIC TrackedObjectsDisplay
114114
} // namespace rviz_plugins
115115
} // namespace autoware
116116

117-
#endif // OBJECT_DETECTION__TRACKED_OBJECTS_DISPLAY_HPP_
117+
#endif // AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__OBJECT_DETECTION__TRACKED_OBJECTS_DISPLAY_HPP_

‎common/autoware_auto_perception_rviz_plugin/include/visibility_control.hpp ‎common/autoware_auto_perception_rviz_plugin/include/autoware_auto_perception_rviz_plugin/visibility_control.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
//
1515
// Co-developed by Tier IV, Inc. and Apex.AI, Inc.
1616

17-
#ifndef VISIBILITY_CONTROL_HPP_
18-
#define VISIBILITY_CONTROL_HPP_
17+
#ifndef AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__VISIBILITY_CONTROL_HPP_
18+
#define AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__VISIBILITY_CONTROL_HPP_
1919

2020
#if defined(__WIN32)
2121
#if defined(AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN_BUILDING_DLL) || \
@@ -40,4 +40,4 @@
4040
#error "Unsupported Build Configuration"
4141
#endif // defined(_WINDOWS)
4242

43-
#endif // VISIBILITY_CONTROL_HPP_
43+
#endif // AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN__VISIBILITY_CONTROL_HPP_

‎common/autoware_auto_perception_rviz_plugin/src/common/color_alpha_property.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
//
1515
// Co-developed by Tier IV, Inc. and Apex.AI, Inc.
1616

17-
#include "common/color_alpha_property.hpp"
17+
#include "autoware_auto_perception_rviz_plugin/common/color_alpha_property.hpp"
1818

1919
#include <memory>
2020

‎common/autoware_auto_perception_rviz_plugin/src/object_detection/detected_objects_display.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
//
1515
// Co-developed by Tier IV, Inc. and Apex.AI, Inc.
1616

17-
#include <object_detection/detected_objects_display.hpp>
17+
#include "autoware_auto_perception_rviz_plugin/object_detection/detected_objects_display.hpp"
1818

1919
#include <memory>
2020

‎common/autoware_auto_perception_rviz_plugin/src/object_detection/object_polygon_detail.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License..
1414

15+
#include "autoware_auto_perception_rviz_plugin/object_detection/object_polygon_detail.hpp"
16+
1517
#include <Eigen/Core>
1618
#include <Eigen/Eigen>
17-
#include <object_detection/object_polygon_detail.hpp>
1819

1920
#include <geometry_msgs/msg/transform_stamped.hpp>
2021

‎common/autoware_auto_perception_rviz_plugin/src/object_detection/predicted_objects_display.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include <object_detection/predicted_objects_display.hpp>
15+
#include "autoware_auto_perception_rviz_plugin/object_detection/predicted_objects_display.hpp"
1616

1717
#include <memory>
1818
#include <set>

‎common/autoware_auto_perception_rviz_plugin/src/object_detection/tracked_objects_display.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
//
1515
// Co-developed by Tier IV, Inc. and Apex.AI, Inc.
1616

17-
#include <object_detection/tracked_objects_display.hpp>
17+
#include "autoware_auto_perception_rviz_plugin/object_detection/tracked_objects_display.hpp"
1818

1919
#include <memory>
2020

0 commit comments

Comments
 (0)