detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-20 02:40:03 +02:00
Code Issues Actions Packages Releases Activity

made measurement tab faster, not too many checks anymore

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@259 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d 2014-02-10 16:20:17 +00:00
parent f768886308
commit 7ebd1643ee
3 changed files with 182 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorGui/include/qTabMeasurement.h
View File

@ -15,6 +15,7 @@
/** Project Class Headers */ /** Project Class Headers */
class multiSlsDetector; class multiSlsDetector;
/** Qt Project Class Headers */ /** Qt Project Class Headers */
#include <QStandardItemModel>
#include "qDrawPlot.h" #include "qDrawPlot.h"
class qDetectorMain; class qDetectorMain;
@ -97,6 +98,14 @@ private:
/** Validates before enabling or disabling probes */ /** Validates before enabling or disabling probes */
void EnableProbes(); void EnableProbes();
/** Get timing mode from detector
* @param startup is true when gui has just started up*/
void GetModeFromDetector(bool startup = false);
/** Checks if acquisition period is greater than exposure time
* and dsplays in red as a warning */
void CheckAcqPeriodGreaterThanExp();
private slots: private slots:
/** Sets the timing mode /** Sets the timing mode
@ -168,6 +177,8 @@ private:
multiSlsDetector *myDet; multiSlsDetector *myDet;
/** The Plot widget */ /** The Plot widget */
qDrawPlot *myPlot; qDrawPlot *myPlot;
/** detector type */
slsDetectorDefs::detectorType detType;
/** enum for the timing mode */ /** enum for the timing mode */
enum{None, Auto, Trigger_Exp_Series, Trigger_Frame, Trigger_Readout, Gated, Gated_Start, Trigger_Window, NumTimingModes}; enum{None, Auto, Trigger_Exp_Series, Trigger_Frame, Trigger_Readout, Gated, Gated_Start, Trigger_Window, NumTimingModes};
/** timer to update the progress*/ /** timer to update the progress*/
@ -180,7 +191,8 @@ private:
bool expertMode; bool expertMode;
QIcon *iconStart; QIcon *iconStart;
QIcon *iconStop; QIcon *iconStop;
/** to access items in settings combobox */
QStandardItemModel* model;
signals: signals:
void StartSignal(); void StartSignal();

12
slsDetectorGui/src/qTabAdvanced.cpp
View File

@ -1142,6 +1142,11 @@ void qTabAdvanced::Refresh(){
qDefs::checkErrorMessage(myDet,"qTabAdvanced::Refresh"); qDefs::checkErrorMessage(myDet,"qTabAdvanced::Refresh");
#ifdef VERBOSE
cout << "Getting Detector Ports" << endl;
#endif
//disconnect //disconnect
disconnect(spinControlPort, SIGNAL(valueChanged(int)), this, SLOT(SetControlPort(int))); disconnect(spinControlPort, SIGNAL(valueChanged(int)), this, SLOT(SetControlPort(int)));
disconnect(spinStopPort, SIGNAL(valueChanged(int)), this, SLOT(SetStopPort(int))); disconnect(spinStopPort, SIGNAL(valueChanged(int)), this, SLOT(SetStopPort(int)));
@ -1160,7 +1165,9 @@ void qTabAdvanced::Refresh(){
connect(comboOnline, SIGNAL(currentIndexChanged(int)), this, SLOT(SetOnline(int))); connect(comboOnline, SIGNAL(currentIndexChanged(int)), this, SLOT(SetOnline(int)));
#ifdef VERBOSE
cout << "Getting Receiver Network Information" << endl;
#endif
if ((detType==slsDetectorDefs::GOTTHARD) || (detType==slsDetectorDefs::MOENCH)){ if ((detType==slsDetectorDefs::GOTTHARD) || (detType==slsDetectorDefs::MOENCH)){
//disconnect //disconnect
disconnect(spinTCPPort, SIGNAL(valueChanged(int)), this, SLOT(SetRxrTCPPort(int))); disconnect(spinTCPPort, SIGNAL(valueChanged(int)), this, SLOT(SetRxrTCPPort(int)));
@ -1226,6 +1233,9 @@ void qTabAdvanced::Refresh(){
} }
//roi //roi
#ifdef VERBOSE
cout << "Getting ROI" << endl;
#endif
updateROIList(); updateROIList();

248
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -11,8 +11,6 @@
//Project Class Headers //Project Class Headers
#include "slsDetector.h" #include "slsDetector.h"
#include "multiSlsDetector.h" #include "multiSlsDetector.h"
//Qt Include Headers
#include <QStandardItemModel>
//C++ Include Headers //C++ Include Headers
#include<iostream> #include<iostream>
using namespace std; using namespace std;
@ -47,6 +45,9 @@ qTabMeasurement::~qTabMeasurement(){
void qTabMeasurement::SetupWidgetWindow(){ void qTabMeasurement::SetupWidgetWindow(){
detType = myDet->getDetectorsType();
//Number of measurements //Number of measurements
spinNumMeasurements->setValue((int)myDet->setTimer(slsDetectorDefs::MEASUREMENTS_NUMBER,-1)); spinNumMeasurements->setValue((int)myDet->setTimer(slsDetectorDefs::MEASUREMENTS_NUMBER,-1));
//Number of frames //Number of frames
@ -69,7 +70,7 @@ void qTabMeasurement::SetupWidgetWindow(){
//gates //gates
spinNumGates->setValue((int)myDet->setTimer(slsDetectorDefs::GATES_NUMBER,-1)); spinNumGates->setValue((int)myDet->setTimer(slsDetectorDefs::GATES_NUMBER,-1));
//probes //probes
if(myDet->getDetectorsType() == slsDetectorDefs::MYTHEN) if(detType == slsDetectorDefs::MYTHEN)
spinNumProbes->setValue((int)myDet->setTimer(slsDetectorDefs::PROBES_NUMBER,-1)); spinNumProbes->setValue((int)myDet->setTimer(slsDetectorDefs::PROBES_NUMBER,-1));
//File Name //File Name
dispFileName->setText(QString(myDet->getFileName().c_str())); dispFileName->setText(QString(myDet->getFileName().c_str()));
@ -120,11 +121,8 @@ void qTabMeasurement::SetExpertMode(bool enable){
void qTabMeasurement::SetupTimingMode(){ void qTabMeasurement::SetupTimingMode(){
//Get timing mode from detector
slsDetectorDefs::externalCommunicationMode mode = myDet->setExternalCommunicationMode();
//To be able to index items on a combo box //To be able to index items on a combo box
QStandardItemModel* model = qobject_cast<QStandardItemModel*>(comboTimingMode->model()); model = qobject_cast<QStandardItemModel*>(comboTimingMode->model());
QModelIndex index[NumTimingModes]; QModelIndex index[NumTimingModes];
QStandardItem* item[NumTimingModes]; QStandardItem* item[NumTimingModes];
if (model) { if (model) {
@ -133,7 +131,7 @@ void qTabMeasurement::SetupTimingMode(){
item[i] = model->itemFromIndex(index[i]); item[i] = model->itemFromIndex(index[i]);
} }
//Enabling/Disabling depending on the detector type //Enabling/Disabling depending on the detector type
switch(myDet->getDetectorsType()){ switch(detType){
case slsDetectorDefs::MYTHEN: case slsDetectorDefs::MYTHEN:
item[(int)Trigger_Exp_Series]->setEnabled(true); item[(int)Trigger_Exp_Series]->setEnabled(true);
item[(int)Trigger_Frame]->setEnabled(false); item[(int)Trigger_Frame]->setEnabled(false);
@ -164,8 +162,43 @@ void qTabMeasurement::SetupTimingMode(){
exit(-1); exit(-1);
break; break;
} }
//Setting the timing mode }
if(item[mode]->isEnabled()){
GetModeFromDetector(true);
}
//-------------------------------------------------------------------------------------------------------------------------------------------------
void qTabMeasurement::GetModeFromDetector(bool startup){
#ifdef VERBOSE
cout << "Getting timing mode" << endl;
#endif
//Get timing mode from detector
slsDetectorDefs::externalCommunicationMode mode = myDet->setExternalCommunicationMode();
//Setting the timing mode in gui
if(model && model->itemFromIndex(model->index(mode,comboTimingMode->modelColumn(), comboTimingMode->rootModelIndex()))->isEnabled()){
//these are things checked in setuptimingmode
// to let qdrawplot know that triggers or frames are used
myPlot->setFrameEnabled(lblNumFrames->isEnabled());
myPlot->setTriggerEnabled(lblNumTriggers->isEnabled());
if((!startup) && (comboTimingMode->currentIndex() == mode)){
if(lblPeriod->isEnabled())
CheckAcqPeriodGreaterThanExp();
else{
spinPeriod->setToolTip(acqPeriodTip);
lblPeriod->setToolTip(acqPeriodTip);
lblPeriod->setPalette(lblTimingMode->palette());
lblPeriod->setText("Acquisition Period:");
}
EnableProbes();
emit CheckPlotIntervalSignal();
return;
}
//if the timing mode is Auto and //if the timing mode is Auto and
// number of Frames and number of triggers is 1, // number of Frames and number of triggers is 1,
// then the timing mode is 'None'. // then the timing mode is 'None'.
@ -192,7 +225,7 @@ void qTabMeasurement::SetupTimingMode(){
else{ else{
//check if the detector is not even connected //check if the detector is not even connected
string offline = myDet->checkOnline(); string offline = myDet->checkOnline();
qDefs::checkErrorMessage(myDet,"qTabMeasurement::SetupTimingMode"); qDefs::checkErrorMessage(myDet,"qTabMeasurement::GetModeFromDetector");
if(!offline.empty()){ if(!offline.empty()){
qDefs::Message(qDefs::CRITICAL,string("<nobr>The detector(s) <b>")+offline+string(" </b> is/are not connected. Exiting GUI.</nobr>"),"Main"); qDefs::Message(qDefs::CRITICAL,string("<nobr>The detector(s) <b>")+offline+string(" </b> is/are not connected. Exiting GUI.</nobr>"),"Main");
@ -202,18 +235,20 @@ void qTabMeasurement::SetupTimingMode(){
qDefs::Message(qDefs::WARNING,"Unknown Timing Mode detected from detector." qDefs::Message(qDefs::WARNING,"Unknown Timing Mode detected from detector."
"\n\nSetting the following defaults:\nTiming Mode \t: None\n" "\n\nSetting the following defaults:\nTiming Mode \t: None\n"
"Number of Frames \t: 1\nNumber of Triggers \t: 1","qTabMeasurement::SetupTimingMode"); "Number of Frames \t: 1\nNumber of Triggers \t: 1","qTabMeasurement::GetModeFromDetector");
comboTimingMode->setCurrentIndex((int)None); comboTimingMode->setCurrentIndex((int)None);
SetTimingMode((int)None); SetTimingMode((int)None);
} }
}
qDefs::checkErrorMessage(myDet,"qTabMeasurement::SetupTimingMode"); qDefs::checkErrorMessage(myDet,"qTabMeasurement::GetModeFromDetector");
} }
//------------------------------------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------------------------------------
void qTabMeasurement::Initialization(){ void qTabMeasurement::Initialization(){
//Number of Measurements //Number of Measurements
connect(spinNumMeasurements,SIGNAL(valueChanged(int)), this, SLOT(setNumMeasurements(int))); connect(spinNumMeasurements,SIGNAL(valueChanged(int)), this, SLOT(setNumMeasurements(int)));
@ -431,28 +466,8 @@ void qTabMeasurement::setNumFrames(int val){
//------------------------------------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------------------------------------
void qTabMeasurement::setExposureTime(){ void qTabMeasurement::CheckAcqPeriodGreaterThanExp(){
//Get the value of timer in ns
double exptimeNS = qDefs::getNSTime((qDefs::timeUnit)comboExpUnit->currentIndex(),spinExpTime->value()); double exptimeNS = qDefs::getNSTime((qDefs::timeUnit)comboExpUnit->currentIndex(),spinExpTime->value());
#ifdef VERBOSE
cout << "Setting acquisition time to " << exptimeNS << " clocks" << "/" << spinExpTime->value() << qDefs::getUnitString((qDefs::timeUnit)comboExpUnit->currentIndex()) << endl;
#endif
myDet->setTimer(slsDetectorDefs::ACQUISITION_TIME,(int64_t)exptimeNS);
/*
//updating value set
disconnect(spinExpTime,SIGNAL(valueChanged(double)), this, SLOT(setExposureTime()));
disconnect(comboExpUnit,SIGNAL(currentIndexChanged(int)), this, SLOT(setExposureTime()));
qDefs::timeUnit unit;
double time = qDefs::getCorrectTime(unit,((double)(myDet->setTimer(slsDetectorDefs::ACQUISITION_TIME,-1)*(1E-9))));
spinExpTime->setValue(time);
comboExpUnit->setCurrentIndex((int)unit);
connect(spinExpTime,SIGNAL(valueChanged(double)), this, SLOT(setExposureTime()));
connect(comboExpUnit,SIGNAL(currentIndexChanged(int)), this, SLOT(setExposureTime()));
*/
//could be different if it didnt work
exptimeNS = qDefs::getNSTime((qDefs::timeUnit)comboExpUnit->currentIndex(),spinExpTime->value());
if(lblPeriod->isEnabled()){
double acqtimeNS = qDefs::getNSTime((qDefs::timeUnit)comboPeriodUnit->currentIndex(),spinPeriod->value()); double acqtimeNS = qDefs::getNSTime((qDefs::timeUnit)comboPeriodUnit->currentIndex(),spinPeriod->value());
if(exptimeNS>acqtimeNS) { if(exptimeNS>acqtimeNS) {
spinPeriod->setToolTip(errPeriodTip); spinPeriod->setToolTip(errPeriodTip);
@ -466,8 +481,23 @@ void qTabMeasurement::setExposureTime(){
lblPeriod->setPalette(lblTimingMode->palette()); lblPeriod->setPalette(lblTimingMode->palette());
lblPeriod->setText("Acquisition Period:"); lblPeriod->setText("Acquisition Period:");
} }
} }
//-------------------------------------------------------------------------------------------------------------------------------------------------
void qTabMeasurement::setExposureTime(){
//Get the value of timer in ns
double exptimeNS = qDefs::getNSTime((qDefs::timeUnit)comboExpUnit->currentIndex(),spinExpTime->value());
#ifdef VERBOSE
cout << "Setting acquisition time to " << exptimeNS << " clocks" << "/" << spinExpTime->value() << qDefs::getUnitString((qDefs::timeUnit)comboExpUnit->currentIndex()) << endl;
#endif
myDet->setTimer(slsDetectorDefs::ACQUISITION_TIME,(int64_t)exptimeNS);
qDefs::checkErrorMessage(myDet,"qTabMeasurement::setExposureTime"); qDefs::checkErrorMessage(myDet,"qTabMeasurement::setExposureTime");
if(lblPeriod->isEnabled())
CheckAcqPeriodGreaterThanExp();
} }
@ -481,35 +511,9 @@ void qTabMeasurement::setAcquisitionPeriod(){
cout << "Setting frame period between exposures to " << acqtimeNS << " clocks"<< "/" << spinPeriod->value() << qDefs::getUnitString((qDefs::timeUnit)comboPeriodUnit->currentIndex()) << endl; cout << "Setting frame period between exposures to " << acqtimeNS << " clocks"<< "/" << spinPeriod->value() << qDefs::getUnitString((qDefs::timeUnit)comboPeriodUnit->currentIndex()) << endl;
#endif #endif
myDet->setTimer(slsDetectorDefs::FRAME_PERIOD,(int64_t)acqtimeNS); myDet->setTimer(slsDetectorDefs::FRAME_PERIOD,(int64_t)acqtimeNS);
/*
//updating value set
disconnect(spinPeriod,SIGNAL(valueChanged(double)), this, SLOT(setAcquisitionPeriod()));
disconnect(comboPeriodUnit,SIGNAL(currentIndexChanged(int)), this, SLOT(setAcquisitionPeriod()));
qDefs::timeUnit unit;
double time = qDefs::getCorrectTime(unit,((double)(myDet->setTimer(slsDetectorDefs::FRAME_PERIOD,-1)*(1E-9))));
spinPeriod->setValue(time);
comboPeriodUnit->setCurrentIndex((int)unit);
connect(spinPeriod,SIGNAL(valueChanged(double)), this, SLOT(setAcquisitionPeriod()));
connect(comboPeriodUnit,SIGNAL(currentIndexChanged(int)), this, SLOT(setAcquisitionPeriod()));
*/
//could be different if it didnt work
acqtimeNS = qDefs::getNSTime((qDefs::timeUnit)comboPeriodUnit->currentIndex(),spinPeriod->value());
double exptimeNS = qDefs::getNSTime((qDefs::timeUnit)comboExpUnit->currentIndex(),spinExpTime->value());
if(exptimeNS>acqtimeNS){
spinPeriod->setToolTip(errPeriodTip);
lblPeriod->setToolTip(errPeriodTip);
lblPeriod->setPalette(red);
lblPeriod->setText("Acquisition Period:*");
}
else {
spinPeriod->setToolTip(acqPeriodTip);
lblPeriod->setToolTip(acqPeriodTip);
lblPeriod->setPalette(lblTimingMode->palette());
lblPeriod->setText("Acquisition Period:");
}
qDefs::checkErrorMessage(myDet,"qTabMeasurement::setAcquisitionPeriod"); qDefs::checkErrorMessage(myDet,"qTabMeasurement::setAcquisitionPeriod");
CheckAcqPeriodGreaterThanExp();
//Check if the interval between plots is ok //Check if the interval between plots is ok
emit CheckPlotIntervalSignal(); emit CheckPlotIntervalSignal();
} }
@ -582,22 +586,28 @@ void qTabMeasurement::setNumProbes(int val){
#ifdef VERBOSE #ifdef VERBOSE
cout << "Setting number of probes to " << val << endl; cout << "Setting number of probes to " << val << endl;
#endif #endif
myDet->setTimer(slsDetectorDefs::PROBES_NUMBER,val); disconnect(spinNumTriggers,SIGNAL(valueChanged(int)), this, SLOT(setNumTriggers(int)));
disconnect(spinNumProbes,SIGNAL(valueChanged(int)), this, SLOT(setNumProbes(int))); disconnect(spinNumProbes,SIGNAL(valueChanged(int)), this, SLOT(setNumProbes(int)));
spinNumProbes->setValue((int)myDet->setTimer(slsDetectorDefs::PROBES_NUMBER,-1));
connect(spinNumProbes,SIGNAL(valueChanged(int)), this, SLOT(setNumProbes(int)));
//set probes
int ret = myDet->setTimer(slsDetectorDefs::PROBES_NUMBER,val);
if(ret != val)
ret = myDet->setTimer(slsDetectorDefs::PROBES_NUMBER,-1);
spinNumProbes->setValue(ret);
qDefs::checkErrorMessage(myDet,"qTabMeasurement::setNumProbes"); qDefs::checkErrorMessage(myDet,"qTabMeasurement::setNumProbes");
//Setting number of probes should reset number of triggers to 1, need to check if enabled, cuz its updated when refresh //Setting number of probes should reset number of triggers to 1, need to check if enabled, cuz its updated when refresh
if((spinNumProbes->isEnabled()) && (val > 0) && (spinNumTriggers->value() != 1)){ if((spinNumProbes->isEnabled()) && (ret > 0) && (spinNumTriggers->value() != 1)){
qDefs::Message(qDefs::INFORMATION,"<nobr>Number of Triggers has been reset to 1.</nobr><br>" qDefs::Message(qDefs::INFORMATION,"<nobr>Number of Triggers has been reset to 1.</nobr><br>"
"<nobr>This is mandatory to use probes.</nobr>","qTabMeasurement::setNumProbes"); "<nobr>This is mandatory to use probes.</nobr>","qTabMeasurement::setNumProbes");
cout << "Resetting Number of triggers to 1" << endl; cout << "Resetting Number of triggers to 1" << endl;
spinNumTriggers->setValue(1); spinNumTriggers->setValue(1);
} }
qDefs::checkErrorMessage(myDet,"qTabMeasurement::setNumProbes"); qDefs::checkErrorMessage(myDet,"qTabMeasurement::setNumProbes");
connect(spinNumTriggers,SIGNAL(valueChanged(int)), this, SLOT(setNumTriggers(int)));
connect(spinNumProbes,SIGNAL(valueChanged(int)), this, SLOT(setNumProbes(int)));
} }
@ -701,27 +711,10 @@ void qTabMeasurement::SetTimingMode(int mode){
//Frame Period between exposures //Frame Period between exposures
double exptimeNS,acqtimeNS;
double time;
qDefs::timeUnit unit; qDefs::timeUnit unit;
if(lblPeriod->isEnabled()){ if(lblPeriod->isEnabled())
exptimeNS = qDefs::getNSTime((qDefs::timeUnit)comboExpUnit->currentIndex(),spinExpTime->value()); CheckAcqPeriodGreaterThanExp();
acqtimeNS = qDefs::getNSTime((qDefs::timeUnit)comboPeriodUnit->currentIndex(),spinPeriod->value()); else{
if(exptimeNS>acqtimeNS) {
spinPeriod->setToolTip(errPeriodTip);
lblPeriod->setToolTip(errPeriodTip);
lblPeriod->setPalette(red);
lblPeriod->setText("Acquisition Period:*");
}
else {
spinPeriod->setToolTip(acqPeriodTip);
lblPeriod->setToolTip(acqPeriodTip);
lblPeriod->setPalette(lblTimingMode->palette());
lblPeriod->setText("Acquisition Period:");
}
}else {
spinPeriod->setToolTip(acqPeriodTip); spinPeriod->setToolTip(acqPeriodTip);
lblPeriod->setToolTip(acqPeriodTip); lblPeriod->setToolTip(acqPeriodTip);
lblPeriod->setPalette(lblTimingMode->palette()); lblPeriod->setPalette(lblTimingMode->palette());
@ -788,70 +781,51 @@ void qTabMeasurement::Refresh(){
disconnect(comboDelayUnit, SIGNAL(currentIndexChanged(int)), this, SLOT(setDelay())); disconnect(comboDelayUnit, SIGNAL(currentIndexChanged(int)), this, SLOT(setDelay()));
disconnect(spinNumGates, SIGNAL(valueChanged(int)), this, SLOT(setNumGates(int))); disconnect(spinNumGates, SIGNAL(valueChanged(int)), this, SLOT(setNumGates(int)));
#ifdef VERBOSE
cout << "Getting number of measurements & frames" << endl;
#endif
//Number of measurements //Number of measurements
spinNumMeasurements->setValue((int)myDet->setTimer(slsDetectorDefs::MEASUREMENTS_NUMBER,-1)); spinNumMeasurements->setValue((int)myDet->setTimer(slsDetectorDefs::MEASUREMENTS_NUMBER,-1));
#ifdef VERBOSE
cout << "Getting number of measurements" << endl;
#endif
//Number of frames //Number of frames
spinNumFrames->setValue((int)myDet->setTimer(slsDetectorDefs::FRAME_NUMBER,-1)); spinNumFrames->setValue((int)myDet->setTimer(slsDetectorDefs::FRAME_NUMBER,-1));
#ifdef VERBOSE
cout << "Getting number of frames" << endl;
#endif
#ifdef VERBOSE
cout << "Getting Exposure time and Acquisition Period" << endl;
#endif
//Exp Time //Exp Time
qDefs::timeUnit unit; qDefs::timeUnit unit;
double time = qDefs::getCorrectTime(unit,((double)(myDet->setTimer(slsDetectorDefs::ACQUISITION_TIME,-1)*(1E-9)))); double time = qDefs::getCorrectTime(unit,((double)(myDet->setTimer(slsDetectorDefs::ACQUISITION_TIME,-1)*(1E-9))));
spinExpTime->setValue(time); spinExpTime->setValue(time);
comboExpUnit->setCurrentIndex((int)unit); comboExpUnit->setCurrentIndex((int)unit);
#ifdef VERBOSE
cout << "Getting Exposure time" << endl;
#endif
//period //period
time = qDefs::getCorrectTime(unit,((double)(myDet->setTimer(slsDetectorDefs::FRAME_PERIOD,-1)*(1E-9)))); time = qDefs::getCorrectTime(unit,((double)(myDet->setTimer(slsDetectorDefs::FRAME_PERIOD,-1)*(1E-9))));
spinPeriod->setValue(time); spinPeriod->setValue(time);
comboPeriodUnit->setCurrentIndex((int)unit); comboPeriodUnit->setCurrentIndex((int)unit);
#ifdef VERBOSE #ifdef VERBOSE
cout << "Getting Acquisition Period" << endl; cout << "Getting delay after trigger, number of triggers and number of gates" << endl;
#endif #endif
//delay //delay
time = qDefs::getCorrectTime(unit,((double)(myDet->setTimer(slsDetectorDefs::DELAY_AFTER_TRIGGER,-1)*(1E-9)))); time = qDefs::getCorrectTime(unit,((double)(myDet->setTimer(slsDetectorDefs::DELAY_AFTER_TRIGGER,-1)*(1E-9))));
spinDelay->setValue(time); spinDelay->setValue(time);
comboDelayUnit->setCurrentIndex((int)unit); comboDelayUnit->setCurrentIndex((int)unit);
#ifdef VERBOSE
cout << "Getting delay after trigger" << endl;
#endif
//Number of Triggers //Number of Triggers
spinNumTriggers->setValue((int)myDet->setTimer(slsDetectorDefs::CYCLES_NUMBER,-1)); spinNumTriggers->setValue((int)myDet->setTimer(slsDetectorDefs::CYCLES_NUMBER,-1));
#ifdef VERBOSE
cout << "Getting number of triggers" << endl;
#endif
//gates //gates
spinNumGates->setValue((int)myDet->setTimer(slsDetectorDefs::GATES_NUMBER,-1)); spinNumGates->setValue((int)myDet->setTimer(slsDetectorDefs::GATES_NUMBER,-1));
#ifdef VERBOSE
cout << "Getting number of gates" << endl;
#endif
#ifdef VERBOSE
cout << "Getting file name prefix, file index, file write enable and progress index" << endl;
#endif
//File Name //File Name
dispFileName->setText(QString(myDet->getFileName().c_str())); dispFileName->setText(QString(myDet->getFileName().c_str()));
#ifdef VERBOSE
cout << "Getting file name prefix" << endl;
#endif
//File Index //File Index
spinIndex->setValue(myDet->getFileIndex()); spinIndex->setValue(myDet->getFileIndex());
#ifdef VERBOSE
cout << "Getting file index" << endl;
#endif
//file write enabled/disabled //file write enabled/disabled
chkFile->setChecked(myDet->enableWriteToFile()); chkFile->setChecked(myDet->enableWriteToFile());
#ifdef VERBOSE
cout << "Getting file write enable" << endl;
#endif
//progress label index //progress label index
if(myDet->getFrameIndex()==-1) if(myDet->getFrameIndex()==-1)
@ -874,8 +848,8 @@ void qTabMeasurement::Refresh(){
connect(comboDelayUnit, SIGNAL(currentIndexChanged(int)), this, SLOT(setDelay())); connect(comboDelayUnit, SIGNAL(currentIndexChanged(int)), this, SLOT(setDelay()));
connect(spinNumGates, SIGNAL(valueChanged(int)), this, SLOT(setNumGates(int))); connect(spinNumGates, SIGNAL(valueChanged(int)), this, SLOT(setNumGates(int)));
//Timing mode - will also check if exptime>acq period and also enableprobes() //timing mode - will also check if exptime>acq period and also enableprobes()
SetupTimingMode(); GetModeFromDetector();
// to let qdrawplot know that triggers or frames are used // to let qdrawplot know that triggers or frames are used
myPlot->setFrameEnabled(lblNumFrames->isEnabled()); myPlot->setFrameEnabled(lblNumFrames->isEnabled());
@ -894,27 +868,41 @@ void qTabMeasurement::Refresh(){
void qTabMeasurement::EnableProbes(){ void qTabMeasurement::EnableProbes(){
disconnect(spinNumProbes,SIGNAL(valueChanged(int)), this, SLOT(setNumProbes(int)));
disconnect(spinNumTriggers,SIGNAL(valueChanged(int)), this, SLOT(setNumTriggers(int)));
//enabled only in expert mode and if #Frames > 1 //enabled only in expert mode and if #Frames > 1
if((expertMode)&&(myDet->getDetectorsType()==slsDetectorDefs::MYTHEN)&&(spinNumFrames->value()>1)){ if((expertMode)&&(detType==slsDetectorDefs::MYTHEN)&&(spinNumFrames->value()>1)){
lblNumProbes->setEnabled(true); lblNumProbes->setEnabled(true);
spinNumProbes->setEnabled(true); spinNumProbes->setEnabled(true);
disconnect(spinNumProbes,SIGNAL(valueChanged(int)), this, SLOT(setNumProbes(int)));
spinNumProbes->setValue((int)myDet->setTimer(slsDetectorDefs::PROBES_NUMBER,-1)); spinNumProbes->setValue((int)myDet->setTimer(slsDetectorDefs::PROBES_NUMBER,-1));
connect(spinNumProbes,SIGNAL(valueChanged(int)), this, SLOT(setNumProbes(int)));
#ifdef VERBOSE #ifdef VERBOSE
cout << "Getting number of probes : " << spinNumProbes->value() << endl; cout << "Getting number of probes : " << spinNumProbes->value() << endl;
#endif #endif
//ensure that #triggers is reset
setNumProbes(spinNumProbes->value());
//Setting number of probes should reset number of triggers to 1, need to check if enabled, cuz its updated when refresh
if((spinNumProbes->isEnabled()) && (spinNumProbes->value() > 0) && (spinNumTriggers->value() != 1)){
qDefs::Message(qDefs::INFORMATION,"<nobr>Number of Triggers has been reset to 1.</nobr><br>"
"<nobr>This is mandatory to use probes.</nobr>","qTabMeasurement::EnableProbes");
cout << "Resetting Number of triggers to 1" << endl;
spinNumTriggers->setValue(1);
}
qDefs::checkErrorMessage(myDet,"qTabMeasurement::EnableProbes"); qDefs::checkErrorMessage(myDet,"qTabMeasurement::EnableProbes");
connect(spinNumProbes, SIGNAL(valueChanged(int)), this, SLOT(setNumProbes(int)));
connect(spinNumTriggers, SIGNAL(valueChanged(int)), this, SLOT(setNumTriggers(int)));
return; return;
} }
cout << "Probes not enabled" << endl; cout << "Probes not enabled" << endl;
if(myDet->getDetectorsType()==slsDetectorDefs::MYTHEN) if(detType==slsDetectorDefs::MYTHEN)
spinNumProbes->setValue(0); spinNumProbes->setValue(0);
lblNumProbes->setEnabled(false); lblNumProbes->setEnabled(false);
spinNumProbes->setEnabled(false); spinNumProbes->setEnabled(false);
connect(spinNumProbes,SIGNAL(valueChanged(int)), this, SLOT(setNumProbes(int)));
connect(spinNumTriggers,SIGNAL(valueChanged(int)), this, SLOT(setNumTriggers(int)));
} }