prepare remove diamond tutorial

Author: AleksandrPanov

modules/aruco/samples/calibrate_camera.cpp

@@ -4,7 +4,7 @@
 #include <opencv2/calib3d.hpp>
 #include <opencv2/highgui.hpp>
 #include <opencv2/imgproc.hpp>
-#include <opencv2/objdetect.hpp>
+#include <opencv2/objdetect/aruco_detector.hpp>
 #include "aruco_samples_utility.hpp"
 
 using namespace std;

modules/aruco/samples/calibrate_camera_charuco.cpp

@@ -3,7 +3,7 @@
 #include <opencv2/calib3d.hpp>
 #include <opencv2/highgui.hpp>
 #include <opencv2/imgproc.hpp>
-#include <opencv2/objdetect.hpp>
+#include <opencv2/objdetect/charuco_detector.hpp>
 #include "aruco_samples_utility.hpp"
 
 using namespace std;

modules/aruco/samples/detect_diamonds.cpp

@@ -1,8 +1,6 @@
 #include <opencv2/highgui.hpp>
-#include <opencv2/aruco/charuco.hpp>
 #include <vector>
 #include <iostream>
-#include <opencv2/objdetect/aruco_detector.hpp>
 #include <opencv2/objdetect/charuco_detector.hpp>
 #include "aruco_samples_utility.hpp"
 
@@ -27,7 +25,6 @@ const char* keys  =
         "{v        |       | Input from video file, if ommited, input comes from camera }"
         "{ci       | 0     | Camera id if input doesnt come from video (-v) }"
         "{dp       |       | File of marker detector parameters }"
-        "{rs       |       | Apply refind strategy }"
         "{refine   |       | Corner refinement: CORNER_REFINE_NONE=0, CORNER_REFINE_SUBPIX=1,"
         "CORNER_REFINE_CONTOUR=2, CORNER_REFINE_APRILTAG=3}";
 }

modules/aruco/tutorials/aruco_calibration/aruco_calibration.markdown

@@ -1,7 +1,7 @@
 Calibration with ArUco and ChArUco {#tutorial_aruco_calibration}
 ==============================
 
-@prev_tutorial{tutorial_charuco_diamond_detection}
+@prev_tutorial{tutorial_charuco_diamond_detection1}
 @next_tutorial{tutorial_aruco_faq}
 
 The ArUco module can also be used to calibrate a camera. Camera calibration consists in obtaining the

modules/aruco/tutorials/charuco_detection/charuco_detection.markdown

@@ -2,7 +2,7 @@ Detection of ChArUco Boards {#tutorial_charuco_detection1}
 ==============================
 
 @prev_tutorial{tutorial_aruco_board_detection}
-@next_tutorial{tutorial_charuco_diamond_detection}
+@next_tutorial{tutorial_charuco_diamond_detection1}
 
 ArUco markers and boards are very useful due to their fast detection and their versatility.
 However, one of the problems of ArUco markers is that the accuracy of their corner positions is not too high,
@@ -232,7 +232,7 @@ A full working example is included in the `detect_board_charuco.cpp` inside the
 The samples `detect_board_charuco.cpp` now take input via commandline via the `cv::CommandLineParser`. For this file the example
 parameters will look like:
 @code{.cpp}
-    -w=5 -h=7 -sl=0.04 -ml=0.02 -d=10 -dp="_path_/detector_params.yml"
+    -w=5 -h=7 -sl=0.04 -ml=0.02 -d=10
     -v=/path_to_aruco_tutorials/charuco_detection/images/choriginal.jpg
     -c=/path_to_aruco_samples/tutorial_camera_charuco.yml
 @endcode

modules/aruco/tutorials/charuco_detection/images/charucoboard.png

@@ -1,4 +1,4 @@
-Detection of Diamond Markers {#tutorial_charuco_diamond_detection}
+Detection of Diamond Markers {#tutorial_charuco_diamond_detection1}
 ==============================
 
 @prev_tutorial{tutorial_charuco_detection1}

modules/aruco/tutorials/charuco_detection/images/charucodefinition.png

@@ -40,7 +40,7 @@ and without artifacts.
 
     Basic detection using ChArUco corners
 
--   @subpage tutorial_charuco_diamond_detection
+-   @subpage tutorial_charuco_diamond_detection1
 
     *Compatibility:* \> OpenCV 3.0