mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-17 07:17:13 +02:00
included images
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@52 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
@ -17,8 +17,8 @@ using namespace std;
|
||||
|
||||
//-------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
qTabSettings::qTabSettings(QWidget *parent,multiSlsDetector*& detector,int detID):
|
||||
QWidget(parent),myDet(detector),detID(detID){
|
||||
qTabSettings::qTabSettings(QWidget *parent,multiSlsDetector*& detector):
|
||||
QWidget(parent),myDet(detector){
|
||||
|
||||
setupUi(this);
|
||||
SetupWidgetWindow();
|
||||
@ -40,7 +40,7 @@ void qTabSettings::SetupWidgetWindow(){
|
||||
|
||||
// Settings
|
||||
SetupDetectorSettings();
|
||||
comboSettings->setCurrentIndex(myDet->getSettings(detID));
|
||||
comboSettings->setCurrentIndex(myDet->getSettings());
|
||||
|
||||
//threshold
|
||||
spinThreshold->setValue(myDet->getThresholdEnergy());
|
||||
@ -68,7 +68,7 @@ void qTabSettings::SetupWidgetWindow(){
|
||||
|
||||
void qTabSettings::SetupDetectorSettings(){
|
||||
// Get detector settings from detector
|
||||
slsDetectorDefs::detectorSettings sett = myDet->getSettings(detID);
|
||||
slsDetectorDefs::detectorSettings sett = myDet->getSettings();
|
||||
|
||||
// To be able to index items on a combo box
|
||||
model = qobject_cast<QStandardItemModel*>(comboSettings->model());
|
||||
@ -163,7 +163,7 @@ void qTabSettings::setSettings(int index){
|
||||
if(index!=(int)Uninitialized)
|
||||
item[(int)Uninitialized]->setEnabled(false);
|
||||
}
|
||||
slsDetectorDefs::detectorSettings sett = myDet->setSettings((slsDetectorDefs::detectorSettings)index,detID);
|
||||
slsDetectorDefs::detectorSettings sett = myDet->setSettings((slsDetectorDefs::detectorSettings)index);
|
||||
#ifdef VERBOSE
|
||||
cout << "Settings have been set to " << myDet->slsDetectorBase::getDetectorSettings(sett) << endl;
|
||||
#endif
|
||||
@ -256,7 +256,7 @@ void qTabSettings::SetEnergy(){
|
||||
void qTabSettings::Refresh(){
|
||||
// Settings
|
||||
SetupDetectorSettings();
|
||||
comboSettings->setCurrentIndex(myDet->getSettings(detID));
|
||||
comboSettings->setCurrentIndex(myDet->getSettings());
|
||||
// Number of Modules
|
||||
spinNumModules->setValue(myDet->setNumberOfModules());
|
||||
|
||||
|
Reference in New Issue
Block a user