diff --git a/modules/ccalib/tutorial/data/omni_calib_data.xml b/modules/ccalib/tutorials/data/omni_calib_data.xml similarity index 100% rename from modules/ccalib/tutorial/data/omni_calib_data.xml rename to modules/ccalib/tutorials/data/omni_calib_data.xml diff --git a/modules/ccalib/tutorial/data/omni_stereocalib_data.xml b/modules/ccalib/tutorials/data/omni_stereocalib_data.xml similarity index 100% rename from modules/ccalib/tutorial/data/omni_stereocalib_data.xml rename to modules/ccalib/tutorials/data/omni_stereocalib_data.xml diff --git a/modules/ccalib/tutorial/img/disparity.jpg b/modules/ccalib/tutorials/img/disparity.jpg similarity index 100% rename from modules/ccalib/tutorial/img/disparity.jpg rename to modules/ccalib/tutorials/img/disparity.jpg diff --git a/modules/ccalib/tutorial/img/imgs.jpg b/modules/ccalib/tutorials/img/imgs.jpg similarity index 100% rename from modules/ccalib/tutorial/img/imgs.jpg rename to modules/ccalib/tutorials/img/imgs.jpg diff --git a/modules/ccalib/tutorial/img/lines.jpg b/modules/ccalib/tutorials/img/lines.jpg similarity index 100% rename from modules/ccalib/tutorial/img/lines.jpg rename to modules/ccalib/tutorials/img/lines.jpg diff --git a/modules/ccalib/tutorial/img/pattern_img.jpg b/modules/ccalib/tutorials/img/pattern_img.jpg similarity index 100% rename from modules/ccalib/tutorial/img/pattern_img.jpg rename to modules/ccalib/tutorials/img/pattern_img.jpg diff --git a/modules/ccalib/tutorial/img/pointCloud.jpg b/modules/ccalib/tutorials/img/pointCloud.jpg similarity index 100% rename from modules/ccalib/tutorial/img/pointCloud.jpg rename to modules/ccalib/tutorials/img/pointCloud.jpg diff --git a/modules/ccalib/tutorial/img/random_pattern.jpg b/modules/ccalib/tutorials/img/random_pattern.jpg similarity index 100% rename from modules/ccalib/tutorial/img/random_pattern.jpg rename to modules/ccalib/tutorials/img/random_pattern.jpg diff --git a/modules/ccalib/tutorial/img/sample.jpg b/modules/ccalib/tutorials/img/sample.jpg similarity index 100% rename from modules/ccalib/tutorial/img/sample.jpg rename to modules/ccalib/tutorials/img/sample.jpg diff --git a/modules/ccalib/tutorial/img/sample_rec_cyl.jpg b/modules/ccalib/tutorials/img/sample_rec_cyl.jpg similarity index 100% rename from modules/ccalib/tutorial/img/sample_rec_cyl.jpg rename to modules/ccalib/tutorials/img/sample_rec_cyl.jpg diff --git a/modules/ccalib/tutorial/img/sample_rec_log.jpg b/modules/ccalib/tutorials/img/sample_rec_log.jpg similarity index 100% rename from modules/ccalib/tutorial/img/sample_rec_log.jpg rename to modules/ccalib/tutorials/img/sample_rec_log.jpg diff --git a/modules/ccalib/tutorial/img/sample_rec_per.jpg b/modules/ccalib/tutorials/img/sample_rec_per.jpg similarity index 100% rename from modules/ccalib/tutorial/img/sample_rec_per.jpg rename to modules/ccalib/tutorials/img/sample_rec_per.jpg diff --git a/modules/ccalib/tutorial/img/sample_rec_ste.jpg b/modules/ccalib/tutorials/img/sample_rec_ste.jpg similarity index 100% rename from modules/ccalib/tutorial/img/sample_rec_ste.jpg rename to modules/ccalib/tutorials/img/sample_rec_ste.jpg diff --git a/modules/ccalib/tutorial/multi_camera_tutorial.markdown b/modules/ccalib/tutorials/multi_camera_tutorial.markdown similarity index 100% rename from modules/ccalib/tutorial/multi_camera_tutorial.markdown rename to modules/ccalib/tutorials/multi_camera_tutorial.markdown diff --git a/modules/ccalib/tutorial/omnidir_tutorial.markdown b/modules/ccalib/tutorials/omnidir_tutorial.markdown similarity index 93% rename from modules/ccalib/tutorial/omnidir_tutorial.markdown rename to modules/ccalib/tutorials/omnidir_tutorial.markdown index 388fcb604..4460d43b4 100644 --- a/modules/ccalib/tutorial/omnidir_tutorial.markdown +++ b/modules/ccalib/tutorials/omnidir_tutorial.markdown @@ -49,7 +49,7 @@ std::vector rvecs, tvecs; double rms = cv::omnidir::calibrate(objectPoints, imagePoints, imgSize, K, xi, D, rvecs, tvecs, flags, critia, idx); ``` -```K```, ```xi```, ```D``` are internal parameters and ```rvecs```, ```tvecs``` are external parameters that store the pose of patterns. All of them have depth of ```CV_64F```. The ```xi``` is a single value variable of Mei's model. ```idx``` is a ```CV_32S``` Mat that stores indices of images that are really used in calibration. This is due to some images are failed in the initialization step so they are not used in the final optimization. The returned value *rms* is the root mean square of reprojection errors. +`K`, ```xi```, ```D``` are internal parameters and ```rvecs```, ```tvecs``` are external parameters that store the pose of patterns. All of them have depth of ```CV_64F```. The ```xi``` is a single value variable of Mei's model. ```idx``` is a ```CV_32S``` Mat that stores indices of images that are really used in calibration. This is due to some images are failed in the initialization step so they are not used in the final optimization. The returned value *rms* is the root mean square of reprojection errors. The calibration supports some features, *flags* is a enumeration for some features, including: @@ -64,7 +64,7 @@ The calibration supports some features, *flags* is a enumeration for some featur Your can specify ```flags``` to fix parameters during calibration. Use 'plus' operator to set multiple features. For example, ```CALIB_FIX_SKEW+CALIB_FIX_K1``` means fixing skew and K1. -```critia``` is the stopping critia during optimization, set it to be, for example, cv::TermCriteria(cv::TermCriteria::COUNT + cv::TermCriteria::EPS, 200, 0.0001), which means using 200 iterations and stopping when relative change is smaller than 0.0001. +`criteria` is the stopping criteria during optimization, set it to be, for example, cv::TermCriteria(cv::TermCriteria::COUNT + cv::TermCriteria::EPS, 200, 0.0001), which means using 200 iterations and stopping when relative change is smaller than 0.0001. Stereo Calibration -------------------------- @@ -91,7 +91,7 @@ int flags = 0; cv::TermCriteria critia(cv::TermCriteria::COUNT + cv::TermCriteria::EPS, 200, 0.0001); std::vector rvecsL, tvecsL; cv::Mat rvec, tvec; -double rms = cv::omnidir::calibrate(objectPoints, imagePoints1, imagePoints2, imgSize1, imgSize2, K1, xi1, D1, K2, xi2, D2, rvec, tvec, rvecsL, tvecsL, flags, critia, idx); +double rms = cv::omnidir::stereoCalibrate(objectPoints, imagePoints1, imagePoints2, imgSize1, imgSize2, K1, xi1, D1, K2, xi2, D2, rvec, tvec, rvecsL, tvecsL, flags, critia, idx); ``` Here ```rvec``` and ```tvec``` are the transform between the first and the second camera. ```rvecsL``` and ```tvecsL``` are the transforms between patterns and the first camera.