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

bug fix for gap pixels with multi frames in gui (issue with overwriting original npixelsx and npixelsy with gap values

Browse Source
This commit is contained in:
maliakal_d 2020-10-27 16:50:42 +01:00
parent de4c834b44
commit 671ee3179e
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
slsDetectorSoftware/src/DetectorImpl.cpp
View File

@ -640,24 +640,26 @@ void DetectorImpl::readFrameFromReceiver() {
if (data) { if (data) {
char *callbackImage = multiframe.get(); char *callbackImage = multiframe.get();
int imagesize = multisize; int imagesize = multisize;
int nDetActualPixelsX = nDetPixelsX;
int nDetActualPixelsY = nDetPixelsY;
if (gapPixels) { if (gapPixels) {
int n = InsertGapPixels(multiframe.get(), multigappixels, int n = InsertGapPixels(multiframe.get(), multigappixels,
quadEnable, dynamicRange, nDetPixelsX, quadEnable, dynamicRange,
nDetPixelsY); nDetActualPixelsX, nDetActualPixelsY);
callbackImage = multigappixels; callbackImage = multigappixels;
imagesize = n; imagesize = n;
} }
LOG(logDEBUG) << "Image Info:" LOG(logDEBUG) << "Image Info:"
<< "\n\tnDetPixelsX: " << nDetPixelsX << "\n\tnDetActualPixelsX: " << nDetActualPixelsX
<< "\n\tnDetPixelsY: " << nDetPixelsY << "\n\tnDetActualPixelsY: " << nDetActualPixelsY
<< "\n\timagesize: " << imagesize << "\n\timagesize: " << imagesize
<< "\n\tdynamicRange: " << dynamicRange; << "\n\tdynamicRange: " << dynamicRange;
thisData = thisData = new detectorData(currentProgress, currentFileName,
new detectorData(currentProgress, currentFileName, nDetPixelsX, nDetActualPixelsX, nDetActualPixelsY,
nDetPixelsY, callbackImage, imagesize, callbackImage, imagesize, dynamicRange,
dynamicRange, currentFileIndex, completeImage); currentFileIndex, completeImage);
dataReady( dataReady(
thisData, currentFrameIndex, thisData, currentFrameIndex,