the scans work

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@39 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d 2012-08-27 14:50:59 +00:00
parent ee3a54601c
commit 51e7feb605
2 changed files with 63 additions and 7 deletions

View File

@ -232,6 +232,11 @@
<addaction name="actionOpenConfiguration"/>
<addaction name="actionSaveConfiguration"/>
<addaction name="separator"/>
<addaction name="actionLoadTrimbits"/>
<addaction name="actionSaveTrimbits"/>
<addaction name="separator"/>
<addaction name="actionLoadCalibration"/>
<addaction name="actionSaveCalibration"/>
</widget>
<widget class="QMenu" name="menuModes">
<property name="title">
@ -380,7 +385,7 @@ p, li { white-space: pre-wrap; }
</widget>
<action name="actionOpenSetup">
<property name="text">
<string>&amp;Open Setup</string>
<string>Load &amp;Setup</string>
</property>
<property name="font">
<font/>
@ -388,7 +393,7 @@ p, li { white-space: pre-wrap; }
</action>
<action name="actionSaveSetup">
<property name="text">
<string>&amp;Save Setup</string>
<string>Save &amp;Setup</string>
</property>
<property name="font">
<font/>
@ -401,12 +406,12 @@ p, li { white-space: pre-wrap; }
</action>
<action name="actionOpenConfiguration">
<property name="text">
<string>&amp;Open Configuration</string>
<string>Load &amp;Configuration</string>
</property>
</action>
<action name="actionSaveConfiguration">
<property name="text">
<string>&amp;Save Configuration</string>
<string>Save &amp;Configuration</string>
</property>
</action>
<action name="actionEnergyCalibration">
@ -481,6 +486,26 @@ p, li { white-space: pre-wrap; }
<string>&amp;Dockable Windows</string>
</property>
</action>
<action name="actionLoadTrimbits">
<property name="text">
<string>Load &amp;Trimbits</string>
</property>
</action>
<action name="actionSaveTrimbits">
<property name="text">
<string>Save &amp;Trimbits</string>
</property>
</action>
<action name="actionLoadCalibration">
<property name="text">
<string>Load C&amp;alibration</string>
</property>
</action>
<action name="actionSaveCalibration">
<property name="text">
<string>Save C&amp;alibration</string>
</property>
</action>
</widget>
<resources/>
<connections/>

View File

@ -147,6 +147,10 @@ void qDetectorMain::SetUpWidgetWindow(){
tabs->setTabEnabled(Debugging,false);
//beamline mode to false
tabs->setTabEnabled(Advanced,false);
actionLoadTrimbits->hide();
actionSaveTrimbits->hide();
actionLoadCalibration->hide();
actionSaveCalibration->hide();
dockWidgetPlot->setFloating(false);
dockWidgetPlot->setFeatures(QDockWidget::NoDockWidgetFeatures);
tabs->setTabEnabled(Developer,isDeveloper);
@ -271,6 +275,17 @@ void qDetectorMain::EnableModes(QAction *action){
else if(action==actionExpert){
enable = actionExpert->isChecked();
tabs->setTabEnabled(Advanced,enable);
if(enable){
actionLoadTrimbits->show();
actionSaveTrimbits->show();
actionLoadCalibration->show();
actionSaveCalibration->show();
}else{
actionLoadTrimbits->hide();
actionSaveTrimbits->hide();
actionLoadCalibration->hide();
actionSaveCalibration->hide();
}
#ifdef VERBOSE
cout << "Setting Expert Mode to " << enable << endl;
#endif
@ -299,7 +314,7 @@ void qDetectorMain::ExecuteUtilities(QAction *action){
if(action==actionOpenSetup){
#ifdef VERBOSE
cout << "Opening Setup" << endl;
cout << "Loading Setup" << endl;
#endif
QString fName = QString(myDet->getFilePath().c_str());
fName = QFileDialog::getOpenFileName(this,
@ -332,7 +347,7 @@ void qDetectorMain::ExecuteUtilities(QAction *action){
}
else if(action==actionOpenConfiguration){
#ifdef VERBOSE
cout << "Opening Configuration" << endl;
cout << "Loading Configuration" << endl;
#endif
QString fName = QString(myDet->getFilePath().c_str());
fName = QFileDialog::getOpenFileName(this,
@ -477,14 +492,30 @@ void qDetectorMain::EnableTabs(){
if(enable==false){
tabs->setTabEnabled(Debugging,enable);
tabs->setTabEnabled(Advanced,enable);
actionLoadTrimbits->hide();
actionSaveTrimbits->hide();
actionLoadCalibration->hide();
actionSaveCalibration->hide();
tabs->setTabEnabled(Developer,enable);
}
else{
// enable these tabs only if they were enabled earlier
if(actionDebug->isChecked())
tabs->setTabEnabled(Debugging,enable);
if(actionExpert->isChecked())
if(actionExpert->isChecked()){
tabs->setTabEnabled(Advanced,enable);
if(enable){
actionLoadTrimbits->show();
actionSaveTrimbits->show();
actionLoadCalibration->show();
actionSaveCalibration->show();
}else{
actionLoadTrimbits->hide();
actionSaveTrimbits->hide();
actionLoadCalibration->hide();
actionSaveCalibration->hide();
}
}
if(isDeveloper)
tabs->setTabEnabled(Developer,enable);
}