Commit cbc56a2

authored

Merge pull request lzane#2 from culms/master

Some statement changed, support py2 and opencv3

2 parents 9babfc6 + 0226539 commit cbc56a2Copy full SHA for cbc56a2

File tree

1 file changed

-8

lines changed

new.py

1 file changed

-8

lines changed

`‎new.py‎`

Lines changed: 9 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`import numpy as np`
`3`	`3`	`import copy`
`4`	`4`	`import math`
`5`		`-from appscript import app`
	`5`	`+#from appscript import app`
`6`	`6`
`7`	`7`	`# Environment:`
`8`	`8`	`# OS : Mac OS EL Capitan`
`@@ -92,7 +92,7 @@ def calculateFingers(res,drawing): # -> finished bool, cnt: finger count`
`92`	`92`
`93`	`93`	`# get the coutours`
`94`	`94`	`thresh1 = copy.deepcopy(thresh)`
`95`		`- contours, hierarchy = cv2.findContours(thresh1, cv2.RETR_TREE, cv2.CHAIN_APPROX_SIMPLE)`
	`95`	`+ im2,contours, hierarchy = cv2.findContours(thresh1, cv2.RETR_TREE, cv2.CHAIN_APPROX_SIMPLE)`
`96`	`96`	`length = len(contours)`
`97`	`97`	`maxArea = -1`
`98`	`98`	`if length > 0:`
`@@ -112,8 +112,9 @@ def calculateFingers(res,drawing): # -> finished bool, cnt: finger count`
`112`	`112`	`isFinishCal,cnt = calculateFingers(res,drawing)`
`113`	`113`	`if triggerSwitch is True:`
`114`	`114`	`if isFinishCal is True and cnt <= 2:`
`115`		`- print cnt`
`116`		`- app('System Events').keystroke(' ') # simulate pressing blank space`
	`115`	`+ print (cnt)`
	`116`	`+ #app('System Events').keystroke(' ') # simulate pressing blank space`
	`117`	`+`
`117`	`118`
`118`	`119`	`cv2.imshow('output', drawing)`
`119`	`120`
`@@ -122,14 +123,14 @@ def calculateFingers(res,drawing): # -> finished bool, cnt: finger count`
`122`	`123`	`if k == 27: # press ESC to exit`
`123`	`124`	`break`
`124`	`125`	`elif k == ord('b'): # press 'b' to capture the background`
`125`		`- bgModel = cv2.BackgroundSubtractorMOG2(0, bgSubThreshold)`
	`126`	`+ bgModel = cv2.createBackgroundSubtractorMOG2(0, bgSubThreshold)`
`126`	`127`	`isBgCaptured = 1`
`127`		`- print '!!!Background Captured!!!'`
	`128`	`+ print( '!!!Background Captured!!!')`
`128`	`129`	`elif k == ord('r'): # press 'r' to reset the background`
`129`	`130`	`bgModel = None`
`130`	`131`	`triggerSwitch = False`
`131`	`132`	`isBgCaptured = 0`
`132`		`- print '!!!Reset BackGround!!!'`
	`133`	`+ print ('!!!Reset BackGround!!!')`
`133`	`134`	`elif k == ord('n'):`
`134`	`135`	`triggerSwitch = True`
`135`		`- print '!!!Trigger On!!!'`
	`136`	`+ print ('!!!Trigger On!!!')`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit cbc56a2

File tree

1 file changed

1 file changed

`‎new.py‎`

0 commit comments