Commit 8ba0a33b authored by Martin Drechsler's avatar Martin Drechsler

everything merged properly

parent e5b1ea04
...@@ -11,7 +11,7 @@ import time ...@@ -11,7 +11,7 @@ import time
import threading import threading
class Helper_messager(QtCore.QObject): class Helper_messager(QtCore.QObject):
imageAquiredSignal = QtCore.pyqtSignal() imageAquiredSignal = QtCore.pyqtSignal(int)
class AndorZyla(): class AndorZyla():
...@@ -25,7 +25,7 @@ class AndorZyla(): ...@@ -25,7 +25,7 @@ class AndorZyla():
self.CameraAcquiring.setValue(False) self.CameraAcquiring.setValue(False)
self.acq_index_i = 0
def Init(self): def Init(self):
print('Dummy camera initialized') print('Dummy camera initialized')
...@@ -35,12 +35,13 @@ class AndorZyla(): ...@@ -35,12 +35,13 @@ class AndorZyla():
while getattr(t, "do_run", True): while getattr(t, "do_run", True):
time.sleep(self.ExposureTime.getValue()) time.sleep(self.ExposureTime.getValue())
self.current_image = self._twoD_gaussian() self.current_image = self._twoD_gaussian()
self.helper.imageAquiredSignal.emit() self.helper.imageAquiredSignal.emit(self.acq_index_i)
self.acq_index_i = self.acq_index_i + 1
print('stopping acq loop thread') print('stopping acq loop thread')
def live_acquisition_configure(self): def live_acquisition_configure(self):
pass self.acq_index_i = 0
def AcquisitionStart(self): def AcquisitionStart(self):
self.CameraAcquiring.setValue(True) self.CameraAcquiring.setValue(True)
......
...@@ -10,8 +10,8 @@ Created on Thu Apr 4 11:10:20 2019 ...@@ -10,8 +10,8 @@ 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
...@@ -26,9 +26,6 @@ class CameraWorker(QtCore.QObject): ...@@ -26,9 +26,6 @@ class CameraWorker(QtCore.QObject):
self.cam = AndorZyla(0) self.cam = AndorZyla(0)
self.cam.Init() self.cam.Init()
self.cam.ExposureTime.setValue(.1) self.cam.ExposureTime.setValue(.1)
#self.cam.FrameRate.setValue(9)
self.cam.AOIBinning.setIndex(4)
self.isCameraAcquiring = False self.isCameraAcquiring = False
......
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