irrelevant

bab4d704 · Martin Drechsler · 5af0befe · bab4d704 · bab4d704
Commit bab4d704 authored 5 years ago by Martin Drechsler
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

main.py main.py +2 -2

webcams.py resources/webcams.py +2 -2

No files found.
--- a/main.py
+++ b/main.py
    
 from PyQt5 import QtGui, QtCore
-#from drivers.andorzyla import AndorZyla
-from drivers.dummyAndor import AndorZyla
+from drivers.andorzyla import AndorZyla
+#from drivers.dummyAndor import AndorZyla

 from cameraGui import CameraGuiMainWindow
 from zylaCameraWorker import CameraWorker

--- a/resources/webcams.py
+++ b/resources/webcams.py
@@ -7,8 +7,8 @@ This is a temporary script file.

 import cv2

-cap = cv2.VideoCapture(2)
-cap1 = cv2.VideoCapture(3)
+cap = cv2.VideoCapture(0)
+cap1 = cv2.VideoCapture(1)

 while(True):
    # Capture frame-by-frame