Commit ff9142ea authored by Josef Brandt's avatar Josef Brandt

Several fixes

parent 8b813392
......@@ -28,7 +28,6 @@ import sys, os
import cv2
from .helperfunctions import cv2imread_fix, cv2imwrite_fix
from time import time
import sys
from .opticalbackground import BackGroundManager
from .uielements import TimeEstimateProgressbar
from .zlevelsetter import ZLevelSetter
......
......@@ -347,13 +347,14 @@ class WITecCOM(RamanBase):
self.doSpectralAutoFocus()
self.acquireSilentSpectrum(num)
def finishMeasurement(self):
def finishMeasurement(self, aborted=False):
if self.advancedInterface:
self.advSpec.createSummarizedSpecFiles()
state = self.BeamPathState.GetValue()
if state == 'Raman':
self.MicroscopeIdle.SetValue('BeamPath|SetStateVideo')
self.BeamPathSetVideoState.OperateTrigger()
if not aborted:
self.advSpec.createSummarizedSpecFiles()
def initiateTimeSeriesMeasurement(self, ramanSettings):
self.timeseries = ramanSettings['numPoints']
......
......@@ -68,5 +68,5 @@ class RamanBase(object):
def triggerMeasurement(self, num):
raise NotImplementedError
def finishMeasurement(self):
def finishMeasurement(self, aborted=False):
raise NotImplementedError
\ No newline at end of file
......@@ -186,6 +186,7 @@ class RamanScanUI(QtWidgets.QWidget):
QtWidgets.QMessageBox.No, QtWidgets.QMessageBox.No)
if reply == QtWidgets.QMessageBox.Yes:
self.timer.stop()
self.ramanctrl.finishMeasurement(aborted=True)
self.progressbar.resetTimerAndCounter()
self.processstopevent.set()
self.process.join()
......
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