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

gui ensuring receiver offline caught, also at progress

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-11-22 13:59:27 +01:00
parent 9031b3998b
commit 96d8478b46
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorGui/src/qDetectorMain.cpp
View File

@ -756,9 +756,12 @@ void qDetectorMain::EnableTabs(){
#ifdef VERBOSE #ifdef VERBOSE
cout << "Entering EnableTabs function" << endl; cout << "Entering EnableTabs function" << endl;
#endif #endif
bool enable; bool enable;
enable=!(tabs->isTabEnabled(DataOutput)); enable=!(tabs->isTabEnabled(DataOutput));
// or use the Enable/Disable button // or use the Enable/Disable button
// normal tabs // normal tabs
tabs->setTabEnabled(DataOutput,enable); tabs->setTabEnabled(DataOutput,enable);
@ -790,6 +793,9 @@ void qDetectorMain::EnableTabs(){
//moved to here, so that its all in order, instead of signals and different threads //moved to here, so that its all in order, instead of signals and different threads
if(!enable) { if(!enable) {
myDet->setOnline(slsDetectorDefs::ONLINE_FLAG);
myDet->setReceiverOnline(slsDetectorDefs::ONLINE_FLAG);
qDefs::checkErrorMessage(myDet,"qDetectorMain::EnableTabs");
//refresh all the required tabs //refresh all the required tabs
tab_actions->Refresh();// angular, positions, tab_actions->Refresh();// angular, positions,

1
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -391,6 +391,7 @@ void qTabMeasurement::SetCurrentMeasurement(int val){
void qTabMeasurement::UpdateProgress(){ void qTabMeasurement::UpdateProgress(){
progressBar->setValue((int)myPlot->GetProgress()); progressBar->setValue((int)myPlot->GetProgress());
lblProgressIndex->setText(QString::number(myPlot->GetFrameIndex())); lblProgressIndex->setText(QString::number(myPlot->GetFrameIndex()));
qDefs::checkErrorMessage(myDet,"qTabMeasurement::UpdateProgress");
} }