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

checked in the change about config file at the very start of gui and gui version

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@67 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d 2012-09-21 10:14:03 +00:00
parent 96c805f7bf
commit 197de5c995
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorGui/include/qDefs.h
View File

@ -19,6 +19,9 @@ public:
/** Empty Constructor /** Empty Constructor
*/ */
qDefs(){}; qDefs(){};
//-------------------------------------------------------------------------------------------------------------------------------------------------
#define GUI_VERSION 0.1
//------------------------------------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------------------------------------

3
slsDetectorGui/include/qDetectorMain.h
View File

@ -117,8 +117,9 @@ private:
void SetUpWidgetWindow(); void SetUpWidgetWindow();
/**Sets up detector /**Sets up detector
* @param fName file name of the config file at start up
* */ * */
void SetUpDetector(); void SetUpDetector(const string fName);
/**Sets up the signals and the slots /**Sets up the signals and the slots
* */ * */

21
slsDetectorGui/src/qDetectorMain.cpp
View File

@ -64,11 +64,9 @@ qDetectorMain::qDetectorMain(int argc, char **argv, QApplication *app, QWidget *
} }
setupUi(this); setupUi(this);
SetUpDetector(); SetUpDetector(configFName);
SetUpWidgetWindow(); SetUpWidgetWindow();
Initialization(); Initialization();
if(!configFName.empty()) LoadConfigFile(configFName);
} }
@ -172,11 +170,16 @@ void qDetectorMain::SetUpWidgetWindow(){
//------------------------------------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------------------------------------
void qDetectorMain::SetUpDetector(){ void qDetectorMain::SetUpDetector(const string fName){
//instantiate detector and set window title //instantiate detector and set window title
myDet = new multiSlsDetector(detID); myDet = new multiSlsDetector(detID);
//loads the config file at startup
if(!fName.empty()) LoadConfigFile(fName);
//gets the hostname if it worked
string host = myDet->getHostname(); string host = myDet->getHostname();
//if hostname doesnt exist even in shared memory //if hostname doesnt exist even in shared memory
@ -271,9 +274,9 @@ void qDetectorMain::LoadConfigFile(const string fName){
QString file = QString(fName.c_str());//.section('/',-1); QString file = QString(fName.c_str());//.section('/',-1);
if((file.contains('.'))&&(QFile::exists(file))){ if((file.contains('.'))&&(QFile::exists(file))){
if(myDet->readConfigurationFile(fName)!=slsDetectorDefs::FAIL) if(myDet->readConfigurationFile(fName)!=slsDetectorDefs::FAIL)
qDefs::Message(qDefs::INFORMATION,"The Configuration Parameters have been loaded successfully at start up.","Main"); qDefs::Message(qDefs::INFORMATION,"<nobr>The Configuration Parameters have been loaded successfully at start up.</nobr>","Main");
else qDefs::Message(qDefs::WARNING,string("Could not load the Configuration Parameters at start up from file:\n")+fName,"Main"); else qDefs::Message(qDefs::WARNING,string("<nobr>Could not load the Configuration Parameters at start up from file:</nobr><br><nobr>")+fName,"Main");
}else qDefs::Message(qDefs::WARNING,string("Start up configuration failed to load. The following file does not exist:\n")+fName,"Main"); }else qDefs::Message(qDefs::WARNING,string("<nobr>Start up configuration failed to load. The following file does not exist:</nobr><br><nobr>")+fName,"Main");
} }
@ -506,14 +509,14 @@ void qDetectorMain::ExecuteHelp(QAction *action){
string thisClientVersion = string(version); string thisClientVersion = string(version);
//<h1 style="font-family:verdana;">A heading</h1> //<h1 style="font-family:verdana;">A heading</h1>
qDefs::Message(qDefs::INFORMATION,"<p style=\"font-family:verdana;\">" qDefs::Message(qDefs::INFORMATION,"<p style=\"font-family:verdana;\">"
"SLS Detector GUI version: 1.0<br>" "SLS Detector GUI version: " + string(QString("%1").arg(GUI_VERSION).toAscii().constData())+"<br>"
"SLS Detector Client version: "+thisClientVersion+"<br><br>" "SLS Detector Client version: "+thisClientVersion+"<br><br>"
"Common GUI to control the SLS Detectors: " "Common GUI to control the SLS Detectors: "
"Mythen, Eiger, Gotthard and Agipd.<br><br>" "Mythen, Eiger, Gotthard and Agipd.<br><br>"
"It can be operated in parallel with the command line interface:<br>" "It can be operated in parallel with the command line interface:<br>"
"sls_detector_put,<br>sls_detector_get,<br>sls_detector_acquire and<br>sls_detector_help.<br><br>" "sls_detector_put,<br>sls_detector_get,<br>sls_detector_acquire and<br>sls_detector_help.<br><br>"
"The GUI Software is still in progress. " "The GUI Software is still in progress. "
"Please report bugs to dhanya.maliakal@psi.ch.<\\p>","About SLS Detector GUI"); "Please report bugs to dhanya.maliakal@psi.ch or anna.bergamaschi@psi.ch.<\\p>","About SLS Detector GUI");
} }
} }