Skip to content

Commit d6d1f62

Browse files
authored
rename project to ssct (#8)
* rename project to ssct * format code
1 parent bd60256 commit d6d1f62

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+223
-224
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ jobs:
2222
skip-tests: true
2323
- name: Remove flake8-quotes flake8-import-order for linter
2424
run: /usr/bin/bash -c "apt-get remove -y python3-flake8-quotes python3-flake8-import-order"
25-
- name: Test calibration_interfaces
25+
- name: Test ssct_interfaces
2626
run: |
27-
/usr/bin/bash .github/workflows/colcon_test.sh calibration_interfaces
28-
- name: Test calibration_common
27+
/usr/bin/bash .github/workflows/colcon_test.sh ssct_interfaces
28+
- name: Test ssct_common
2929
run: |
30-
/usr/bin/bash .github/workflows/colcon_test.sh calibration_common
31-
- name: Test camera_intrinsic_calibration
30+
/usr/bin/bash .github/workflows/colcon_test.sh ssct_common
31+
- name: Test ssct_camera_intrinsic_calib
3232
run: |
33-
/usr/bin/bash .github/workflows/colcon_test.sh camera_intrinsic_calibration
34-
- name: Test lidar_camera_manual_calibration
33+
/usr/bin/bash .github/workflows/colcon_test.sh ssct_camera_intrinsic_calib
34+
- name: Test ssct_lidar_cam_manual_calib
3535
run: |
36-
/usr/bin/bash .github/workflows/colcon_test.sh lidar_camera_manual_calibration
36+
/usr/bin/bash .github/workflows/colcon_test.sh ssct_lidar_cam_manual_calib

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# sensor_calibration
1+
# simple sensor calibration toolbox (SSCT)
22

33
[![Build and Test](https://github.com/gezp/sensor_calibration/actions/workflows/ci.yml/badge.svg?branch=humble)](https://github.com/gezp/sensor_calibration/actions/workflows/ci.yml)
44

@@ -40,15 +40,15 @@ colcon build --symlink-install
4040

4141
传感器内参标定
4242

43-
- [x] 实现针孔相机内参标定: `camera_intrinsic_calibration`
44-
- [ ] 实现鱼眼相机内参标定: `camera_intrinsic_calibration`
45-
- [ ] 实现全景相机内参标定: `camera_intrinsic_calibration`
43+
- [x] 实现针孔相机内参标定: `ssct_camera_intrinsic_calib`
44+
- [ ] 实现鱼眼相机内参标定: `ssct_camera_intrinsic_calib`
45+
- [ ] 实现全景相机内参标定: `ssct_camera_intrinsic_calib`
4646

4747
sensor2sensor外参标定
4848

49-
- [ ] 实现手动lidar2lidar外参标定: `lidar_lidar_manual_calibration`
50-
- [ ] 实现基于ICP的自动lidar2lidar外参标定: `lidar_lidar_calibration`
51-
- [x] 实现手动lidar2camera外参标定: `lidar_camera_manual_calibration`
49+
- [ ] 实现手动lidar2lidar外参标定: `ssct_lidar_lidar_calib`
50+
- [ ] 实现基于ICP的自动lidar2lidar外参标定: `ssct_lidar_lidar_calib`
51+
- [x] 实现手动lidar2camera外参标定: `ssct_lidar_cam_manual_calib`
5252

5353

5454
## Acknowledgement

camera_intrinsic_calibration/CMakeLists.txt renamed to ssct_camera_intrinsic_calib/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.5)
2-
project(camera_intrinsic_calibration)
2+
project(ssct_camera_intrinsic_calib)
33

44
# Default to C++17
55
if(NOT CMAKE_CXX_STANDARD)
@@ -10,8 +10,8 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
1010
endif()
1111

1212
find_package(ament_cmake REQUIRED)
13-
find_package(calibration_common REQUIRED)
14-
find_package(calibration_interfaces REQUIRED)
13+
find_package(ssct_common REQUIRED)
14+
find_package(ssct_interfaces REQUIRED)
1515
find_package(Ceres REQUIRED)
1616
find_package(Sophus REQUIRED)
1717
find_package(OpenCV REQUIRED)
@@ -21,8 +21,8 @@ include_directories(include)
2121

2222
# libaray
2323
set(dependencies
24-
calibration_common
25-
calibration_interfaces
24+
ssct_common
25+
ssct_interfaces
2626
)
2727

2828
add_library(${PROJECT_NAME} SHARED

camera_intrinsic_calibration/README.md renamed to ssct_camera_intrinsic_calib/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# camera_intrinsic_calibration
1+
# ssct_camera_intrinsic_calib
22

33
这个包提供了相机内参标定的工具,目前已经实现的`calibrator`有:
44

@@ -21,7 +21,7 @@ mkdir ~/calibration_data
2121
运行标定demo程序
2222

2323
```bash
24-
ros2 launch camera_intrinsic_calibration demo.launch.py
24+
ros2 launch ssct_camera_intrinsic_calib demo.launch.py
2525
```
2626

2727
* 默认情况下需要使用GUI客户端启动标定流程,如果想要标定程序自动开启标定流程并保存结果,并不使用GUI,可设置`calibration_node`的参数`autostart``True`
@@ -31,7 +31,7 @@ ros2 launch camera_intrinsic_calibration demo.launch.py
3131
运行标定GUI客户端
3232

3333
```bash
34-
ros2 run camera_intrinsic_calibration calibration_client.py
34+
ros2 run ssct_camera_intrinsic_calib calibration_client.py
3535
```
3636

3737
* 基于Qt的图形化界面,可以查看标定过程的标定信息,以及控制标定程序的流程。
Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
#include <deque>
2121

2222
#include "rclcpp/rclcpp.hpp"
23-
#include "calibration_common/publisher/image_publisher.hpp"
24-
#include "calibration_common/subscriber/image_subscriber.hpp"
25-
#include "calibration_common/calibration_params.hpp"
26-
#include "camera_intrinsic_calibration/pinhole_calibrator.hpp"
27-
#include "calibration_interfaces/msg/calibration_status.hpp"
28-
#include "calibration_interfaces/msg/calibration_command.hpp"
23+
#include "ssct_common/publisher/image_publisher.hpp"
24+
#include "ssct_common/subscriber/image_subscriber.hpp"
25+
#include "ssct_common/calibration_params.hpp"
26+
#include "ssct_camera_intrinsic_calib/pinhole_calibrator.hpp"
27+
#include "ssct_interfaces/msg/calibration_status.hpp"
28+
#include "ssct_interfaces/msg/calibration_command.hpp"
2929

30-
namespace camera_intrinsic_calibration
30+
namespace ssct_camera_intrinsic_calib
3131
{
3232

3333
class CalibrationNode
@@ -57,10 +57,10 @@ class CalibrationNode
5757
private:
5858
rclcpp::Node::SharedPtr node_;
5959
rclcpp::TimerBase::SharedPtr timer_;
60-
std::shared_ptr<calibration_common::ImageSubscriber> image_sub_;
61-
rclcpp::Subscription<calibration_interfaces::msg::CalibrationCommand>::SharedPtr cmd_sub_;
62-
rclcpp::Publisher<calibration_interfaces::msg::CalibrationStatus>::SharedPtr status_pub_;
63-
std::shared_ptr<calibration_common::ImagePublisher> debug_image_pub_;
60+
std::shared_ptr<ssct_common::ImageSubscriber> image_sub_;
61+
rclcpp::Subscription<ssct_interfaces::msg::CalibrationCommand>::SharedPtr cmd_sub_;
62+
rclcpp::Publisher<ssct_interfaces::msg::CalibrationStatus>::SharedPtr status_pub_;
63+
std::shared_ptr<ssct_common::ImagePublisher> debug_image_pub_;
6464
std::shared_ptr<PinholeCalibrator> calibrator_;
6565
// param
6666
std::string frame_id_{"camera"};
@@ -72,16 +72,16 @@ class CalibrationNode
7272
bool exit_{false};
7373
// data
7474
std::deque<SensorData> sensor_data_buffer_;
75-
std::shared_ptr<calibration_common::CalibrationParams> calibration_params_;
75+
std::shared_ptr<ssct_common::CalibrationParams> calibration_params_;
7676
uint8_t state_;
7777
bool success_{false};
7878
bool is_auto_mode_{true};
7979
bool need_collect_once_{false};
8080
bool need_optimize_once_{false};
81-
calibration_interfaces::msg::CalibrationStatus status_msg_;
81+
ssct_interfaces::msg::CalibrationStatus status_msg_;
8282
std::mutex status_mutex_;
8383
//
84-
std::deque<calibration_interfaces::msg::CalibrationCommand> command_msgs_;
84+
std::deque<ssct_interfaces::msg::CalibrationCommand> command_msgs_;
8585
std::mutex command_mutex_;
8686
};
87-
} // namespace camera_intrinsic_calibration
87+
} // namespace ssct_camera_intrinsic_calib
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#include "opencv2/opencv.hpp"
2626

27-
namespace camera_intrinsic_calibration
27+
namespace ssct_camera_intrinsic_calib
2828
{
2929

3030
class PinholeCalibrator
@@ -68,4 +68,4 @@ class PinholeCalibrator
6868
cv::Mat debug_image_;
6969
};
7070

71-
} // namespace camera_intrinsic_calibration
71+
} // namespace ssct_camera_intrinsic_calib

camera_intrinsic_calibration/launch/demo.launch.py renamed to ssct_camera_intrinsic_calib/launch/demo.launch.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ def generate_launch_description():
2424
os.environ["HOME"], "calibration_data", "SensorsCalibration"
2525
)
2626
camera_data_dir = os.path.join(data_dir, "camera_intrinsic")
27-
pkg_camera_intrinsic_calibration = get_package_share_directory(
28-
"camera_intrinsic_calibration"
27+
pkg_ssct_camera_intrinsic_calib = get_package_share_directory(
28+
"ssct_camera_intrinsic_calib"
2929
)
3030
calibrator_config = os.path.join(
31-
pkg_camera_intrinsic_calibration, "config", "calibrator.yaml"
31+
pkg_ssct_camera_intrinsic_calib, "config", "calibrator.yaml"
3232
)
3333
calibration_result = os.path.join(
3434
os.environ["HOME"], "calibration_data", "result.yaml"
3535
)
3636
dummy_camera_node = Node(
3737
name="dummy_camera_node",
38-
package="calibration_common",
38+
package="ssct_common",
3939
executable="dummy_camera_node",
4040
parameters=[
4141
{
@@ -48,7 +48,7 @@ def generate_launch_description():
4848
)
4949
calibration_node = Node(
5050
name="camera_intrisic_calibration_node",
51-
package="camera_intrinsic_calibration",
51+
package="ssct_camera_intrinsic_calib",
5252
executable="calibration_node",
5353
parameters=[
5454
{
@@ -62,7 +62,7 @@ def generate_launch_description():
6262
)
6363
calibration_client = Node(
6464
name="calibration_client",
65-
package="camera_intrinsic_calibration",
65+
package="ssct_camera_intrinsic_calib",
6666
executable="calibration_client.py",
6767
output="screen",
6868
)

camera_intrinsic_calibration/package.xml renamed to ssct_camera_intrinsic_calib/package.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0"?>
22
<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="2">
4-
<name>camera_intrinsic_calibration</name>
4+
<name>ssct_camera_intrinsic_calib</name>
55
<version>0.1.0</version>
6-
<description>The camera_intrinsic_calibration package</description>
6+
<description>The ssct_camera_intrinsic_calib package</description>
77
<maintainer email="zhenpeng.ge@qq.com">Zhenpeng Ge</maintainer>
88
<license>Apache-2.0</license>
99
<buildtool_depend>ament_cmake</buildtool_depend>
1010

11-
<depend>calibration_common</depend>
12-
<depend>calibration_interfaces</depend>
11+
<depend>ssct_common</depend>
12+
<depend>ssct_interfaces</depend>
1313
<depend>libceres-dev</depend>
1414
<depend>sophus</depend>
1515

camera_intrinsic_calibration/scripts/calibration_client.py renamed to ssct_camera_intrinsic_calib/scripts/calibration_client.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import cv2
3636
from cv_bridge import CvBridge
3737

38-
from calibration_interfaces.msg import CalibrationCommand, CalibrationStatus
38+
from ssct_interfaces.msg import CalibrationCommand, CalibrationStatus
3939
import sensor_msgs
4040

4141

@@ -149,7 +149,7 @@ def btn_refresh_callback(self):
149149
topics = self.ros_node.get_topic_names_and_types()
150150
valid_topics = []
151151
for data in topics:
152-
if data[1][0] == "calibration_interfaces/msg/CalibrationStatus":
152+
if data[1][0] == "ssct_interfaces/msg/CalibrationStatus":
153153
valid_topics.append(data[0])
154154
self.comboBox.clear()
155155
self.comboBox.addItems(valid_topics)
@@ -207,7 +207,7 @@ def initialize_calibration_status(self, msg: CalibrationStatus):
207207
for btn in self.btn_commands:
208208
btn.setEnabled(True)
209209
self.initialized = True
210-
if msg.calibration_type != "camera_intrinsic_calibration":
210+
if msg.calibration_type != "ssct_camera_intrinsic_calib":
211211
return
212212
# debug image
213213
debug_topic = "/calibration/camera_intrinsic/" + msg.frame_id + "/debug_image"

0 commit comments

Comments
 (0)