bad channel not read on refresh or start up, makefile reverted to compile

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@175 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2013-04-30 15:05:21 +00:00
parent 35f151775e
commit 675ab8ceca
2 changed files with 20 additions and 21 deletions

View File

@ -110,12 +110,12 @@ void qTabDataOutput::SetupWidgetWindow(){
#endif
int nb=myDet->getBadChannelCorrection();
disconnect(chkDiscardBad, SIGNAL(toggled(bool)));
if(nb) chkDiscardBad->setChecked(true);
if(myDet->getBadChannelCorrection())
chkDiscardBad->setChecked(true);
else
chkDiscardBad->setChecked(false);
connect(chkDiscardBad, SIGNAL(toggled(bool)), this, SLOT(DiscardBadChannels()));
#ifdef VERBOSE
@ -571,12 +571,13 @@ void qTabDataOutput::Refresh(){
// cout << "ff " << myDet->getBadChannelCorrection() << endl;
#endif
// disconnect(chkDiscardBad, SIGNAL(toggled(bool)));
if(myDet->getBadChannelCorrection()) chkDiscardBad->setChecked(true);
// connect(chkDiscardBad, SIGNAL(toggled(bool)), this, SLOT(DiscardBadChannels()));
disconnect(chkDiscardBad, SIGNAL(toggled(bool)));
if(myDet->getBadChannelCorrection())
chkDiscardBad->setChecked(true);
else
chkDiscardBad->setChecked(false);
connect(chkDiscardBad, SIGNAL(toggled(bool)), this, SLOT(DiscardBadChannels()));
if(myDet->setReceiverOnline()==slsDetectorDefs::ONLINE_FLAG){
btnOutputBrowse->setEnabled(false);