detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 10:07:59 +02:00
Code Issues Actions Packages Releases Activity

gui exception thrown from acquire caught properly in gui

Browse Source
This commit is contained in:
maliakal_d
2020-11-17 17:39:34 +01:00
parent 6563965787
commit 7fcac35549
6 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorGui/include/qDrawPlot.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "sls/Detector.h"
#include "qDefs.h"
#include "sls/Detector.h"
#include "ui_form_plot.h"
#include <mutex>
@ -63,7 +63,7 @@ class qDrawPlot : public QWidget, private Ui::PlotObject {
signals:
void AcquireFinishedSignal();
void AbortSignal();
void AbortSignal(QString);
void UpdateSignal();
private:

2
slsDetectorGui/include/qTabMeasurement.h
View File

@ -16,7 +16,7 @@ class qTabMeasurement : public QWidget, private Ui::TabMeasurementObject {
public slots:
void AcquireFinished();
void AbortAcquire();
void AbortAcquire(QString exmsg);
private slots:
void SetTimingMode(int val);