From 27681a9c13abadc7ddb878ddd2db8e59be80634e Mon Sep 17 00:00:00 2001 From: Gary Kane Date: Mon, 12 Oct 2020 19:01:59 -0400 Subject: [PATCH 1/2] bugfix: windows camera import --- dlclivegui/camera/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlclivegui/camera/__init__.py b/dlclivegui/camera/__init__.py index 00f07d4..54e8a29 100644 --- a/dlclivegui/camera/__init__.py +++ b/dlclivegui/camera/__init__.py @@ -12,7 +12,10 @@ from dlclivegui.camera.opencv import OpenCVCam if platform.system() == "Windows": - from dlclivegui.camera.tiscamera_windows import TISCam + try: + from dlclivegui.camera.tiscamera_windows import TISCam + except Exception as e: + pass if platform.system() == "Linux": try: From 281aae8324ef210677122bdac7e88921d17b4f96 Mon Sep 17 00:00:00 2001 From: Gary Kane Date: Mon, 12 Oct 2020 19:18:15 -0400 Subject: [PATCH 2/2] Update camera_support.md --- docs/camera_support.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/camera_support.md b/docs/camera_support.md index 019a285..ee6d8a3 100644 --- a/docs/camera_support.md +++ b/docs/camera_support.md @@ -1,8 +1,7 @@ ## Camera Support ### Windows - -- **The Imaging Source USB3 Cameras**: via code based on [Windows code samples](https://github.com/TheImagingSource/IC-Imaging-Control-Samples) provided by The Imaging Source. To use The Imaging Source USB3 cameras on Windows, you must first [install their drivers](https://www.theimagingsource.com/support/downloads-for-windows/). +- **The Imaging Source USB3 Cameras**: via code based on [Windows code samples](https://github.com/TheImagingSource/IC-Imaging-Control-Samples) provided by The Imaging Source. To use The Imaging Source USB3 cameras on Windows, you must first [install their drivers](https://www.theimagingsource.com/support/downloads-for-windows/device-drivers/icwdmuvccamtis/) and [C library](https://www.theimagingsource.com/support/downloads-for-windows/software-development-kits-sdks/tisgrabberdll/). - **OpenCV compatible cameras**: OpenCV is installed with DeepLabCut-live-GUI, so webcams or other cameras compatible with OpenCV on Windows require no additional installation. ### Linux and NVIDIA Jetson Development Kits