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

updated number of measurements to be taken from the detector class

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@54 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2012-09-10 17:55:44 +00:00
parent b85e03adfd
commit f7078c3700
7 changed files with 253 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -48,7 +48,7 @@ qTabMeasurement::~qTabMeasurement(){
void qTabMeasurement::SetupWidgetWindow(){
//Number of measurements
numMeasurement=1;
spinNumMeasurements->setValue((int)myDet->setTimer(slsDetectorDefs::MEASUREMENTS_NUMBER,-1));
//Timer to update the progress bar
progressTimer = new QTimer(this);
@ -66,6 +66,7 @@ void qTabMeasurement::SetupWidgetWindow(){
"<nobr> #period#</nobr><br><br>")+
QString("<nobr><font color=\"red\"><b>Acquisition Period</b> should be"
" greater than or equal to <b>Exposure Time</b>.</font></nobr>");
//File Name
dispFileName->setText(QString(myDet->getFileName().c_str()));
//File Index
@ -92,6 +93,24 @@ void qTabMeasurement::SetupWidgetWindow(){
//-------------------------------------------------------------------------------------------------------------------------------------------------
void qTabMeasurement::SetExpertMode(bool enable){
expertMode = enable;
lblNumProbes->setEnabled(enable);
spinNumProbes->setEnabled(enable);
//Number of Probes
if((enable)&&(myDet->getDetectorsType()==slsDetectorDefs::MYTHEN)){
int val = (int)myDet->setTimer(slsDetectorDefs::PROBES_NUMBER,-1);
spinNumProbes->setValue(val);
#ifdef VERBOSE
cout << "Getting number of probes : " << val << endl;
#endif
}
}
//-------------------------------------------------------------------------------------------------------------------------------------------------
void qTabMeasurement::SetupTimingMode(){
//Get timing mode from detector
slsDetectorDefs::externalCommunicationMode mode = myDet->setExternalCommunicationMode();
@ -251,16 +270,6 @@ void qTabMeasurement::Enable(bool enable){
//-------------------------------------------------------------------------------------------------------------------------------------------------
void qTabMeasurement::setNumMeasurements(int val){
#ifdef VERBOSE
cout << "Setting Number of Measurements to " << val << endl;
#endif
numMeasurement = val;
myPlot->setNumMeasurements(val);
}
//-------------------------------------------------------------------------------------------------------------------------------------------------
void qTabMeasurement::setFileName(const QString& fName){
myDet->setFileName(fName.toAscii().data());
#ifdef VERBOSE
@ -302,13 +311,13 @@ void qTabMeasurement::startStopAcquisition(){
#ifdef VERBOSE
cout << "Stopping Acquisition" << endl<< endl;
#endif
emit StopSignal();
myDet->stopAcquisition();
progressTimer->stop();
btnStartStop->setText("Start");
btnStartStop->setIcon(*iconStart);
btnStartStop->setChecked(false);
Enable(1);
emit StopSignal();
}
}
@ -342,7 +351,8 @@ void qTabMeasurement::SetCurrentMeasurement(int val){
void qTabMeasurement::UpdateProgress(){
progressBar->setValue((int)(((currentMeasurement*100)+(myPlot->GetProgress()))/numMeasurement));
//progressBar->setValue((int)(((currentMeasurement*100)+(myPlot->GetProgress()))/spinNumMeasurements->value()));
progressBar->setValue((int)myPlot->GetProgress());
lblProgressIndex->setText(QString::number(myDet->getFileIndex()));
}
@ -350,12 +360,22 @@ void qTabMeasurement::UpdateProgress(){
//-------------------------------------------------------------------------------------------------------------------------------------------------
void qTabMeasurement::setNumMeasurements(int val){
myDet->setTimer(slsDetectorDefs::MEASUREMENTS_NUMBER,val);
#ifdef VERBOSE
cout << "Setting Number of Measurements to " << (int)myDet->setTimer(slsDetectorDefs::MEASUREMENTS_NUMBER,-1) << endl;
#endif
}
//-------------------------------------------------------------------------------------------------------------------------------------------------
void qTabMeasurement::setNumFrames(int val){
myDet->setTimer(slsDetectorDefs::FRAME_NUMBER,val);
#ifdef VERBOSE
cout << "Setting number of frames to " << (int)myDet->setTimer(slsDetectorDefs::FRAME_NUMBER,-1) << endl;
#endif
}
@ -567,12 +587,12 @@ void qTabMeasurement::SetTimingMode(int mode){
}
if(mode!=None){//Number of Probes
if((myDet->getDetectorsType()==slsDetectorDefs::MYTHEN)&&(expertMode)){
lblNumProbes->setEnabled(true); spinNumProbes->setEnabled(true);
}
//Number of Probes
if((expertMode)&&(myDet->getDetectorsType()==slsDetectorDefs::MYTHEN)){
lblNumProbes->setEnabled(true); spinNumProbes->setEnabled(true);
}
//To disconnect all the signals before changing their values
DeInitialization();
@ -703,6 +723,8 @@ void qTabMeasurement::EnableFileWrite(bool enable){
void qTabMeasurement::Refresh(){
//Number of measurements
spinNumMeasurements->setValue((int)myDet->setTimer(slsDetectorDefs::MEASUREMENTS_NUMBER,-1));
//File Name
dispFileName->setText(QString(myDet->getFileName().c_str()));
//File Index