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

got rid of segmentation fault while loading settings file which didnt refresh actions tab etc

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@126 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2012-12-18 12:07:45 +00:00
parent 46a4fee083
commit b59b54e004
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorGui/include/svnInfoGui.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "af1100a4-978c-4157-bff7-07162d2ba061" #define SVNREPUUID "af1100a4-978c-4157-bff7-07162d2ba061"
//#define SVNREV 0x124 //#define SVNREV 0x125
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "bergamaschi" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x124 #define SVNREV 0x125
#define SVNDATE 0x20121217 #define SVNDATE 0x20121217
// //

23
slsDetectorGui/src/qDetectorMain.cpp
View File

@ -358,7 +358,7 @@ void qDetectorMain::EnableModes(QAction *action){
void qDetectorMain::ExecuteUtilities(QAction *action){ void qDetectorMain::ExecuteUtilities(QAction *action){
bool refreshTabs = false;
if(action==actionOpenSetup){ if(action==actionOpenSetup){
#ifdef VERBOSE #ifdef VERBOSE
cout << "Loading Setup" << endl; cout << "Loading Setup" << endl;
@ -369,9 +369,10 @@ void qDetectorMain::ExecuteUtilities(QAction *action){
tr("Detector Setup files (*.det)")); tr("Detector Setup files (*.det)"));
// Gets called when cancelled as well // Gets called when cancelled as well
if (!fName.isEmpty()){ if (!fName.isEmpty()){
if(myDet->retrieveDetectorSetup(string(fName.toAscii().constData()))!=slsDetectorDefs::FAIL) if(myDet->retrieveDetectorSetup(string(fName.toAscii().constData()))!=slsDetectorDefs::FAIL){
qDefs::Message(qDefs::INFORMATION,"The Setup Parameters have been loaded successfully.","Main"); qDefs::Message(qDefs::INFORMATION,"The Setup Parameters have been loaded successfully.","Main");
else qDefs::Message(qDefs::WARNING,string("Could not load the Setup Parameters from file:\n")+fName.toAscii().constData(),"Main"); refreshTabs=true;
}else qDefs::Message(qDefs::WARNING,string("Could not load the Setup Parameters from file:\n")+fName.toAscii().constData(),"Main");
} }
} }
else if(action==actionSaveSetup){ else if(action==actionSaveSetup){
@ -399,9 +400,10 @@ void qDetectorMain::ExecuteUtilities(QAction *action){
tr("Configuration files (*.config)")); tr("Configuration files (*.config)"));
// Gets called when cancelled as well // Gets called when cancelled as well
if (!fName.isEmpty()){ if (!fName.isEmpty()){
if(myDet->readConfigurationFile(string(fName.toAscii().constData()))!=slsDetectorDefs::FAIL) if(myDet->readConfigurationFile(string(fName.toAscii().constData()))!=slsDetectorDefs::FAIL){
qDefs::Message(qDefs::INFORMATION,"The Configuration Parameters have been configured successfully.","Main"); qDefs::Message(qDefs::INFORMATION,"The Configuration Parameters have been configured successfully.","Main");
else qDefs::Message(qDefs::WARNING,string("Could not load the Configuration Parameters from file:\n")+fName.toAscii().constData(),"Main"); refreshTabs=true;
}else qDefs::Message(qDefs::WARNING,string("Could not load the Configuration Parameters from file:\n")+fName.toAscii().constData(),"Main");
} }
} }
else if(action==actionSaveConfiguration){ else if(action==actionSaveConfiguration){
@ -520,6 +522,17 @@ void qDetectorMain::ExecuteUtilities(QAction *action){
} }
Refresh(tabs->currentIndex()); Refresh(tabs->currentIndex());
if(refreshTabs){
tab_actions->Refresh();
tab_measurement->Refresh();
//tab_settings->Refresh();
//tab_dataoutput->Refresh();
//tab_advanced->Refresh();
//tab_debugging->Refresh();
//tab_developer->Refresh();
tab_plot->Refresh();
}
} }