Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -86,18 +86,17 @@ def ini_detector(self, controller=None):
initialized: bool
False if initialization failed otherwise True
"""
if self.settings['controller_status'] == 'Master':
if self.is_master:
if 'win' in platform:
new_controller = cv2.VideoCapture(self.settings['camera_index'], cv2.CAP_DSHOW)
self.controller = cv2.VideoCapture(self.settings['camera_index'], cv2.CAP_DSHOW)
else:
new_controller = cv2.VideoCapture(self.settings['camera_index'])
self.controller = cv2.VideoCapture(self.settings['camera_index'])
# to add settable settings to the param list (but driver builtin settings window is prefered (OpenCVProp['CV_CAP_PROP_SETTINGS'])
self.get_active_properties()

self.ini_detector_init(old_controller=controller,
new_controller=new_controller)
else:
self.controller = controller

if self.settings['controller_status'] == 'Master':
self.get_active_properties()

self.x_axis = self.get_xaxis()
self.y_axis = self.get_yaxis()
Expand Down
Loading