detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-24 15:20:02 +02:00
Code Issues Actions Packages Releases Activity

gui callback exception caught

Browse Source
This commit is contained in:
maliakal_d 2020-11-17 14:01:53 +01:00
parent 918f3f3fde
commit 146d605d19
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -1,8 +1,8 @@
#include "qDrawPlot.h" #include "qDrawPlot.h"
#include "SlsQt1DPlot.h" #include "SlsQt1DPlot.h"
#include "SlsQt2DPlot.h" #include "SlsQt2DPlot.h"
#include "sls/detectorData.h"
#include "qCloneWidget.h" #include "qCloneWidget.h"
#include "sls/detectorData.h"
#include "sls/ToString.h" #include "sls/ToString.h"
#include "sls/detectorData.h" #include "sls/detectorData.h"

13
slsDetectorSoftware/src/DetectorImpl.cpp
View File

@ -660,11 +660,14 @@ void DetectorImpl::readFrameFromReceiver() {
nDetActualPixelsX, nDetActualPixelsY, nDetActualPixelsX, nDetActualPixelsY,
callbackImage, imagesize, dynamicRange, callbackImage, imagesize, dynamicRange,
currentFileIndex, completeImage); currentFileIndex, completeImage);
try {
dataReady( dataReady(
thisData, currentFrameIndex, thisData, currentFrameIndex,
((dynamicRange == 32 && eiger) ? currentSubFrameIndex : -1), ((dynamicRange == 32 && eiger) ? currentSubFrameIndex : -1),
pCallbackArg); pCallbackArg);
} catch (const std::exception &e) {
LOG(logERROR) << "Exception caught from callback: " << e.what();
}
delete thisData; delete thisData;
} }
} }