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

gui crash qtimer (#551)

Browse Source 
* locks when qtimer runs out same time as acquisitionfinished

* fix for newer gcc
This commit is contained in:
Dhanya Thattil
2022-09-16 17:02:03 +02:00
committed by GitHub
parent 1df4aba8ec
commit e385618d09
5 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -865,6 +865,7 @@ void qTabMeasurement::SetNextFrameNumber(int val) {
}
void qTabMeasurement::ResetProgress() {
std::lock_guard<std::mutex> lock(mProgress);
LOG(logDEBUG) << "Resetting progress";
lblCurrentFrame->setText("0");
lblCurrentMeasurement->setText("0");
@ -873,6 +874,7 @@ void qTabMeasurement::ResetProgress() {
void qTabMeasurement::UpdateProgress() {
LOG(logDEBUG) << "Updating progress";
std::lock_guard<std::mutex> lock(mProgress);
progressBar->setValue(plot->GetProgress());
lblCurrentFrame->setText(QString::number(plot->GetCurrentFrameIndex()));
lblCurrentMeasurement->setText(QString::number(currentMeasurement));
@ -920,7 +922,6 @@ void qTabMeasurement::StartAcquisition() {
currentMeasurement = 0;
ResetProgress();
Enable(0);
progressBar->setValue(0);
progressTimer->start(100);
emit EnableTabsSignal(false);
}