Feature: weighted hough by MasahiroOgawa · Pull Request #21407 · opencv/opencv

MasahiroOgawa · 2022-01-07T03:11:48Z

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

I agree to contribute to the project under Apache 2 License.
To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV
The PR is proposed to proper branch
There is reference to original bug report and related work
There is accuracy test, performance test and test data in opencv_extra repository, if applicable
Patch to opencv_extra has the same branch name.
The feature is well documented and sample code can be built with the project CMake

MasahiroOgawa · 2022-01-07T04:24:13Z

How can I add optional function to the original (modules/imgproc) function?
I read doc(https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request) and I know we should commit to opencv_contrib, but there is no imgproc/src/hough.cpp file in opencv_contrib.
I just want to add 1 option to add "weghted hough".

asmorkalov · 2022-01-10T06:16:38Z

@vpisarev Could you take a look?

modules/imgproc/src/hough.cpp

modules/imgproc/include/opencv2/imgproc.hpp

MasahiroOgawa · 2022-01-11T00:40:23Z

Thank you for taking your time to check my pull request! I will revise and tell you soon. 2022年1月10日(月) 16:39 Alexander Alekhin ***@***.***>:

…

***@***.**** commented on this pull request. ------------------------------ In modules/imgproc/src/hough.cpp <#21407 (comment)>: > @@ -180,7 +180,11 @@ HoughLinesStandard( InputArray src, OutputArray lines, int type, { int r = cvRound( j * tabCos[n] + i * tabSin[n] ); r += (numrho - 1) / 2; - accum[(n+1) * (numrho+2) + r+1]++; + if (use_edgeval) { if in inner loops is slow. ------------------------------ In modules/imgproc/include/opencv2/imgproc.hpp <#21407 (comment)>: > @@ -2112,11 +2112,15 @@ parameters should be positive. Must fall between 0 and max_theta. @param max_theta For standard and multi-scale Hough transform, maximum angle to check for lines. Must fall between min_theta and CV_PI. ***@***.*** use_weight True if you want to use weighted Hough transform. ***@***.*** thre_edgeval For weighted Hough transform, only account for over this No such params. — Reply to this email directly, view it on GitHub <#21407 (review)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ADESA3BXDUJIXVYEOAZ37ZTUVKEMRANCNFSM5LN3N6KQ> . Triage notifications on the go with GitHub Mobile for iOS <https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675> or Android <https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub>. You are receiving this because you authored the thread.Message ID: ***@***.***>

MasahiroOgawa · 2022-01-30T21:19:06Z

I wrote about this new function "weighted Hough transform" (https://qiita.com/Mas-sensyn/items/b9c2bfb87106acaa74d8).
Hope this will help.

asmorkalov · 2022-05-20T07:50:14Z

@MasahiroOgawa Friendly reminder. Could you add couple of tests for the new code.

MasahiroOgawa · 2022-05-20T08:31:41Z

Oh, I see. Thank you for your feedback! 2022年5月20日(金) 16:50 Alexander Smorkalov ***@***.***>:

…

@MasahiroOgawa <https://github.com/MasahiroOgawa> Friendly reminder. Could you add couple of tests for the new code. — Reply to this email directly, view it on GitHub <#21407 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ADESA3FWWG3RMPUKRFBZD6DVK474HANCNFSM5LN3N6KQ> . You are receiving this because you were mentioned.Message ID: ***@***.***>

asmorkalov · 2022-06-03T08:56:28Z

@MasahiroOgawa Friendly reminder.

MasahiroOgawa · 2022-06-03T09:58:46Z

I am working on it. I still working on creating unit test, but even the original unit test fails. It seems the test image data is not exist in proper place. I ran $ bin/opencv_test_imgproc . I will send this issue to github issues later. 2022年6月3日(金) 17:56 Alexander Smorkalov ***@***.***>:

…

@MasahiroOgawa <https://github.com/MasahiroOgawa> Friendly reminder. — Reply to this email directly, view it on GitHub <#21407 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ADESA3CRKOBM2ONYGUIL4HLVNHCETANCNFSM5LN3N6KQ> . You are receiving this because you were mentioned.Message ID: ***@***.***>

asmorkalov · 2022-06-03T14:10:20Z

OpenCV stores all test data in opencv_extra repo: https://github.com/opencv/opencv_extra/. You need to create PR to the repo with the same branch name as you original PR. They'll be tested together automatically.

MasahiroOgawa · 2022-06-03T22:25:52Z

Thank you. Yes I noticed that and pulled opencv_extra, and built opencv with " OPENCV_TEST_DATA_PATH" specifying pulled opencv_extra/testdata path. But even though I did, I still failed to run opencv_test_imgproc with the same error(imread_ fails to open /shared/fruits.png). The data exists in opencv_extra/testdata/cv/shared, so I need to pass "cv/" directory. I'm still struggling with that. I will continue to try.

…

On Fri, Jun 3, 2022 at 23:10 Alexander Smorkalov ***@***.***> wrote: OpenCV stores all test data in opencv_extra repo: https://github.com/opencv/opencv_extra/. You need to create PR to the repo with the same branch name as you original PR. They'll be tested together automatically. — Reply to this email directly, view it on GitHub <#21407 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ADESA3ER4C32ZG2DHZFYGB3VNIG5PANCNFSM5LN3N6KQ> . You are receiving this because you were mentioned.Message ID: ***@***.***>

MasahiroOgawa · 2022-06-04T00:08:22Z

Succeeded to run the test! When I run $ export OPENCV_TEST_DATA_PATH=/home/.../opencv_extra/testdata/ before running "bin/opencv_test_imgproc", it successfully passed all the test. I will add unit tests for weighted hough from now on. 2022年6月4日(土) 7:25 小川雅弘 ***@***.***>:

…

Thank you. Yes I noticed that and pulled opencv_extra, and built opencv with " OPENCV_TEST_DATA_PATH" specifying pulled opencv_extra/testdata path. But even though I did, I still failed to run opencv_test_imgproc with the same error(imread_ fails to open /shared/fruits.png). The data exists in opencv_extra/testdata/cv/shared, so I need to pass "cv/" directory. I'm still struggling with that. I will continue to try. On Fri, Jun 3, 2022 at 23:10 Alexander Smorkalov ***@***.***> wrote: > OpenCV stores all test data in opencv_extra repo: > https://github.com/opencv/opencv_extra/. You need to create PR to the > repo with the same branch name as you original PR. They'll be tested > together automatically. > > — > Reply to this email directly, view it on GitHub > <#21407 (comment)>, > or unsubscribe > <https://github.com/notifications/unsubscribe-auth/ADESA3ER4C32ZG2DHZFYGB3VNIG5PANCNFSM5LN3N6KQ> > . > You are receiving this because you were mentioned.Message ID: > ***@***.***> >

quan787 · 2022-06-21T22:58:58Z

Thank you for considering this, as this looks very promising for my implication. Very eager to see it being merged.

MasahiroOgawa · 2022-06-22T00:42:39Z

Thank you for considering this, as this looks very promising for my implication. Very eager to see it being merged.

Sorry for my late update of unit test. Please wait for several days. I will add unit tests soon, then I hope this will be merged.

asmorkalov · 2022-09-07T13:17:13Z

@MasahiroOgawa Friendly reminder. Please rebase and finish the PR.

MasahiroOgawa · 2022-09-08T02:01:47Z

Sorry, but I'm still struggling to implement the unit test for this. So first I have to finish it. 2022年9月7日(水) 22:17 Alexander Smorkalov ***@***.***>:

…

@MasahiroOgawa <https://github.com/MasahiroOgawa> Friendly reminder. Please rebase and finish the PR. — Reply to this email directly, view it on GitHub <#21407 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ADESA3AAB53MCROUX6X2NUDV5CIWLANCNFSM5LN3N6KQ> . You are receiving this because you were mentioned.Message ID: ***@***.***>

asmorkalov · 2022-10-07T12:30:34Z

@MasahiroOgawa Friendly reminder. Please add some tests to the new algo.

MasahiroOgawa · 2022-10-09T02:31:01Z

Will do, thanks! 2022年10月7日(金) 21:30 Alexander Smorkalov ***@***.***>:

…

@MasahiroOgawa <https://github.com/MasahiroOgawa> Friendly reminder. Please add some tests to the new algo. — Reply to this email directly, view it on GitHub <#21407 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ADESA3EZY4QKR5SBPIYQH23WCAJXLANCNFSM5LN3N6KQ> . You are receiving this because you were mentioned.Message ID: ***@***.***>

asmorkalov · 2022-11-28T08:36:28Z

@MasahiroOgawa There are some merge conflicts. Could you take a look.

…based on alalek review comment.

…rders.

…ut fail just using simple hough.

…mal houghlines.

asmorkalov · 2024-12-19T12:43:08Z

 modules/imgproc/test/test_houghlines.cpp:350: trailing whitespace.
+    
modules/imgproc/test/test_houghlines.cpp:356: trailing whitespace.
+    
modules/imgproc/test/test_houghlines.cpp:359: trailing whitespace.
+    // detected lines is assumed sorted from stronger to weaker. 
modules/imgproc/test/test_houghlines.cpp:371: trailing whitespace.
+    // draw lines. 
modules/imgproc/test/test_houghlines.cpp:374: trailing whitespace.
+    
modules/imgproc/test/test_houghlines.cpp:380: trailing whitespace.
+    
modules/imgproc/test/test_houghlines.cpp:383: trailing whitespace.
+    // detected lines is assumed sorted from stronger to weaker. 
samples/cpp/tutorial_code/ImgTrans/HoughLines_Demo.cpp:165: space before tab in indent.
+  	      0, CV_PI, use_edgeval);
Error: Process completed with exit code 2.

asmorkalov · 2024-12-20T05:46:56Z


Run cd $HOME/build && python3 $HOME/scripts/warnings-handling.py
/home/ci/opencv/modules/ts/include/opencv2/ts/ts_gtest.h:21333:11: warning: comparison of integer expressions of different signedness: 'const int' and 'const long unsigned int' [-Wsign-compare]

Build has warnings.

MasahiroOgawa · 2024-12-20T06:10:09Z

 modules/imgproc/test/test_houghlines.cpp:350: trailing whitespace.
+    
modules/imgproc/test/test_houghlines.cpp:356: trailing whitespace.
+    
modules/imgproc/test/test_houghlines.cpp:359: trailing whitespace.
+    // detected lines is assumed sorted from stronger to weaker. 
modules/imgproc/test/test_houghlines.cpp:371: trailing whitespace.
+    // draw lines. 
modules/imgproc/test/test_houghlines.cpp:374: trailing whitespace.
+    
modules/imgproc/test/test_houghlines.cpp:380: trailing whitespace.
+    
modules/imgproc/test/test_houghlines.cpp:383: trailing whitespace.
+    // detected lines is assumed sorted from stronger to weaker. 
samples/cpp/tutorial_code/ImgTrans/HoughLines_Demo.cpp:165: space before tab in indent.
+  	      0, CV_PI, use_edgeval);
Error: Process completed with exit code 2.

I'm sorry for this error, but I think the error is related to the format I posted before.

#21407 (comment)

Should I run clang formatter?

…s: 'const int' and 'const long unsigned int'

MasahiroOgawa · 2024-12-20T06:50:21Z


Run cd $HOME/build && python3 $HOME/scripts/warnings-handling.py
/home/ci/opencv/modules/ts/include/opencv2/ts/ts_gtest.h:21333:11: warning: comparison of integer expressions of different signedness: 'const int' and 'const long unsigned int' [-Wsign-compare]

Build has warnings.

I'm sorry. I think I fixed the problem.
I rebuilt whole project after this fixation and it seems no build warnings for test_houghlines.cpp.cpp as below;

samples/cpp/tutorial_code/ImgTrans/HoughLines_Demo.cpp

asmorkalov · 2024-12-26T12:14:10Z

@MasahiroOgawa Friendly reminder.

samples/cpp/tutorial_code/ImgTrans/HoughLines_Demo.cpp

asmorkalov · 2025-01-06T08:24:01Z

samples/cpp/tutorial_code/ImgTrans/HoughLines_Demo.cpp

+Mat standard_hough, probabilistic_hough, weighted_hough;
 int min_threshold = 50;
 int max_trackbar = 150;
+int weightedhough_max_trackbar = 1e+5;


MS Visual Studio reports warning here. Please use 100000. See CI logs for details.

Oh I'm very sorry. Now I'm fixing and checking the build procedure. I will push after I confirmed it build without error.

I think I fixed the 2 errors in the CI.
But github workflow seems only run on branch 4.x, so I couldn't confirmed the fixation.
Could you check it by running CI?

MasahiroOgawa · 2025-01-06T11:03:11Z

I noticed the below error in CI, and fixed by removing whitespace in test_houghlines.cpp.

 Run cd /home/ci/opencv
modules/imgproc/test/test_houghlines.cpp:350: trailing whitespace.
+    
modules/imgproc/test/test_houghlines.cpp:356: trailing whitespace.
+    
modules/imgproc/test/test_houghlines.cpp:359: trailing whitespace.
+    // detected lines is assumed sorted from stronger to weaker. 
modules/imgproc/test/test_houghlines.cpp:371: trailing whitespace.
+    // draw lines. 
modules/imgproc/test/test_houghlines.cpp:374: trailing whitespace.
+    
modules/imgproc/test/test_houghlines.cpp:380: trailing whitespace.
+    
modules/imgproc/test/test_houghlines.cpp:383: trailing whitespace.
+    // detected lines is assumed sorted from stronger to weaker. 
Error: Process completed with exit code 2.

…_hough Feature: weighted Hough Transform opencv#21407 ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV - [x] The PR is proposed to proper branch - [x] There is reference to original bug report and related work - [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [x] The feature is well documented and sample code can be built with the project CMake

MasahiroOgawa added 6 commits December 9, 2021 16:57

implement weightedHough using edge value in HoughLines().

1864bbb

revise original update for cv_assert.

472d838

add sample code to test weighted Hough.

ad5ecd3

Merge remote-tracking branch 'upstream/4.x' into feature/weighted_hough

c73ea76

update doc.

25d52a8

update weighted hough doc.

6586140

asmorkalov requested a review from vpisarev January 10, 2022 06:16

asmorkalov added feature category: imgproc labels Jan 10, 2022

alalek reviewed Jan 10, 2022

View reviewed changes

modules/imgproc/src/hough.cpp Outdated Show resolved Hide resolved

modules/imgproc/include/opencv2/imgproc.hpp Outdated Show resolved Hide resolved

revise weighted hough to avoid if() in for.

e9ca863

vpisarev self-assigned this Apr 28, 2022

MasahiroOgawa added 5 commits December 12, 2024 14:50

fix the variables order in **_EQ, and **_NEAR of weighted hough test …

4ec3ffe

…based on alalek review comment.

fix for weighted diagonal test too; change order in *_EQ() variable o…

2cde5f9

…rders.

fix weighted hough unit test. as it will success on weighted hough, b…

0f7c990

…ut fail just using simple hough.

Merge remote-tracking branch 'origin/4.x' into feature/weighted_hough

712a418

fix unit test to success for current weighted hough, but fail for nor…

c27c57e

…mal houghlines.

asmorkalov approved these changes Dec 19, 2024

View reviewed changes

asmorkalov removed the incomplete label Dec 20, 2024

fix warning: comparison of integer expressions of different signednes…

96137fe

…s: 'const int' and 'const long unsigned int'

asmorkalov changed the title ~~Feature/weighted hough~~ Feature: weighted hough Dec 23, 2024

asmorkalov requested changes Dec 23, 2024

View reviewed changes

samples/cpp/tutorial_code/ImgTrans/HoughLines_Demo.cpp Show resolved Hide resolved

asmorkalov modified the milestones: 4.11.0, 4.12.0 Dec 30, 2024

asmorkalov approved these changes Jan 6, 2025

View reviewed changes

samples/cpp/tutorial_code/ImgTrans/HoughLines_Demo.cpp Show resolved Hide resolved

asmorkalov requested changes Jan 6, 2025

View reviewed changes

MasahiroOgawa added 2 commits January 6, 2025 17:37

fix CI build error.

c29b0bb

remove white space based on CI buildAndTest error.

1a2b034

asmorkalov approved these changes Jan 6, 2025

View reviewed changes

vpisarev approved these changes Jan 6, 2025

View reviewed changes

asmorkalov merged commit fc994a6 into opencv:4.x Jan 6, 2025

asmorkalov modified the milestones: 4.12.0, 4.11.0 Jan 6, 2025

asmorkalov mentioned this pull request Jan 15, 2025

5.x merge 4.x #26768

Merged

Uh oh!

Conversation

MasahiroOgawa commented Jan 7, 2022

Pull Request Readiness Checklist

Uh oh!

MasahiroOgawa commented Jan 7, 2022

Uh oh!

asmorkalov commented Jan 10, 2022

Uh oh!

Uh oh!

Uh oh!

MasahiroOgawa commented Jan 11, 2022 via email

Uh oh!

MasahiroOgawa commented Jan 30, 2022

Uh oh!

asmorkalov commented May 20, 2022

Uh oh!

MasahiroOgawa commented May 20, 2022 via email

Uh oh!

asmorkalov commented Jun 3, 2022

Uh oh!

MasahiroOgawa commented Jun 3, 2022 via email

Uh oh!

asmorkalov commented Jun 3, 2022

Uh oh!

MasahiroOgawa commented Jun 3, 2022 via email

Uh oh!

MasahiroOgawa commented Jun 4, 2022 via email

Uh oh!

quan787 commented Jun 21, 2022

Uh oh!

MasahiroOgawa commented Jun 22, 2022

Uh oh!

asmorkalov commented Sep 7, 2022

Uh oh!

MasahiroOgawa commented Sep 8, 2022 via email

Uh oh!

asmorkalov commented Oct 7, 2022

Uh oh!

MasahiroOgawa commented Oct 9, 2022 via email

Uh oh!

asmorkalov commented Nov 28, 2022

Uh oh!

asmorkalov commented Dec 19, 2024

Uh oh!

asmorkalov commented Dec 20, 2024

Uh oh!

MasahiroOgawa commented Dec 20, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MasahiroOgawa commented Dec 20, 2024

Uh oh!

Uh oh!

asmorkalov commented Dec 26, 2024

Uh oh!

Uh oh!

asmorkalov Jan 6, 2025

Choose a reason for hiding this comment

Uh oh!

MasahiroOgawa Jan 6, 2025

Choose a reason for hiding this comment

Uh oh!

MasahiroOgawa Jan 6, 2025

Choose a reason for hiding this comment

Uh oh!

MasahiroOgawa commented Jan 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

MasahiroOgawa commented Dec 20, 2024 •

edited

Loading

MasahiroOgawa commented Jan 6, 2025 •

edited

Loading