snapshot works,id works, conversion from seconds to ms,us etc works, number of measurements works

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@14 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2012-06-26 15:06:55 +00:00
parent b3de7a9051
commit 824da9d4c4
20 changed files with 320 additions and 256 deletions

View File

@ -15,17 +15,13 @@
using namespace std;
#define Detector_Index 0
qTabSettings::qTabSettings(QWidget *parent,slsDetectorUtils*& detector):QWidget(parent),myDet(detector){
qTabSettings::qTabSettings(QWidget *parent,slsDetectorUtils*& detector,int detID):
QWidget(parent),myDet(detector),detID(detID){
setupUi(this);
if(myDet)
{
SetupWidgetWindow();
Initialization();
}
SetupWidgetWindow();
Initialization();
}
@ -40,7 +36,7 @@ qTabSettings::~qTabSettings(){
void qTabSettings::SetupWidgetWindow(){
/** Settings */
comboSettings->setCurrentIndex(myDet->getSettings(Detector_Index));
comboSettings->setCurrentIndex(myDet->getSettings(detID));
}
@ -52,13 +48,8 @@ void qTabSettings::Initialization(){
void qTabSettings::Enable(bool enable){
comboSettings->setEnabled(enable);
}
void qTabSettings::setSettings(int index){
slsDetectorDefs::detectorSettings sett = myDet->setSettings((slsDetectorDefs::detectorSettings)index,Detector_Index);
slsDetectorDefs::detectorSettings sett = myDet->setSettings((slsDetectorDefs::detectorSettings)index,detID);
#ifdef VERBOSE
cout<<"Settings have been set to "<<myDet->slsDetectorBase::getDetectorSettings(sett)<<endl;
#endif