Skip to content

Commit 99fb0d3

Browse files
sturkmen72sturkmen72
committed
Update edge_drawing.py
Create edge_drawing_demo.cpp Update ximgproc.bib Update test_fld.cpp add CV_WRAP to read & write functions of Params a bug fixed
1 parent 00aeb08 commit 99fb0d3

File tree

6 files changed

+326
-49
lines changed

6 files changed

+326
-49
lines changed

‎modules/ximgproc/doc/ximgproc.bib

+11-1
Original file line numberDiff line numberDiff line change
@@ -406,4 +406,14 @@ @article{jia2017fast
406406
pages={3665--3679},
407407
year={2017},
408408
publisher={IEEE}
409-
}
409+
}
410+
411+
@article{akinlar201782,
412+
title = {ColorED: Color edge and segment detection by Edge Drawing (ED)},
413+
author = {Cuneyt Akinlar and Cihan Topal},
414+
journal = {Journal of Visual Communication and Image Representation},
415+
volume = {44},
416+
pages = {82-94},
417+
year = {2017},
418+
publisher={Academic Press}
419+
}

‎modules/ximgproc/include/opencv2/ximgproc/edge_drawing.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace ximgproc
1515
//! @addtogroup ximgproc_edge_drawing
1616
//! @{
1717

18-
/** @brief Class implementing the ED (EdgeDrawing) @cite topal2012edge, EDLines @cite akinlar2011edlines, EDPF @cite akinlar2012edpf and EDCircles @cite akinlar2013edcircles algorithms
18+
/** @brief Class implementing the ED (EdgeDrawing) @cite topal2012edge, EDLines @cite akinlar2011edlines, EDPF @cite akinlar2012edpf, EDCircles @cite akinlar2013edcircles and ColorED @cite akinlar201782 algorithms.
1919
*/
2020

2121
class CV_EXPORTS_W EdgeDrawing : public Algorithm
@@ -66,8 +66,8 @@ class CV_EXPORTS_W EdgeDrawing : public Algorithm
6666
//! Default value is 1.3
6767
CV_PROP_RW double MaxErrorThreshold;
6868

69-
void read(const FileNode& fn);
70-
void write(FileStorage& fs) const;
69+
CV_WRAP void read(const FileNode& fn);
70+
CV_WRAP void write(FileStorage& fs) const;
7171
};
7272

7373
/** @brief Detects edges in a grayscale or color image and prepares them to detect lines and ellipses.

‎modules/ximgproc/samples/edge_drawing.py

+98-43
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,24 @@
11
#!/usr/bin/python
22

33
'''
4-
This example illustrates how to use cv.ximgproc.EdgeDrawing class.
4+
This example script illustrates how to use cv.ximgproc.EdgeDrawing class.
5+
6+
It uses the OpenCV library to load an image, and then use the EdgeDrawing class
7+
to detect edges, lines, and ellipses. The detected features are then drawn and displayed.
8+
9+
The main loop allows the user changing parameters of EdgeDrawing by pressing following keys:
10+
11+
to toggle the grayscale conversion press 'space' key
12+
to increase MinPathLength value press '/' key
13+
to decrease MinPathLength value press '*' key
14+
to increase MinLineLength value press '+' key
15+
to decrease MinLineLength value press '-' key
16+
to toggle NFAValidation value press 'n' key
17+
to toggle PFmode value press 'p' key
18+
to save parameters to file press 's' key
19+
to load parameters from file press 'l' key
20+
21+
The program exits when the Esc key is pressed.
522
623
Usage:
724
ed.py [<image_name>]
@@ -16,30 +33,25 @@
1633
import random as rng
1734
import sys
1835

19-
def EdgeDrawingDemo(src, convert_to_gray):
20-
36+
def EdgeDrawingDemo(src, ed, EDParams, convert_to_gray):
2137
rng.seed(12345)
22-
ssrc = src.copy()*0
38+
ssrc = np.zeros_like(src)
2339
lsrc = src.copy()
2440
esrc = src.copy()
2541

26-
ed = cv.ximgproc.createEdgeDrawing()
42+
img_to_detect = cv.cvtColor(src, cv.COLOR_BGR2GRAY) if convert_to_gray else src
2743

28-
# you can change parameters (refer the documentation to see all parameters)
29-
EDParams = cv.ximgproc_EdgeDrawing_Params()
30-
EDParams.MinPathLength = 50 # try changing this value between 5 to 1000
31-
EDParams.PFmode = False # defaut value try to swich it to True
32-
EDParams.MinLineLength = 10 # try changing this value between 5 to 100
33-
EDParams.NFAValidation = True # defaut value try to swich it to False
34-
35-
ed.setParams(EDParams)
44+
cv.imshow("source image", img_to_detect)
3645

37-
if convert_to_gray:
38-
img_to_detect = cv.cvtColor(src, cv.COLOR_BGR2GRAY)
39-
else:
40-
img_to_detect = src
46+
print("")
47+
print("convert_to_gray:", convert_to_gray)
48+
print("MinPathLength:", EDParams.MinPathLength)
49+
print("MinLineLength:", EDParams.MinLineLength)
50+
print("PFmode:", EDParams.PFmode)
51+
print("NFAValidation:", EDParams.NFAValidation)
4152

42-
cv.imshow("source image", img_to_detect)
53+
tm = cv.TickMeter()
54+
tm.start()
4355

4456
# Detect edges
4557
# you should call this before detectLines() and detectEllipses()
@@ -49,48 +61,91 @@ def EdgeDrawingDemo(src, convert_to_gray):
4961
lines = ed.detectLines()
5062
ellipses = ed.detectEllipses()
5163

52-
#Draw detected edge segments
53-
for i in range(len(segments)):
54-
color = (rng.randint(0,256), rng.randint(0,256), rng.randint(0,256))
55-
cv.polylines(ssrc, [segments[i]], False, color, 1, cv.LINE_8)
64+
tm.stop()
65+
66+
print("Detection time : {:.2f} ms. using the parameters above".format(tm.getTimeMilli()))
67+
68+
# Draw detected edge segments
69+
for segment in segments:
70+
color = (rng.randint(0, 256), rng.randint(0, 256), rng.randint(0, 256))
71+
cv.polylines(ssrc, [segment], False, color, 1, cv.LINE_8)
5672

5773
cv.imshow("detected edge segments", ssrc)
5874

59-
#Draw detected lines
60-
if lines is not None: # Check if the lines have been found and only then iterate over these and add them to the image
75+
# Draw detected lines
76+
if lines is not None: # Check if the lines have been found and only then iterate over these and add them to the image
6177
lines = np.uint16(np.around(lines))
62-
for i in range(len(lines)):
63-
cv.line(lsrc, (lines[i][0][0], lines[i][0][1]), (lines[i][0][2], lines[i][0][3]), (0, 0, 255), 1, cv.LINE_AA)
78+
for line in lines:
79+
cv.line(lsrc, (line[0][0], line[0][1]), (line[0][2], line[0][3]), (0, 0, 255), 1, cv.LINE_AA)
6480

6581
cv.imshow("detected lines", lsrc)
6682

67-
#Draw detected circles and ellipses
68-
if ellipses is not None: # Check if circles and ellipses have been found and only then iterate over these and add them to the image
69-
for i in range(len(ellipses)):
70-
center = (int(ellipses[i][0][0]), int(ellipses[i][0][1]))
71-
axes = (int(ellipses[i][0][2])+int(ellipses[i][0][3]),int(ellipses[i][0][2])+int(ellipses[i][0][4]))
72-
angle = ellipses[i][0][5]
73-
color = (0, 0, 255)
74-
if ellipses[i][0][2] == 0:
75-
color = (0, 255, 0)
76-
cv.ellipse(esrc, center, axes, angle,0, 360, color, 2, cv.LINE_AA)
83+
# Draw detected circles and ellipses
84+
if ellipses is not None: # Check if circles and ellipses have been found and only then iterate over these and add them to the image
85+
for ellipse in ellipses:
86+
center = (int(ellipse[0][0]), int(ellipse[0][1]))
87+
axes = (int(ellipse[0][2] + ellipse[0][3]), int(ellipse[0][2] + ellipse[0][4]))
88+
angle = ellipse[0][5]
7789

78-
cv.imshow("detected circles and ellipses", esrc)
79-
print('Press any key to swich color conversion code. Press Esc to exit.')
90+
color = (0, 255, 0) if ellipse[0][2] == 0 else (0, 0, 255)
8091

92+
cv.ellipse(esrc, center, axes, angle, 0, 360, color, 2, cv.LINE_AA)
8193

82-
if __name__ == '__main__':
83-
print(__doc__)
94+
cv.imshow("detected circles and ellipses", esrc)
95+
96+
def main():
8497
try:
8598
fn = sys.argv[1]
8699
except IndexError:
87100
fn = 'board.jpg'
88101
src = cv.imread(cv.samples.findFile(fn))
102+
if src is None:
103+
print("Error loading image")
104+
return
105+
106+
ed = cv.ximgproc.createEdgeDrawing()
107+
108+
# Set parameters (refer to the documentation for all parameters)
109+
EDParams = cv.ximgproc_EdgeDrawing_Params()
110+
EDParams.MinPathLength = 10 # try changing this value by pressing '/' and '*' keys
111+
EDParams.MinLineLength = 10 # try changing this value by pressing '+' and '-' keys
112+
EDParams.PFmode = False # default value is False, try switching by pressing 'p' key
113+
EDParams.NFAValidation = True # default value is True, try switching by pressing 'n' key
89114

90115
convert_to_gray = True
91116
key = 0
92-
while key is not 27:
93-
EdgeDrawingDemo(src, convert_to_gray)
117+
118+
while key != 27:
119+
ed.setParams(EDParams)
120+
EdgeDrawingDemo(src, ed, EDParams, convert_to_gray)
94121
key = cv.waitKey()
95-
convert_to_gray = not convert_to_gray
122+
if key == 32: # space key
123+
convert_to_gray = not convert_to_gray
124+
if key == 112: # 'p' key
125+
EDParams.PFmode = not EDParams.PFmode
126+
if key == 110: # 'n' key
127+
EDParams.NFAValidation = not EDParams.NFAValidation
128+
if key == 43: # '+' key
129+
EDParams.MinLineLength = EDParams.MinLineLength + 5
130+
if key == 45: # '-' key
131+
EDParams.MinLineLength = max(0, EDParams.MinLineLength - 5)
132+
if key == 47: # '/' key
133+
EDParams.MinPathLength = EDParams.MinPathLength + 20
134+
if key == 42: # '*' key
135+
EDParams.MinPathLength = max(0, EDParams.MinPathLength - 20)
136+
if key == 115: # 's' key
137+
fs = cv.FileStorage("ed-params.xml",cv.FileStorage_WRITE)
138+
EDParams.write(fs)
139+
fs.release()
140+
print("parameters saved to ed-params.xml")
141+
if key == 108: # 'l' key
142+
fs = cv.FileStorage("ed-params.xml",cv.FileStorage_READ)
143+
if fs.isOpened():
144+
EDParams.read(fs.root())
145+
fs.release()
146+
print("parameters loaded from ed-params.xml")
147+
148+
if __name__ == '__main__':
149+
print(__doc__)
150+
main()
96151
cv.destroyAllWindows()

0 commit comments

Comments
 (0)