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

fixed zmin zmax bug, automatically online when refreshing advanced tab bug, outdir not checking properly

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@178 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2013-05-08 17:32:38 +00:00
parent 7701531ff3
commit e153c6fd58
8 changed files with 77 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
slsDetectorGui/src/qTabAdvanced.cpp
View File

@ -140,8 +140,10 @@ void qTabAdvanced::SetupWidgetWindow(){
//check if its online and set it to red if offline
det->checkOnline();
det->checkReceiverOnline();
if(det->setOnline()==slsDetectorDefs::ONLINE_FLAG)
det->checkOnline();
if(det->setReceiverOnline()==slsDetectorDefs::ONLINE_FLAG)
det->checkReceiverOnline();
comboOnline->setCurrentIndex(det->setOnline());
comboRxrOnline->setCurrentIndex(det->setReceiverOnline());
if(!comboOnline->currentIndex()){
@ -571,7 +573,10 @@ void qTabAdvanced::SetReceiverOnline(int index){
cout << "Setting Reciever Online to :" << index << endl;
#endif
disconnect(comboRxrOnline, SIGNAL(currentIndexChanged(int)), this, SLOT(SetReceiverOnline(int)));
comboRxrOnline->setCurrentIndex(det->setReceiverOnline(index));
if(index)
SetReceiver();
else
comboRxrOnline->setCurrentIndex(det->setReceiverOnline(index));
qDefs::checkErrorMessage(det);
connect(comboRxrOnline, SIGNAL(currentIndexChanged(int)), this, SLOT(SetReceiverOnline(int)));
//highlight in red if offline
@ -648,8 +653,11 @@ void qTabAdvanced::SetReceiver(){
#ifdef VERBOSE
cout << "Setting Receiver" << endl;
#endif
string outdir = myDet->getFilePath();
dispRxrHostname->setText(QString(det->setReceiver(dispRxrHostname->text().toAscii().constData())));
qDefs::checkErrorMessage(det);
det->setFilePath(outdir);
qDefs::checkErrorMessage(det);
Refresh();
}
@ -909,8 +917,10 @@ void qTabAdvanced::SetDetector(int index){
//check if its online and set it to red if offline
det->checkOnline();
det->checkReceiverOnline();
if(det->setOnline()==slsDetectorDefs::ONLINE_FLAG)
det->checkOnline();
if(det->setReceiverOnline()==slsDetectorDefs::ONLINE_FLAG)
det->checkReceiverOnline();
comboOnline->setCurrentIndex(det->setOnline());
comboRxrOnline->setCurrentIndex(det->setReceiverOnline());
//highlight in red if detector or receiver is offline
@ -1026,7 +1036,8 @@ void qTabAdvanced::Refresh(){
disconnect(comboOnline, SIGNAL(currentIndexChanged(int)), this, SLOT(SetOnline(int)));
//so that updated status
det->checkOnline();
if(det->setOnline()==slsDetectorDefs::ONLINE_FLAG)
det->checkOnline();
comboOnline->setCurrentIndex(det->setOnline());
spinControlPort->setValue(det->getControlPort());
spinStopPort->setValue(det->getStopPort());
@ -1053,7 +1064,8 @@ void qTabAdvanced::Refresh(){
dispMAC->setText(det->getDetectorMAC());
//so that updated status
det->checkReceiverOnline();
if(det->setReceiverOnline()==slsDetectorDefs::ONLINE_FLAG)
det->checkReceiverOnline();
comboRxrOnline->setCurrentIndex(det->setReceiverOnline());
dispRxrHostname->setText(det->getReceiver());