update docs

modules/aruco/include/opencv2/aruco.hpp

@@ -11,13 +11,24 @@ namespace cv {
 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
 */
 CV_EXPORTS_W void detectMarkers(InputArray image, const Ptr<Dictionary> &dictionary, OutputArrayOfArrays corners,
                                 OutputArray ids, const Ptr<DetectorParameters> &parameters = makePtr<DetectorParameters>(),
                                 OutputArrayOfArrays rejectedImgPoints = noArray());
 
-/**
+/** @brief refine detected markers
 @deprecated Use class ArucoDetector::refineDetectedMarkers
 */
 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(),
                                         const Ptr<DetectorParameters> &parameters = makePtr<DetectorParameters>());
 
-/**
-@deprecated Use Board::draw
+/** @brief draw planar board
+@deprecated Use Board::generateImage
 */
 CV_EXPORTS_W void drawPlanarBoard(const Ptr<Board> &board, Size outSize, OutputArray img, int marginSize,
                                   int borderBits);
 
-/**
+/** @brief get board object and image points
 @deprecated Use Board::matchImagePoints
 */
 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);
 
+//! @}
+
 }
 }
 

modules/aruco/include/opencv2/aruco/charuco.hpp

@@ -40,6 +40,8 @@ namespace aruco {
  * Only visible corners are returned. For each corner, its corresponding identifier is
  * also returned in charucoIds.
  * The function returns the number of interpolated corners.
+ *
+ * @deprecated Use CharucoDetector::detectBoard
  */
 CV_EXPORTS_W int interpolateCornersCharuco(InputArrayOfArrays markerCorners, InputArray markerIds,
                                            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 provided, the diamond search is based on reprojection. If not, diamond search is based on
  * homography. Homography is faster than reprojection, but less accurate.
+ *
+ * @deprecated Use CharucoDetector::detectDiamonds
  */
 CV_EXPORTS_W void detectCharucoDiamond(InputArray image, InputArrayOfArrays markerCorners,
                                        InputArray markerIds, float squareMarkerLengthRate,