mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-16 23:07:13 +02:00
added color to collapse in actions, changed angular for number of data to be received, corrected constant size scan widget
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@48 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
@ -14,6 +14,7 @@
|
||||
using namespace std;
|
||||
|
||||
|
||||
//-------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
qTabAdvanced::qTabAdvanced(QWidget *parent,multiSlsDetector*& detector):QWidget(parent),myDet(detector){
|
||||
@ -23,6 +24,8 @@ qTabAdvanced::qTabAdvanced(QWidget *parent,multiSlsDetector*& detector):QWidget(
|
||||
}
|
||||
|
||||
|
||||
//-------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
qTabAdvanced::~qTabAdvanced(){
|
||||
@ -30,6 +33,7 @@ qTabAdvanced::~qTabAdvanced(){
|
||||
}
|
||||
|
||||
|
||||
//-------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
void qTabAdvanced::SetupWidgetWindow(){
|
||||
@ -37,8 +41,41 @@ void qTabAdvanced::SetupWidgetWindow(){
|
||||
}
|
||||
|
||||
|
||||
//-------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
void qTabAdvanced::Initialization(){
|
||||
//energy/angular logs
|
||||
connect(chkEnergyLog, SIGNAL(toggled(bool)), this, SLOT(SetLogs()));
|
||||
connect(chkAngularLog, SIGNAL(toggled(bool)), this, SLOT(SetLogs()));
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
//-------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
void qTabAdvanced::SetLogs(){
|
||||
QCheckBox *checkedBox = qobject_cast<QCheckBox *>(sender());
|
||||
int index = ((!checkedBox->text().compare("Energy Calibration"))?slsDetectorDefs::enCalLog:slsDetectorDefs::angCalLog);
|
||||
bool enable = checkedBox->isChecked();
|
||||
#ifdef VERBOSE
|
||||
if(index==slsDetectorDefs::enCalLog)
|
||||
cout << "Setting Energy Calibration Logs to " << enable << endl;
|
||||
else
|
||||
cout << "Setting Angular Calibration Logs to " << enable << endl;
|
||||
#endif
|
||||
//set/unset the log
|
||||
myDet->setAction(index,(enable?"set":"none"));
|
||||
//verify
|
||||
if(myDet->getActionMode(index)!=(enable)){
|
||||
#ifdef VERBOSE
|
||||
cout << "Could not set/reset Log." << endl;
|
||||
#endif
|
||||
qDefs::WarningMessage("Could not set/reset Log.","Advanced");
|
||||
checkedBox->setChecked(!enable);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -47,6 +84,14 @@ void qTabAdvanced::Initialization(){
|
||||
|
||||
|
||||
void qTabAdvanced::Refresh(){
|
||||
//energy/angular logs
|
||||
chkEnergyLog->setChecked(myDet->getActionMode(slsDetectorDefs::enCalLog));
|
||||
chkAngularLog->setChecked(myDet->getActionMode(slsDetectorDefs::angCalLog));
|
||||
#ifdef VERBOSE
|
||||
cout << "Energy Calibration Log set to " << chkEnergyLog->isChecked() << endl;
|
||||
cout << "Angular Calibration Log set to " << chkAngularLog->isChecked() << endl;
|
||||
#endif
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user