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

change outdir for all receivers in gui

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@208 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d 2013-07-24 09:38:55 +00:00
parent 27a21cc258
commit 68f360e395
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorGui/include/qDefs.h
View File

@ -218,9 +218,10 @@ static const int64_t GUI_VERSION=0x20121213;
/**gets error mask and displays the message if it exists
* @param myDet is the slsdetector object
* @param show to display the error message
/returns error message else an empty string
* */
static string checkErrorMessage(slsDetector*& myDet){
static string checkErrorMessage(slsDetector*& myDet,bool show = true){
int errorLevel= (int)WARNING;
@ -244,7 +245,8 @@ static const int64_t GUI_VERSION=0x20121213;
retval.append("</font></nobr>");
//display message
qDefs::Message((MessageIndex)errorLevel,retval,"Main");
if(show)
qDefs::Message((MessageIndex)errorLevel,retval,"Main");
}
myDet->clearErrorMask();

32
slsDetectorGui/src/qTabDataOutput.cpp
View File

@ -670,30 +670,33 @@ int qTabDataOutput::VerifyOutputDirectory(){
#endif
bool error = false;
QString errTip = outDirTip;
bool receiver = (!comboDetector->itemText(0).compare("All"));
bool receiver = (comboDetector->itemText(0).compare("All"));
string path = string(dispReadOutputDir->text().toAscii().constData());
string detName = "";
string mess = "";
//for each detector
for(int i=0;i<myDet->getNumberOfDetectors();i++){
slsDetector *det = myDet->getSlsDetector(i);
qDefs::checkErrorMessage(myDet);
if(receiver){
detName = string(" for ") + string(comboDetector->itemText(i).toAscii().constData()) + string(" readout");
detName = string("\n - ") + string(comboDetector->itemText(i).toAscii().constData()) ;
path = det->getFilePath();
}
if(det->setFilePath(path).empty()){
qDefs::Message(qDefs::WARNING,string("Enter a valid output directory ") + detName,"Data Output");
mess. append(detName);
error = true;
}else if(!qDefs::checkErrorMessage(det).empty()){
}else if(!qDefs::checkErrorMessage(det,false).empty()){
mess. append(detName);
error = true;
}
/*
//verify all paths are the same for no receiver
if ((!receiver) && (path != det->getFilePath())){
error = true;
qDefs::Message(qDefs::WARNING,string("Enter a valid output directory ") + detName,"Data Output");
}
qDefs::Message(qDefs::WARNING,string("Enter a valid output directory ") + detName,"Data Output Verify");
}*/
myDet->setFilePath(det->getFilePath());
}
@ -711,12 +714,19 @@ int qTabDataOutput::VerifyOutputDirectory(){
#ifdef VERBOSE
cout << "The output path doesnt exist anymore" << endl;
#endif
//replace all \n with <br>
pos = 0;
while((pos = mess.find("\n", pos)) != string::npos){
mess.replace(pos, 1, "<br>");
pos += 1;
}
qDefs::Message(qDefs::WARNING,string("Invalid Output Directory ")+ mess,"Data Output");
dispReadOutputDir->setPalette(*red1);
boxOutDir->setPalette(red);
errTip = errTip +
QString("<br><nobr><font color=\"red\">"
"Enter a valid path for ") + QString(detName.c_str()) +
QString( " readout to change <b>Output Directory</b>.</font></nobr>");
"Invalid <b>Output Directory</b>") + QString(mess.c_str()) +
QString( ".</font></nobr>");
boxOutDir->setToolTip(errTip);
if(receiver)
@ -757,7 +767,7 @@ void qTabDataOutput::SetOutputDir(){
#endif
bool error = false;
bool receiver = (!comboDetector->itemText(0).compare("All"));
bool receiver = (comboDetector->itemText(0).compare("All"));
QString path = dispOutputDir->text();
if(path.isEmpty())
@ -793,9 +803,8 @@ void qTabDataOutput::SetOutputDir(){
slsDetector *det = myDet->getSlsDetector(i);
qDefs::checkErrorMessage(myDet);
if(det->setFilePath(string(path.toAscii().constData())).empty()){
qDefs::Message(qDefs::WARNING,string("Enter a valid output directory "),"Data Output");
error = true;
}else if(!qDefs::checkErrorMessage(det).empty()){
}else if(!qDefs::checkErrorMessage(det,false).empty()){
error = true;
}
myDet->setFilePath(det->getFilePath());
@ -803,6 +812,7 @@ void qTabDataOutput::SetOutputDir(){
if(error){
qDefs::Message(qDefs::WARNING,string("Invalid output directory "),"Data Output set");
for(int i=0;i<myDet->getNumberOfDetectors();i++){
slsDetector *det = myDet->getSlsDetector(i);
qDefs::checkErrorMessage(myDet);