fixing warnings, and completing bug fix of gui and data gui call back

This commit is contained in:
2019-04-12 10:13:02 +02:00
parent d17fd54a9d
commit 5fdb090926
3 changed files with 6 additions and 6 deletions

View File

@@ -3289,13 +3289,13 @@ void multiSlsDetector::readFrameFromReceiver() {
if (dynamicRange == 4 && gappixelsenable) {
int n = processImageWithGapPixels(multiframe, multigappixels);
thisData =
new detectorData(getCurrentProgress(), currentFileName.c_str(), nPixelsX,
nPixelsY, multigappixels, n, dynamicRange, currentFileIndex);
new detectorData(getCurrentProgress(), currentFileName.c_str(), nCompletePixelsX,
nCompletePixelsY, multigappixels, n, dynamicRange, currentFileIndex);
}
// normal pixels
else {
thisData = new detectorData(getCurrentProgress(), currentFileName.c_str(), nPixelsX,
nPixelsY, multiframe, multisize, dynamicRange,
thisData = new detectorData(getCurrentProgress(), currentFileName.c_str(), nCompletePixelsX,
nCompletePixelsY, multiframe, multisize, dynamicRange,
currentFileIndex);
}
dataReady(thisData, currentFrameIndex,