diff --git a/modules/imgproc/include/opencv2/imgproc/bindings.hpp b/modules/imgproc/include/opencv2/imgproc/bindings.hpp index aa1dc8610c..ad507a5bf9 100644 --- a/modules/imgproc/include/opencv2/imgproc/bindings.hpp +++ b/modules/imgproc/include/opencv2/imgproc/bindings.hpp @@ -30,6 +30,25 @@ void HoughLinesWithAccumulator( Mat(lines_acc).copyTo(lines); } +/** @brief Finds circles in a grayscale image using the Hough transform and get accumulator. + * + * @note This function is for bindings use only. Use original function in C++ code + * + * @sa HoughCircles + */ +CV_WRAP static inline +void HoughCirclesWithAccumulator( + InputArray image, OutputArray circles, + int method, double dp, double minDist, + double param1 = 100, double param2 = 100, + int minRadius = 0, int maxRadius = 0 +) +{ + std::vector circles_acc; + HoughCircles(image, circles_acc, method, dp, minDist, param1, param2, minRadius, maxRadius); + Mat(1, static_cast(circles_acc.size()), CV_32FC4, &circles_acc.front()).copyTo(circles); +} + } // namespace #endif // OPENCV_IMGPROC_BINDINGS_HPP diff --git a/modules/python/test/test_houghcircles.py b/modules/python/test/test_houghcircles.py index 2cfc6c9d68..942e2c8e34 100644 --- a/modules/python/test/test_houghcircles.py +++ b/modules/python/test/test_houghcircles.py @@ -79,6 +79,20 @@ class houghcircles_test(NewOpenCVTests): self.assertGreater(float(matches_counter) / len(testCircles), .5) self.assertLess(float(len(circles) - matches_counter) / len(circles), .75) + circles_acc = cv.HoughCirclesWithAccumulator( + image=img, + method=cv.HOUGH_GRADIENT, + dp=1, + minDist=10, + circles=np.array([]), + param1=150, + param2=45, + minRadius=1, + maxRadius=30) + + self.assertEqual(circles_acc.shape, (1, 2, 4)) + self.assertEqual(circles_acc[0, 0, 3], 66.) + self.assertEqual(circles_acc[0, 1, 3], 62.) def test_houghcircles_alt(self): @@ -127,5 +141,21 @@ class houghcircles_test(NewOpenCVTests): self.assertGreater(float(matches_counter) / len(testCircles), .5) self.assertLess(float(len(circles) - matches_counter) / len(circles), .75) + circles_acc = cv.HoughCirclesWithAccumulator( + image=img, + method=cv.HOUGH_GRADIENT_ALT, + dp=1, + minDist=10, + circles=np.array([]), + param1=300, + param2=0.9, + minRadius=13, + maxRadius=15) + + self.assertEqual(circles_acc.shape, (1, 3, 4)) + self.assertEqual(circles_acc[0, 0, 3], 62.) + self.assertEqual(circles_acc[0, 1, 3], 59.) + self.assertEqual(circles_acc[0, 2, 3], 47.) + if __name__ == '__main__': NewOpenCVTests.bootstrap()