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

some debugging at the beamline, still crashing sl6 64bit, angular conversion etc.

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@174 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
x04sa
2013-04-30 11:26:22 +00:00
parent 4719fff09a
commit 35f151775e
3 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
slsDetectorGui/src/qTabDataOutput.cpp
View File

@ -106,10 +106,22 @@ void qTabDataOutput::SetupWidgetWindow(){
//discard bad channels from server
#ifdef VERBOSE
cout << "Getting bad channel correction" << endl;
cout << "func " << myDet->getBadChannelCorrection() << endl;
#endif
if(myDet->getBadChannelCorrection()) chkDiscardBad->setChecked(true);
int nb=myDet->getBadChannelCorrection();
disconnect(chkDiscardBad, SIGNAL(toggled(bool)));
if(nb) chkDiscardBad->setChecked(true);
connect(chkDiscardBad, SIGNAL(toggled(bool)), this, SLOT(DiscardBadChannels()));
#ifdef VERBOSE
cout << "done" << endl;
#endif
qDefs::checkErrorMessage(myDet);
}
@ -486,19 +498,19 @@ void qTabDataOutput::SetAngularCorrection(){
void qTabDataOutput::DiscardBadChannels(){
#ifdef VERYVERBOSE
//#ifdef VERYVERBOSE
cout << "Entering Discard bad channels function" << endl;
#endif
//#endif
if(chkDiscardBad->isChecked()){
myDet->setBadChannelCorrection("default");
#ifdef VERBOSE
cout << "Setting bad channel correction to default" << endl;
#endif
myDet->setBadChannelCorrection("default");
}else{
myDet->setBadChannelCorrection("");
#ifdef VERBOSE
cout << "Unsetting bad channel correction" << endl;
#endif
myDet->setBadChannelCorrection("");
}
qDefs::checkErrorMessage(myDet);
@ -556,10 +568,16 @@ void qTabDataOutput::Refresh(){
//discard bad channels from server
#ifdef VERBOSE
cout << "Getting bad channel correction" << endl;
// 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()));
if(myDet->setReceiverOnline()==slsDetectorDefs::ONLINE_FLAG){
btnOutputBrowse->setEnabled(false);
btnOutputBrowse->setToolTip("<font color=\"red\">This button is disabled as receiver PC is different from "