From 8c45fef62aef62a4fa345b1fc0e7a44ac664736d Mon Sep 17 00:00:00 2001 From: "Cameron (3539)" Date: Thu, 20 Jun 2024 21:29:00 -0400 Subject: [PATCH] Support more charuco boards (#1348) Add support for the old opencv charuco board like calibio. Add support for other tag families while calibrating. Fix calibration issue index out of range with charuco missing points. --- .../cameras/CameraCalibrationCard.vue | 25 +++++- .../stores/settings/CameraSettingsStore.ts | 3 + photon-client/src/types/SettingTypes.ts | 7 ++ .../pipe/impl/FindBoardCornersPipe.java | 15 +++- .../vision/pipeline/Calibrate3dPipeline.java | 7 +- .../Calibration3dPipelineSettings.java | 4 +- .../vision/pipeline/UICalibrationData.java | 33 +++++++- .../vision/processes/VisionModule.java | 2 + .../vision/pipeline/Calibrate3dPipeTest.java | 76 +++++++++++++----- ...Cam_HD-3000_output_2024-06-21T02005125.jpg | Bin 0 -> 89925 bytes ...Cam_HD-3000_output_2024-06-21T02005226.jpg | Bin 0 -> 90328 bytes ...am_HD-3000_output_2024-06-21T020052961.jpg | Bin 0 -> 94325 bytes ...Cam_HD-3000_output_2024-06-21T02005493.jpg | Bin 0 -> 96396 bytes ...am_HD-3000_output_2024-06-21T020055961.jpg | Bin 0 -> 89742 bytes ...am_HD-3000_output_2024-06-21T020056994.jpg | Bin 0 -> 89370 bytes ...Cam_HD-3000_output_2024-06-21T02005825.jpg | Bin 0 -> 92782 bytes ...am_HD-3000_output_2024-06-21T020059726.jpg | Bin 0 -> 92475 bytes ...am_HD-3000_output_2024-06-21T020101794.jpg | Bin 0 -> 109636 bytes ...am_HD-3000_output_2024-06-21T020103957.jpg | Bin 0 -> 106383 bytes ...am_HD-3000_output_2024-06-21T020106926.jpg | Bin 0 -> 91984 bytes ...am_HD-3000_output_2024-06-21T020109358.jpg | Bin 0 -> 91741 bytes ...am_HD-3000_output_2024-06-21T020112560.jpg | Bin 0 -> 89552 bytes ...am_HD-3000_output_2024-06-21T015310739.jpg | Bin 0 -> 43209 bytes ...am_HD-3000_output_2024-06-21T015311541.jpg | Bin 0 -> 42129 bytes ...am_HD-3000_output_2024-06-21T015312704.jpg | Bin 0 -> 43253 bytes ...am_HD-3000_output_2024-06-21T015316741.jpg | Bin 0 -> 42323 bytes ...am_HD-3000_output_2024-06-21T015318241.jpg | Bin 0 -> 41515 bytes ...am_HD-3000_output_2024-06-21T015319973.jpg | Bin 0 -> 42607 bytes ...am_HD-3000_output_2024-06-21T015322905.jpg | Bin 0 -> 38386 bytes ...am_HD-3000_output_2024-06-21T015325172.jpg | Bin 0 -> 43238 bytes ...am_HD-3000_output_2024-06-21T015327636.jpg | Bin 0 -> 45002 bytes ...am_HD-3000_output_2024-06-21T015330572.jpg | Bin 0 -> 45468 bytes ...am_HD-3000_output_2024-06-21T015333973.jpg | Bin 0 -> 54633 bytes ...am_HD-3000_output_2024-06-21T015336104.jpg | Bin 0 -> 40603 bytes ...am_HD-3000_output_2024-06-21T015338437.jpg | Bin 0 -> 40123 bytes ...am_HD-3000_output_2024-06-21T015340306.jpg | Bin 0 -> 49188 bytes ...am_HD-3000_output_2024-06-21T015343306.jpg | Bin 0 -> 40187 bytes ...am_HD-3000_output_2024-06-21T015344769.jpg | Bin 0 -> 35960 bytes 38 files changed, 143 insertions(+), 29 deletions(-) create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_1280_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T02005125.jpg create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_1280_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T02005226.jpg create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_1280_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T020052961.jpg create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_1280_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T02005493.jpg create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_1280_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T020055961.jpg create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_1280_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T020056994.jpg create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_1280_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T02005825.jpg create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_1280_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T020059726.jpg create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_1280_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T020101794.jpg create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_1280_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T020103957.jpg create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_1280_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T020106926.jpg create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_1280_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T020109358.jpg create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_1280_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T020112560.jpg create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_480_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T015310739.jpg create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_480_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T015311541.jpg create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_480_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T015312704.jpg create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_480_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T015316741.jpg create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_480_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T015318241.jpg create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_480_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T015319973.jpg create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_480_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T015322905.jpg create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_480_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T015325172.jpg create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_480_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T015327636.jpg create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_480_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T015330572.jpg create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_480_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T015333973.jpg create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_480_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T015336104.jpg create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_480_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T015338437.jpg create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_480_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T015340306.jpg create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_480_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T015343306.jpg create mode 100644 test-resources/calibrationCharucoImg/lifecam/2024-06-19_lifecam_480_Old_Pattern/Microsoft_LifeCam_HD-3000_output_2024-06-21T015344769.jpg diff --git a/photon-client/src/components/cameras/CameraCalibrationCard.vue b/photon-client/src/components/cameras/CameraCalibrationCard.vue index dd6214042..c24cb4dbe 100644 --- a/photon-client/src/components/cameras/CameraCalibrationCard.vue +++ b/photon-client/src/components/cameras/CameraCalibrationCard.vue @@ -1,7 +1,7 @@