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

fixed browse to show in red when disabled browse button for receiver, got rid of error message showing,

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@140 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2013-01-31 11:15:38 +00:00
parent 64208d5edd
commit 2ead554b7b
3 changed files with 80 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
slsDetectorGui/src/qDetectorMain.cpp
View File

@ -19,6 +19,7 @@
#include "multiSlsDetector.h"
#include "sls_detector_defs.h"
#include "svnInfoGui.h"
#include "error_defs.h"
// Qt Include Headers
#include <QSizePolicy>
#include <QFileDialog>
@ -299,16 +300,21 @@ void qDetectorMain::LoadConfigFile(const string fName){
else if (!S_ISREG (st_buf.st_mode))
qDefs::Message(qDefs::WARNING,string("<nobr>Start up configuration failed to load. The following file is not a recognized file format:</nobr><br><nobr>")+fName,"Main");
//could not load config file
else if(myDet->readConfigurationFile(fName)==slsDetectorDefs::FAIL)
qDefs::Message(qDefs::INFORMATION,"<nobr>The Configuration Parameters have been loaded successfully at start up.</nobr>","Main");
else{
//could not load config file
if(myDet->readConfigurationFile(fName)==slsDetectorDefs::FAIL)
qDefs::Message(qDefs::WARNING,string("Could not load the Configuration Parameters from file:\n")+fName,"Main");
//successful
else
qDefs::Message(qDefs::INFORMATION,"<nobr>The Configuration Parameters have been loaded successfully at start up.</nobr>","Main");
//successful
else
qDefs::Message(qDefs::INFORMATION,"<nobr>The Configuration Parameters have been loaded successfully at start up.</nobr>","Main");
qDefs::checkErrorMessage(myDet);
myDet->clearErrorMask();
}
}
//-------------------------------------------------------------------------------------------------------------------------------------------------
@ -534,7 +540,8 @@ void qDetectorMain::ExecuteUtilities(QAction *action){
//tab_developer->Refresh();
tab_plot->Refresh();
}
qDefs::checkErrorMessage(myDet);
myDet->clearErrorMask();
}

14
slsDetectorGui/src/qTabMessages.cpp
View File

@ -82,19 +82,17 @@ void qTabMessages::Initialization(){
//-------------------------------------------------------------------------------------------------------------------------------------------------
void qTabMessages::customEvent(QEvent *e) {
if (e->type() == (STREAMEVENT)){
QString temp = ((qStreamEvent*)e)->getString();
if (e->type() == (STREAMEVENT))
dispLog->append(((qStreamEvent*)e)->getString());
/* QString temp = ((qStreamEvent*)e)->getString();
dispLog->append(temp);
string t=string(temp.toAscii().constData());
string t=string(temp.toAscii().constData());
if(t.find("not connect")!=string::npos)
qDefs::Message(qDefs::WARNING,errMsg+t+string("</font></nobr>"),"Messages");
else if(t.find("ould not")!=string::npos)
qDefs::Message(qDefs::WARNING,errMsg+t+string("</font></nobr>"),"Messages");
// dispLog->append(((qStreamEvent*)e)->getString());
}
*/
}
//-------------------------------------------------------------------------------------------------------------------------------------------------