From 619e038de97906ace6fbc555e257ddae65cae6a5 Mon Sep 17 00:00:00 2001 From: Markus Heck Date: Sat, 10 Sep 2022 17:40:31 +0200 Subject: [PATCH] move tutorial to imgproc and example to ImgTrans --- .../generalized_hough_ballard_guil.markdown | 13 +++++++------ .../images/generalized_hough_image.jpg | Bin .../generalized_hough_less_perfect_result_img.jpg | Bin .../images/generalized_hough_mini_image.jpg | Bin .../images/generalized_hough_mini_template.jpg | Bin .../images/generalized_hough_result_img.jpg | Bin .../images/generalized_hough_template.jpg | Bin .../imgtrans/hough_circle/hough_circle.markdown | 2 +- .../imgproc/imgtrans/remap/remap.markdown | 2 +- .../imgproc/table_of_content_imgproc.markdown | 10 ++++++++++ .../objdetect/table_of_content_objdetect.markdown | 10 ---------- doc/tutorials/objdetect/traincascade.markdown | 1 - .../generalizedHoughTransform.cpp | 0 13 files changed, 19 insertions(+), 19 deletions(-) rename doc/tutorials/{objdetect => imgproc}/generalized_hough_ballard_guil/generalized_hough_ballard_guil.markdown (81%) rename doc/tutorials/{objdetect => imgproc}/generalized_hough_ballard_guil/images/generalized_hough_image.jpg (100%) rename doc/tutorials/{objdetect => imgproc}/generalized_hough_ballard_guil/images/generalized_hough_less_perfect_result_img.jpg (100%) rename doc/tutorials/{objdetect => imgproc}/generalized_hough_ballard_guil/images/generalized_hough_mini_image.jpg (100%) rename doc/tutorials/{objdetect => imgproc}/generalized_hough_ballard_guil/images/generalized_hough_mini_template.jpg (100%) rename doc/tutorials/{objdetect => imgproc}/generalized_hough_ballard_guil/images/generalized_hough_result_img.jpg (100%) rename doc/tutorials/{objdetect => imgproc}/generalized_hough_ballard_guil/images/generalized_hough_template.jpg (100%) rename samples/cpp/tutorial_code/{objectDetection => ImgTrans}/generalizedHoughTransform.cpp (100%) diff --git a/doc/tutorials/objdetect/generalized_hough_ballard_guil/generalized_hough_ballard_guil.markdown b/doc/tutorials/imgproc/generalized_hough_ballard_guil/generalized_hough_ballard_guil.markdown similarity index 81% rename from doc/tutorials/objdetect/generalized_hough_ballard_guil/generalized_hough_ballard_guil.markdown rename to doc/tutorials/imgproc/generalized_hough_ballard_guil/generalized_hough_ballard_guil.markdown index c5dc2590af..edf18b3844 100644 --- a/doc/tutorials/objdetect/generalized_hough_ballard_guil/generalized_hough_ballard_guil.markdown +++ b/doc/tutorials/imgproc/generalized_hough_ballard_guil/generalized_hough_ballard_guil.markdown @@ -3,7 +3,8 @@ Object detection with Generalized Ballard and Guil Hough Transform {#tutorial_ge @tableofcontents -@prev_tutorial{tutorial_traincascade} +@prev_tutorial{tutorial_hough_circle} +@next_tutorial{tutorial_remap} Goal ---- @@ -39,14 +40,14 @@ Example ### Code The complete code for this tutorial is shown below. -@include samples/cpp/tutorial_code/objectDetection/generalizedHoughTransform.cpp +@include samples/cpp/tutorial_code/ImgTrans/generalizedHoughTransform.cpp Explanation ----------- ### Load image, template and setup variables -@snippet samples/cpp/tutorial_code/objectDetection/generalizedHoughTransform.cpp generalized-hough-transform-load-and-setup +@snippet samples/cpp/tutorial_code/ImgTrans/generalizedHoughTransform.cpp generalized-hough-transform-load-and-setup The position vectors will contain the matches the detectors will find. Every entry contains four floating point values: @@ -61,19 +62,19 @@ An example could look as follows: `[200, 100, 0.9, 120]` ### Setup parameters -@snippet samples/cpp/tutorial_code/objectDetection/generalizedHoughTransform.cpp generalized-hough-transform-setup-parameters +@snippet samples/cpp/tutorial_code/ImgTrans/generalizedHoughTransform.cpp generalized-hough-transform-setup-parameters Finding the optimal values can end up in trial and error and depends on many factors, such as the image resolution. ### Run detection -@snippet samples/cpp/tutorial_code/objectDetection/generalizedHoughTransform.cpp generalized-hough-transform-run +@snippet samples/cpp/tutorial_code/ImgTrans/generalizedHoughTransform.cpp generalized-hough-transform-run As mentioned above, this step will take some time, especially with larger images and when using Guil. ### Draw results and show image -@snippet samples/cpp/tutorial_code/objectDetection/generalizedHoughTransform.cpp generalized-hough-transform-draw-results +@snippet samples/cpp/tutorial_code/ImgTrans/generalizedHoughTransform.cpp generalized-hough-transform-draw-results Result ------ diff --git a/doc/tutorials/objdetect/generalized_hough_ballard_guil/images/generalized_hough_image.jpg b/doc/tutorials/imgproc/generalized_hough_ballard_guil/images/generalized_hough_image.jpg similarity index 100% rename from doc/tutorials/objdetect/generalized_hough_ballard_guil/images/generalized_hough_image.jpg rename to doc/tutorials/imgproc/generalized_hough_ballard_guil/images/generalized_hough_image.jpg diff --git a/doc/tutorials/objdetect/generalized_hough_ballard_guil/images/generalized_hough_less_perfect_result_img.jpg b/doc/tutorials/imgproc/generalized_hough_ballard_guil/images/generalized_hough_less_perfect_result_img.jpg similarity index 100% rename from doc/tutorials/objdetect/generalized_hough_ballard_guil/images/generalized_hough_less_perfect_result_img.jpg rename to doc/tutorials/imgproc/generalized_hough_ballard_guil/images/generalized_hough_less_perfect_result_img.jpg diff --git a/doc/tutorials/objdetect/generalized_hough_ballard_guil/images/generalized_hough_mini_image.jpg b/doc/tutorials/imgproc/generalized_hough_ballard_guil/images/generalized_hough_mini_image.jpg similarity index 100% rename from doc/tutorials/objdetect/generalized_hough_ballard_guil/images/generalized_hough_mini_image.jpg rename to doc/tutorials/imgproc/generalized_hough_ballard_guil/images/generalized_hough_mini_image.jpg diff --git a/doc/tutorials/objdetect/generalized_hough_ballard_guil/images/generalized_hough_mini_template.jpg b/doc/tutorials/imgproc/generalized_hough_ballard_guil/images/generalized_hough_mini_template.jpg similarity index 100% rename from doc/tutorials/objdetect/generalized_hough_ballard_guil/images/generalized_hough_mini_template.jpg rename to doc/tutorials/imgproc/generalized_hough_ballard_guil/images/generalized_hough_mini_template.jpg diff --git a/doc/tutorials/objdetect/generalized_hough_ballard_guil/images/generalized_hough_result_img.jpg b/doc/tutorials/imgproc/generalized_hough_ballard_guil/images/generalized_hough_result_img.jpg similarity index 100% rename from doc/tutorials/objdetect/generalized_hough_ballard_guil/images/generalized_hough_result_img.jpg rename to doc/tutorials/imgproc/generalized_hough_ballard_guil/images/generalized_hough_result_img.jpg diff --git a/doc/tutorials/objdetect/generalized_hough_ballard_guil/images/generalized_hough_template.jpg b/doc/tutorials/imgproc/generalized_hough_ballard_guil/images/generalized_hough_template.jpg similarity index 100% rename from doc/tutorials/objdetect/generalized_hough_ballard_guil/images/generalized_hough_template.jpg rename to doc/tutorials/imgproc/generalized_hough_ballard_guil/images/generalized_hough_template.jpg diff --git a/doc/tutorials/imgproc/imgtrans/hough_circle/hough_circle.markdown b/doc/tutorials/imgproc/imgtrans/hough_circle/hough_circle.markdown index 497215794b..0a2ba8843e 100644 --- a/doc/tutorials/imgproc/imgtrans/hough_circle/hough_circle.markdown +++ b/doc/tutorials/imgproc/imgtrans/hough_circle/hough_circle.markdown @@ -2,7 +2,7 @@ Hough Circle Transform {#tutorial_hough_circle} ====================== @prev_tutorial{tutorial_hough_lines} -@next_tutorial{tutorial_remap} +@next_tutorial{tutorial_generalized_hough_ballard_guil} Goal ---- diff --git a/doc/tutorials/imgproc/imgtrans/remap/remap.markdown b/doc/tutorials/imgproc/imgtrans/remap/remap.markdown index ac2b879171..eb34be4bb1 100644 --- a/doc/tutorials/imgproc/imgtrans/remap/remap.markdown +++ b/doc/tutorials/imgproc/imgtrans/remap/remap.markdown @@ -1,7 +1,7 @@ Remapping {#tutorial_remap} ========= -@prev_tutorial{tutorial_hough_circle} +@prev_tutorial{tutorial_generalized_hough_ballard_guil} @next_tutorial{tutorial_warp_affine} Goal diff --git a/doc/tutorials/imgproc/table_of_content_imgproc.markdown b/doc/tutorials/imgproc/table_of_content_imgproc.markdown index b0a8b8260b..9545cd2155 100644 --- a/doc/tutorials/imgproc/table_of_content_imgproc.markdown +++ b/doc/tutorials/imgproc/table_of_content_imgproc.markdown @@ -173,6 +173,16 @@ In this section you will learn about the image processing (manipulation) functio Where we learn how to detect circles +- @subpage tutorial_generalized_hough_ballard_guil + + *Languages:* C++ + + *Compatibility:* \>= OpenCV 3.4 + + *Author:* Markus Heck + + Detect an object in a picture with the help of GeneralizedHoughBallard and GeneralizedHoughGuil. + - @subpage tutorial_remap *Languages:* C++, Java, Python diff --git a/doc/tutorials/objdetect/table_of_content_objdetect.markdown b/doc/tutorials/objdetect/table_of_content_objdetect.markdown index 9b8a09b4e8..0b019d88a5 100644 --- a/doc/tutorials/objdetect/table_of_content_objdetect.markdown +++ b/doc/tutorials/objdetect/table_of_content_objdetect.markdown @@ -16,13 +16,3 @@ Ever wondered how your digital camera detects peoples and faces? Look here to fi - @subpage tutorial_traincascade This tutorial describes _opencv_traincascade_ application and its parameters. - -- @subpage tutorial_generalized_hough_ballard_guil - - *Languages:* C++ - - *Compatibility:* \>= OpenCV 3.4 - - *Author:* Markus Heck - - Detect an object in a picture with the help of GeneralizedHoughBallard and GeneralizedHoughGuil. \ No newline at end of file diff --git a/doc/tutorials/objdetect/traincascade.markdown b/doc/tutorials/objdetect/traincascade.markdown index 7ff39b5a90..1528c02211 100644 --- a/doc/tutorials/objdetect/traincascade.markdown +++ b/doc/tutorials/objdetect/traincascade.markdown @@ -2,7 +2,6 @@ Cascade Classifier Training {#tutorial_traincascade} =========================== @prev_tutorial{tutorial_cascade_classifier} -@next_tutorial{tutorial_generalized_hough_ballard_guil} Introduction diff --git a/samples/cpp/tutorial_code/objectDetection/generalizedHoughTransform.cpp b/samples/cpp/tutorial_code/ImgTrans/generalizedHoughTransform.cpp similarity index 100% rename from samples/cpp/tutorial_code/objectDetection/generalizedHoughTransform.cpp rename to samples/cpp/tutorial_code/ImgTrans/generalizedHoughTransform.cpp