mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-05-08 05:40:03 +02:00
gui ensuring receiver offline caught, also at progress
This commit is contained in:
parent
9031b3998b
commit
96d8478b46
@ -756,9 +756,12 @@ void qDetectorMain::EnableTabs(){
|
||||
#ifdef VERBOSE
|
||||
cout << "Entering EnableTabs function" << endl;
|
||||
#endif
|
||||
|
||||
|
||||
bool enable;
|
||||
enable=!(tabs->isTabEnabled(DataOutput));
|
||||
|
||||
|
||||
// or use the Enable/Disable button
|
||||
// normal tabs
|
||||
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
|
||||
if(!enable) {
|
||||
myDet->setOnline(slsDetectorDefs::ONLINE_FLAG);
|
||||
myDet->setReceiverOnline(slsDetectorDefs::ONLINE_FLAG);
|
||||
qDefs::checkErrorMessage(myDet,"qDetectorMain::EnableTabs");
|
||||
//refresh all the required tabs
|
||||
tab_actions->Refresh();// angular, positions,
|
||||
|
||||
|
@ -391,6 +391,7 @@ void qTabMeasurement::SetCurrentMeasurement(int val){
|
||||
void qTabMeasurement::UpdateProgress(){
|
||||
progressBar->setValue((int)myPlot->GetProgress());
|
||||
lblProgressIndex->setText(QString::number(myPlot->GetFrameIndex()));
|
||||
qDefs::checkErrorMessage(myDet,"qTabMeasurement::UpdateProgress");
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user