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

progress changed to double

Browse Source
This commit is contained in:
maliakal_d
2020-08-14 12:16:35 +02:00
parent 28ffad223d
commit de69e666a9
10 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -248,7 +248,7 @@ bool qDrawPlot::GetIsRunning() { return isRunning; }
void qDrawPlot::SetRunning(bool enable) { isRunning = enable; }
int qDrawPlot::GetProgress() { return progress; }
double qDrawPlot::GetProgress() { return progress; }
int64_t qDrawPlot::GetCurrentFrameIndex() { return currentFrame; }
@ -717,7 +717,7 @@ void qDrawPlot::AcquisitionFinished(double currentProgress,
LOG(logERROR) << "Acquisition finished [Status: ERROR]";
} else {
LOG(logINFO) << "Acquisition finished [ Status:" << status
<< ", Progress: " << currentProgress << " ]";
<< ", Progress: " << currentProgress << "% ]";
}
emit AcquireFinishedSignal();
}
@ -741,10 +741,10 @@ void qDrawPlot::GetData(detectorData *data, uint64_t frameIndex,
<< " \t complete image: " << data->completeImage << std::endl
<< " ]";
progress = (int)data->progressIndex;
progress = data->progressIndex;
currentAcqIndex = data->fileIndex;
currentFrame = frameIndex;
LOG(logDEBUG) << "[ Progress:" << progress << ", Frame:" << currentFrame
LOG(logDEBUG) << "[ Progress:" << progress << "%, Frame:" << currentFrame
<< " ]";
// 1d check if npixelX has changed (m3 for different counters enabled)