Always check for OpenCV first, in case we have both OpenCV and win32vidcapture
parent
0a1cb67461
commit
22cf43e873
|
@ -50,16 +50,18 @@ class webcam(object):
|
||||||
def propertyPages(self):
|
def propertyPages(self):
|
||||||
if self._cam == None:
|
if self._cam == None:
|
||||||
return []
|
return []
|
||||||
if win32vidcap != None:
|
|
||||||
return ['Image properties', 'Format properties']
|
|
||||||
if cv != None:
|
if cv != None:
|
||||||
#TODO Make an OpenCV property page
|
#TODO Make an OpenCV property page
|
||||||
return []
|
return []
|
||||||
|
elif win32vidcap != None:
|
||||||
|
return ['Image properties', 'Format properties']
|
||||||
|
|
||||||
def openPropertyPage(self, pageType = 0):
|
def openPropertyPage(self, pageType = 0):
|
||||||
if self._cam == None:
|
if self._cam == None:
|
||||||
return
|
return
|
||||||
if win32vidcap != None:
|
if cv != None:
|
||||||
|
pass
|
||||||
|
elif win32vidcap != None:
|
||||||
if pageType == 0:
|
if pageType == 0:
|
||||||
self._cam.displaycapturefilterproperties()
|
self._cam.displaycapturefilterproperties()
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Reference in New Issue