Commit 70355361 authored by Martin Drechsler's avatar Martin Drechsler

removed an useless function

parent 0ae0b306
...@@ -119,10 +119,6 @@ class CameraWorker(QtCore.QObject): ...@@ -119,10 +119,6 @@ class CameraWorker(QtCore.QObject):
def new_image_acquired(self, acq_index): def new_image_acquired(self, acq_index):
self.imageReadySignal.emit(self.cam.acq_queue.get(), acq_index) self.imageReadySignal.emit(self.cam.acq_queue.get(), acq_index)
@QtCore.pyqtSlot(int)
def new_image_acquired_with_trigger(self, acq_index):
self.imageReadySignal.emit(self.cam.acq_queue.get(), acq_index)
def simple_scan_measurement_start(self, measure_params): def simple_scan_measurement_start(self, measure_params):
if self.cam.CameraAcquiring.getValue(): if self.cam.CameraAcquiring.getValue():
...@@ -143,9 +139,6 @@ class CameraWorker(QtCore.QObject): ...@@ -143,9 +139,6 @@ class CameraWorker(QtCore.QObject):
self.storage.append_metadata_to_current_file(measure_params['spinboxes_dict'], self.cam.GetMetaData(), measure_params) self.storage.append_metadata_to_current_file(measure_params['spinboxes_dict'], self.cam.GetMetaData(), measure_params)
self.cam.TriggerMode.setString('Software') self.cam.TriggerMode.setString('Software')
self.cam.helper.imageAquiredSignal.disconnect(self.new_image_acquired)
self.cam.helper.imageAquiredSignal.connect(self.new_image_acquired_with_trigger)
self._start_acquisition_loop() self._start_acquisition_loop()
self.acq_thread = threading.Thread( self.acq_thread = threading.Thread(
...@@ -160,8 +153,6 @@ class CameraWorker(QtCore.QObject): ...@@ -160,8 +153,6 @@ class CameraWorker(QtCore.QObject):
self._stop_acquisition_loop() self._stop_acquisition_loop()
self.cam.TriggerMode.setString('Internal') self.cam.TriggerMode.setString('Internal')
self.cam.helper.imageAquiredSignal.disconnect(self.new_image_acquired_with_trigger)
self.cam.helper.imageAquiredSignal.connect(self.new_image_acquired)
self.measurementEndingSignal.emit() self.measurementEndingSignal.emit()
print('exiting scan ending in worker') print('exiting scan ending in worker')
......
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