From 671ee3179edc06614adb1869593fa4e3d6c7d0ad Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 27 Oct 2020 16:50:42 +0100 Subject: [PATCH] bug fix for gap pixels with multi frames in gui (issue with overwriting original npixelsx and npixelsy with gap values --- slsDetectorSoftware/src/DetectorImpl.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/slsDetectorSoftware/src/DetectorImpl.cpp b/slsDetectorSoftware/src/DetectorImpl.cpp index eb29524b6..0894806a2 100644 --- a/slsDetectorSoftware/src/DetectorImpl.cpp +++ b/slsDetectorSoftware/src/DetectorImpl.cpp @@ -640,24 +640,26 @@ void DetectorImpl::readFrameFromReceiver() { if (data) { char *callbackImage = multiframe.get(); int imagesize = multisize; + int nDetActualPixelsX = nDetPixelsX; + int nDetActualPixelsY = nDetPixelsY; if (gapPixels) { int n = InsertGapPixels(multiframe.get(), multigappixels, - quadEnable, dynamicRange, nDetPixelsX, - nDetPixelsY); + quadEnable, dynamicRange, + nDetActualPixelsX, nDetActualPixelsY); callbackImage = multigappixels; imagesize = n; } LOG(logDEBUG) << "Image Info:" - << "\n\tnDetPixelsX: " << nDetPixelsX - << "\n\tnDetPixelsY: " << nDetPixelsY + << "\n\tnDetActualPixelsX: " << nDetActualPixelsX + << "\n\tnDetActualPixelsY: " << nDetActualPixelsY << "\n\timagesize: " << imagesize << "\n\tdynamicRange: " << dynamicRange; - thisData = - new detectorData(currentProgress, currentFileName, nDetPixelsX, - nDetPixelsY, callbackImage, imagesize, - dynamicRange, currentFileIndex, completeImage); + thisData = new detectorData(currentProgress, currentFileName, + nDetActualPixelsX, nDetActualPixelsY, + callbackImage, imagesize, dynamicRange, + currentFileIndex, completeImage); dataReady( thisData, currentFrameIndex,