Skip to content

Commit 166aead

Browse files
authored
Merge pull request #4 from DeepLabCut/windows-camera
bugfix: windows camera import
2 parents ec09593 + 281aae8 commit 166aead

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

dlclivegui/camera/__init__.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
from dlclivegui.camera.opencv import OpenCVCam
1313

1414
if platform.system() == "Windows":
15-
from dlclivegui.camera.tiscamera_windows import TISCam
15+
try:
16+
from dlclivegui.camera.tiscamera_windows import TISCam
17+
except Exception as e:
18+
pass
1619

1720
if platform.system() == "Linux":
1821
try:

docs/camera_support.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
## Camera Support
22

33
### Windows
4-
5-
- **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/).
4+
- **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/).
65
- **OpenCV compatible cameras**: OpenCV is installed with DeepLabCut-live-GUI, so webcams or other cameras compatible with OpenCV on Windows require no additional installation.
76

87
### Linux and NVIDIA Jetson Development Kits

0 commit comments

Comments
 (0)