mirror of
https://github.com/PhotonVision/photonvision
synced 2026-06-28 02:11:40 +00:00
Fix "ArUco" and "ChAruCo" spellings (#2184)
## Description Looks like this is the convention from a quick Google search. ## Meta Merge checklist: - [x] Pull Request title is [short, imperative summary](https://cbea.ms/git-commit/) of proposed changes - [x] The description documents the _what_ and _why_ - [ ] This PR has been [linted](https://docs.photonvision.org/en/latest/docs/contributing/linting.html). - [ ] If this PR changes behavior or adds a feature, user documentation is updated - [ ] If this PR touches photon-serde, all messages have been regenerated and hashes have not changed unexpectedly - [ ] If this PR touches configuration, this is backwards compatible with settings back to v2025.3.2 - [ ] If this PR touches pipeline settings or anything related to data exchange, the frontend typing is updated - [ ] If this PR addresses a bug, a regression test for it is added
This commit is contained in:
@@ -90,7 +90,7 @@ public class PhotonArucoDetector implements Releasable {
|
||||
// each detection has a Mat of corners
|
||||
Mat cornerMat = cornerMats.get(i);
|
||||
|
||||
// Aruco detection returns corners (BR, BL, TL, TR).
|
||||
// ArUco detection returns corners (BR, BL, TL, TR).
|
||||
// For parity with AprilTags and photonlib, we want (BL, BR, TR, TL).
|
||||
double[] xCorners = {
|
||||
cornerMat.get(0, 1)[0],
|
||||
|
||||
@@ -280,14 +280,14 @@ public class FindBoardCornersPipe
|
||||
}
|
||||
board.matchImagePoints(detectedCornersList, detectedIds, objPoints, imgPoints);
|
||||
|
||||
// draw the charuco board
|
||||
// Draw the ChArUco board
|
||||
Objdetect.drawDetectedCornersCharuco(
|
||||
outFrame, detectedCorners, detectedIds, new Scalar(0, 0, 255)); // Red Text
|
||||
|
||||
imgPoints.copyTo(outBoardCorners);
|
||||
objPoints.copyTo(objPts);
|
||||
|
||||
// Since charuco can still detect without the whole board we need to send "fake" (all
|
||||
// Since ChaArUco can still detect without the whole board we need to send "fake" (all
|
||||
// values less than zero) points and then tell it to ignore that corner by setting the
|
||||
// corresponding level to -1. Calibrate3dPipe deals with piping this into the correct format
|
||||
// for each backend
|
||||
@@ -321,7 +321,7 @@ public class FindBoardCornersPipe
|
||||
detectedCorners.release();
|
||||
detectedIds.release();
|
||||
|
||||
} else { // If not Charuco then do chessboard
|
||||
} else { // If not ChArUco then do chessboard
|
||||
// Reduce the image size to be much more manageable
|
||||
// Note that opencv will copy the frame if no resize is requested; we can skip
|
||||
// this since we
|
||||
|
||||
@@ -253,7 +253,7 @@ public class PipelineManager {
|
||||
new AprilTagPipeline((AprilTagPipelineSettings) desiredPipelineSettings);
|
||||
}
|
||||
case Aruco -> {
|
||||
logger.debug("Creating Aruco Pipeline");
|
||||
logger.debug("Creating ArUco Pipeline");
|
||||
currentUserPipeline = new ArucoPipeline((ArucoPipelineSettings) desiredPipelineSettings);
|
||||
}
|
||||
case ObjectDetection -> {
|
||||
|
||||
Reference in New Issue
Block a user