opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-16 22:35:51 +08:00
Code Issues Releases Wiki Activity

update docs

Browse Source
This commit is contained in:
AleksandrPanov
2022-12-22 20:32:18 +03:00
parent 522bba3d37
commit e2ba6ca3f6
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/aruco/include/opencv2/aruco.hpp
View File

@@ -11,13 +11,24 @@ namespace cv {
namespace aruco { namespace aruco {
/** /**
* @defgroup aruco Aruco markers, module functionality was moved to objdetect module
* @{
* ArUco Marker Detection, module functionality was moved to objdetect module
* @sa ArucoDetector, CharucoDetector, Board, GridBoard, CharucoBoard
* @}
*/
//! @addtogroup aruco
//! @{
/** @brief detect markers
@deprecated Use class ArucoDetector::detectMarkers @deprecated Use class ArucoDetector::detectMarkers
*/ */
CV_EXPORTS_W void detectMarkers(InputArray image, const Ptr<Dictionary> &dictionary, OutputArrayOfArrays corners, CV_EXPORTS_W void detectMarkers(InputArray image, const Ptr<Dictionary> &dictionary, OutputArrayOfArrays corners,
OutputArray ids, const Ptr<DetectorParameters> &parameters = makePtr<DetectorParameters>(), OutputArray ids, const Ptr<DetectorParameters> &parameters = makePtr<DetectorParameters>(),
OutputArrayOfArrays rejectedImgPoints = noArray()); OutputArrayOfArrays rejectedImgPoints = noArray());
/** /** @brief refine detected markers
@deprecated Use class ArucoDetector::refineDetectedMarkers @deprecated Use class ArucoDetector::refineDetectedMarkers
*/ */
CV_EXPORTS_W void refineDetectedMarkers(InputArray image,const Ptr<Board> &board, CV_EXPORTS_W void refineDetectedMarkers(InputArray image,const Ptr<Board> &board,
@@ -28,13 +39,13 @@ CV_EXPORTS_W void refineDetectedMarkers(InputArray image,const Ptr<Board> &boar
bool checkAllOrders = true, OutputArray recoveredIdxs = noArray(), bool checkAllOrders = true, OutputArray recoveredIdxs = noArray(),
const Ptr<DetectorParameters> &parameters = makePtr<DetectorParameters>()); const Ptr<DetectorParameters> &parameters = makePtr<DetectorParameters>());
/** /** @brief draw planar board
@deprecated Use Board::draw @deprecated Use Board::generateImage
*/ */
CV_EXPORTS_W void drawPlanarBoard(const Ptr<Board> &board, Size outSize, OutputArray img, int marginSize, CV_EXPORTS_W void drawPlanarBoard(const Ptr<Board> &board, Size outSize, OutputArray img, int marginSize,
int borderBits); int borderBits);
/** /** @brief get board object and image points
@deprecated Use Board::matchImagePoints @deprecated Use Board::matchImagePoints
*/ */
CV_EXPORTS_W void getBoardObjectAndImagePoints(const Ptr<Board> &board, InputArrayOfArrays detectedCorners, CV_EXPORTS_W void getBoardObjectAndImagePoints(const Ptr<Board> &board, InputArrayOfArrays detectedCorners,
@@ -144,6 +155,8 @@ CV_EXPORTS_W void estimatePoseSingleMarkers(InputArrayOfArrays corners, float ma
*/ */
CV_EXPORTS_W bool testCharucoCornersCollinear(const Ptr<CharucoBoard> &board, InputArray charucoIds); CV_EXPORTS_W bool testCharucoCornersCollinear(const Ptr<CharucoBoard> &board, InputArray charucoIds);
//! @}
} }
} }

4
modules/aruco/include/opencv2/aruco/charuco.hpp
View File

@@ -40,6 +40,8 @@ namespace aruco {
* Only visible corners are returned. For each corner, its corresponding identifier is * Only visible corners are returned. For each corner, its corresponding identifier is
* also returned in charucoIds. * also returned in charucoIds.
* The function returns the number of interpolated corners. * The function returns the number of interpolated corners.
*
* @deprecated Use CharucoDetector::detectBoard
*/ */
CV_EXPORTS_W int interpolateCornersCharuco(InputArrayOfArrays markerCorners, InputArray markerIds, CV_EXPORTS_W int interpolateCornersCharuco(InputArrayOfArrays markerCorners, InputArray markerIds,
InputArray image, const Ptr<CharucoBoard> &board, InputArray image, const Ptr<CharucoBoard> &board,
@@ -69,6 +71,8 @@ CV_EXPORTS_W int interpolateCornersCharuco(InputArrayOfArrays markerCorners, Inp
* are returned in the diamondCorners and diamondIds parameters. If camera calibration parameters * are returned in the diamondCorners and diamondIds parameters. If camera calibration parameters
* are provided, the diamond search is based on reprojection. If not, diamond search is based on * are provided, the diamond search is based on reprojection. If not, diamond search is based on
* homography. Homography is faster than reprojection, but less accurate. * homography. Homography is faster than reprojection, but less accurate.
*
* @deprecated Use CharucoDetector::detectDiamonds
*/ */
CV_EXPORTS_W void detectCharucoDiamond(InputArray image, InputArrayOfArrays markerCorners, CV_EXPORTS_W void detectCharucoDiamond(InputArray image, InputArrayOfArrays markerCorners,
InputArray markerIds, float squareMarkerLengthRate, InputArray markerIds, float squareMarkerLengthRate,