q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always check for OpenCV first, in case we have both OpenCV and win32vidcapture

master
daid303 2012-10-01 14:54:00 +02:00
parent 0a1cb67461
commit 22cf43e873
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cura/gui/webcam.py
View File

@ -50,16 +50,18 @@ class webcam(object):
def propertyPages(self):
if self._cam == None:
return []
if win32vidcap != None:
return ['Image properties', 'Format properties']
if cv != None:
#TODO Make an OpenCV property page
return []
elif win32vidcap != None:
return ['Image properties', 'Format properties']
def openPropertyPage(self, pageType = 0):
if self._cam == None:
return
if win32vidcap != None:
if cv != None:
pass
elif win32vidcap != None:
if pageType == 0:
self._cam.displaycapturefilterproperties()
else: