Merge pull request #12206 from jsxyhelu/3.4

find innercircle of contour by using pointPolygonTest: (#12206)

diff --git a/doc/tutorials/imgproc/shapedescriptors/point_polygon_test/images/Point_Polygon_Test_Result.jpg b/doc/tutorials/imgproc/shapedescriptors/point_polygon_test/images/Point_Polygon_Test_Result.jpg
index e420f47..b2c7dba 100644 (file)
Binary files a/doc/tutorials/imgproc/shapedescriptors/point_polygon_test/images/Point_Polygon_Test_Result.jpg and b/doc/tutorials/imgproc/shapedescriptors/point_polygon_test/images/Point_Polygon_Test_Result.jpg differ

diff --git a/samples/cpp/tutorial_code/ShapeDescriptors/pointPolygonTest_demo.cpp b/samples/cpp/tutorial_code/ShapeDescriptors/pointPolygonTest_demo.cpp
index da3feed..e62dc84 100644 (file)
--- a/samples/cpp/tutorial_code/ShapeDescriptors/pointPolygonTest_demo.cpp
+++ b/samples/cpp/tutorial_code/ShapeDescriptors/pointPolygonTest_demo.cpp
@@ -50,7 +50,8 @@ int main( void )
     }
 
     double minVal, maxVal;
-    minMaxLoc( raw_dist, &minVal, &maxVal );
+    Point maxDistPt; // inscribed circle center
+    minMaxLoc(raw_dist, &minVal, &maxVal, NULL, &maxDistPt);
     minVal = abs(minVal);
     maxVal = abs(maxVal);
 
@@ -76,10 +77,11 @@ int main( void )
             }
         }
     }
+    circle(drawing, maxDistPt, (int)maxVal, Scalar(255,255,255));
 
     /// Show your results
     imshow( "Source", src );
-    imshow( "Distance", drawing );
+    imshow( "Distance and inscribed circle", drawing );
 
     waitKey();
     return 0;

diff --git a/samples/java/tutorial_code/ShapeDescriptors/point_polygon_test/PointPolygonTestDemo.java b/samples/java/tutorial_code/ShapeDescriptors/point_polygon_test/PointPolygonTestDemo.java
index 2d0a542..94d5c62 100644 (file)
--- a/samples/java/tutorial_code/ShapeDescriptors/point_polygon_test/PointPolygonTestDemo.java
+++ b/samples/java/tutorial_code/ShapeDescriptors/point_polygon_test/PointPolygonTestDemo.java
@@ -72,10 +72,11 @@ class PointPolygonTest {
             }
         }
         drawing.put(0, 0, drawingData);
+        Imgproc.circle(drawing, res.maxLoc, (int)res.maxVal, new Scalar(255, 255, 255), 2, 8, 0);
 
         /// Show your results
         HighGui.imshow("Source", src);
-        HighGui.imshow("Distance", drawing);
+        HighGui.imshow("Distance and inscribed circle", drawing);
 
         HighGui.waitKey();
         System.exit(0);

diff --git a/samples/python/tutorial_code/ShapeDescriptors/point_polygon_test/pointPolygonTest_demo.py b/samples/python/tutorial_code/ShapeDescriptors/point_polygon_test/pointPolygonTest_demo.py
index 150727e..9b5dadb 100644 (file)
--- a/samples/python/tutorial_code/ShapeDescriptors/point_polygon_test/pointPolygonTest_demo.py
+++ b/samples/python/tutorial_code/ShapeDescriptors/point_polygon_test/pointPolygonTest_demo.py
@@ -29,7 +29,7 @@ for i in range(src.shape[0]):
     for j in range(src.shape[1]):
         raw_dist[i,j] = cv.pointPolygonTest(contours[0], (j,i), True)
 
-minVal, maxVal, _, _ = cv.minMaxLoc(raw_dist)
+minVal, maxVal, _, maxDistPt = cv.minMaxLoc(raw_dist)
 minVal = abs(minVal)
 maxVal = abs(maxVal)
 
@@ -46,6 +46,7 @@ for i in range(src.shape[0]):
             drawing[i,j,1] = 255
             drawing[i,j,2] = 255
 
+cv.circle(drawing,maxDistPt, int(maxVal),tuple(255,255,255), 1, cv.LINE_8, 0)
 cv.imshow('Source', src)
-cv.imshow('Distance', drawing)
+cv.imshow('Distance and inscribed circle', drawing)
 cv.waitKey()