Commit b7572d61 authored by Martin Drechsler's avatar Martin Drechsler

solved a very irrelevant merge issue

parents e5c1f542 48d542ed
...@@ -16,6 +16,9 @@ from pyqtgraph_subclasses import CustomRectangularROI ...@@ -16,6 +16,9 @@ from pyqtgraph_subclasses import CustomRectangularROI
from zylaCameraWorker import CameraWorker from zylaCameraWorker import CameraWorker
from cameraParameterTree import CameraParameterTree from cameraParameterTree import CameraParameterTree
from drivers.andorzyla import AndorZyla
#from dummyAndor import AndorZyla
import sys import sys
import numpy as np import numpy as np
...@@ -188,8 +191,10 @@ class CameraGuiMainWindow(QMainWindow): ...@@ -188,8 +191,10 @@ class CameraGuiMainWindow(QMainWindow):
if __name__ == "__main__": if __name__ == "__main__":
app = QtGui.QApplication([]) app = QtGui.QApplication([])
camera = AndorZyla(0)
myGuiMainWindow = CameraGuiMainWindow() myGuiMainWindow = CameraGuiMainWindow()
cameraWorker = CameraWorker() cameraWorker = CameraWorker(andor_camera=camera)
cameraWorker.make_connections(myGuiMainWindow) cameraWorker.make_connections(myGuiMainWindow)
myGuiMainWindow.make_connections(cameraWorker) myGuiMainWindow.make_connections(cameraWorker)
......
...@@ -10,7 +10,6 @@ Created on Thu Apr 4 11:10:20 2019 ...@@ -10,7 +10,6 @@ Created on Thu Apr 4 11:10:20 2019
import numpy as np import numpy as np
from PyQt5 import QtCore from PyQt5 import QtCore
# from drivers.andorzyla import AndorZyla # from drivers.andorzyla import AndorZyla
from dummyAndor import AndorZyla from dummyAndor import AndorZyla
import threading import threading
...@@ -19,10 +18,10 @@ import threading ...@@ -19,10 +18,10 @@ import threading
class CameraWorker(QtCore.QObject): class CameraWorker(QtCore.QObject):
imageReadySignal = QtCore.pyqtSignal(np.ndarray, int) imageReadySignal = QtCore.pyqtSignal(np.ndarray, int)
def __init__(self): def __init__(self, andor_camera):
super().__init__() super().__init__()
self.cam = AndorZyla(0) self.cam = andor_camera
self.cam.Init() self.cam.Init()
print("camera worker initialized") print("camera worker initialized")
...@@ -67,6 +66,7 @@ class CameraWorker(QtCore.QObject): ...@@ -67,6 +66,7 @@ class CameraWorker(QtCore.QObject):
print('Acq parameters: ') print('Acq parameters: ')
for p in params.children()[0].children(): for p in params.children()[0].children():
print(p.name(), p.value()) print(p.name(), p.value())
params.child('Basic acq parameters').child('Camera name').setValue( params.child('Basic acq parameters').child('Camera name').setValue(
self.cam.CameraModel.getValue()) self.cam.CameraModel.getValue())
self.cam.ExposureTime.setValue( self.cam.ExposureTime.setValue(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment