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

bug fix: update measurement index, update index does not use sharedmemory, start run index updated after measurement

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@78 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2012-09-25 16:08:10 +00:00
parent cfce337c46
commit bdabf9e649
3 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -75,7 +75,6 @@ void qTabMeasurement::SetupWidgetWindow(){
lblProgressIndex->setText(QString::number(myDet->getFileIndex()));
//ly initially
progressBar->setValue(0);
currentMeasurement = 0;
//timing mode
SetupTimingMode();
@ -301,8 +300,6 @@ void qTabMeasurement::startStopAcquisition(){
btnStartStop->setIcon(*iconStop);
Enable(0);
progressBar->setValue(0);
//the progress which keeps adding up for all the measurements
currentMeasurement = 0;
progressTimer->start(100);
emit StartSignal();
@ -313,6 +310,7 @@ void qTabMeasurement::startStopAcquisition(){
emit StopSignal();
myDet->stopAcquisition();
progressTimer->stop();
spinIndex->setValue(myPlot->GetFileIndex());
btnStartStop->setText("Start");
btnStartStop->setIcon(*iconStart);
btnStartStop->setChecked(false);
@ -333,6 +331,7 @@ void qTabMeasurement::UpdateFinished(){
Enable(1);
connect(btnStartStop,SIGNAL(clicked()),this,SLOT(startStopAcquisition()));
UpdateProgress();
spinIndex->setValue(myPlot->GetFileIndex());
progressTimer->stop();
}
}
@ -342,8 +341,8 @@ void qTabMeasurement::UpdateFinished(){
void qTabMeasurement::SetCurrentMeasurement(int val){
currentMeasurement = val;
lblCurrentMeasurement->setText(QString::number(val+1));
if((val)<spinNumMeasurements->value())
lblCurrentMeasurement->setText(QString::number(val+1));
}
@ -352,7 +351,6 @@ void qTabMeasurement::SetCurrentMeasurement(int val){
void qTabMeasurement::UpdateProgress(){
//progressBar->setValue((int)(((currentMeasurement*100)+(myPlot->GetProgress()))/spinNumMeasurements->value()));
progressBar->setValue((int)myPlot->GetProgress());
lblProgressIndex->setText(QString::number(myPlot->GetFileIndex()));
}