git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@29 af1100a4-978c-4157-bff7-07162d2ba061

This commit is contained in:
l_maliakal_d
2012-08-17 10:29:46 +00:00
parent 30c11d7589
commit 423a47cd9e
10 changed files with 486 additions and 158 deletions

View File

@ -357,16 +357,6 @@ void qDetectorMain::ExecuteUtilities(QAction *action){
qDefs::InfoMessage("The configuration parameters have been successfully saved.","Main");
}
}
else if(action==actionEnergyCalibration){
#ifdef VERBOSE
cout << "Executing Energy Calibration" << endl;
#endif
}
else{
#ifdef VERBOSE
cout << "Executing Angular Calibration" << endl;
#endif
}
Refresh(tabs->currentIndex());
}

View File

@ -0,0 +1,58 @@
/*
* qEnergyCalibration.cpp
*
* Created on: May 10, 2012
* Author: l_maliakal_d
*/
#include "qEnergyCalibration.h"
#include "qDefs.h"
/** Project Class Headers */
#include "slsDetector.h"
#include "multiSlsDetector.h"
/** C++ Include Headers */
#include<iostream>
using namespace std;
qEnergyCalibration::qEnergyCalibration(QWidget *parent,multiSlsDetector*& detector):QWizard(parent),myDet(detector){
setupUi(this);
SetupWidgetWindow();
Initialization();
}
qEnergyCalibration::~qEnergyCalibration(){
delete myDet;
}
void qEnergyCalibration::SetupWidgetWindow(){
}
void qEnergyCalibration::Initialization(){
}
//-------------------------------------------------------------------------------------------------------------------------------------------------
void qEnergyCalibration::Refresh(){
}
//-------------------------------------------------------------------------------------------------------------------------------------------------

View File

@ -18,7 +18,6 @@ using namespace std;
qTabAdvanced::qTabAdvanced(QWidget *parent,multiSlsDetector*& detector):QWidget(parent),myDet(detector){
setupUi(this);
myDetType = (int)myDet->getDetectorsType();
SetupWidgetWindow();
Initialization();
}
@ -34,48 +33,16 @@ qTabAdvanced::~qTabAdvanced(){
void qTabAdvanced::SetupWidgetWindow(){
/** Temperature */
if(myDetType==slsDetectorDefs::GOTTHARD)
getTemperature(); //check if gotthard???
else{
btnTemp->setEnabled(false);
dispTempAdc->setEnabled(false);
dispTempFpga->setEnabled(false);
}
}
void qTabAdvanced::Initialization(){
/** Temperature */
connect(btnTemp,SIGNAL(clicked()),this,SLOT(getTemperature()));//check if gotthard???
}
void qTabAdvanced::Enable(bool enable){
btnTemp->setEnabled(enable);
dispTempAdc->setEnabled(enable);
dispTempFpga->setEnabled(enable);
pushButton->setEnabled(enable);
}
void qTabAdvanced::getTemperature(){
char ctemp[200];
/** adc */
double tempadc = myDet->getADC(slsDetectorDefs::TEMPERATURE_ADC);
sprintf(ctemp,"%f%cC",tempadc,0x00B0);
dispTempAdc->setText(QString(ctemp));
/** fpga */
double tempfpga = myDet->getADC(slsDetectorDefs::TEMPERATURE_FPGA);
sprintf(ctemp,"%f%cC",tempfpga,0x00B0);
dispTempFpga->setText(QString(ctemp));
#ifdef VERBOSE
cout<<"Temperature of ADC: "<<tempadc<<"°C and FPGA: "<<tempfpga<<"°C"<<endl;
#endif
}
//-------------------------------------------------------------------------------------------------------------------------------------------------

View File

@ -489,14 +489,15 @@ void qTabMeasurement::SetTimingMode(int mode){
if(myDet->setExternalCommunicationMode(slsDetectorDefs::AUTO_TIMING)==slsDetectorDefs::AUTO_TIMING)
success = true;
break;
case Auto://Number of Frames, Exposure Time, Acquisition Period
case Auto://#Frames, ExpTime, Period
setNumTriggers(1);
lblNumFrames->setEnabled(true); spinNumFrames->setEnabled(true);
lblExpTime->setEnabled(true); spinExpTime->setEnabled(true); comboExpUnit->setEnabled(true);
lblPeriod->setEnabled(true); spinPeriod->setEnabled(true); comboPeriodUnit->setEnabled(true);
if(myDet->setExternalCommunicationMode(slsDetectorDefs::AUTO_TIMING)==slsDetectorDefs::AUTO_TIMING)
success = true;
break;
case Trigger_Exp_Series://Number of Frames, Exposure Time, Acquisition Period, Number of Triggers, Delay
case Trigger_Exp_Series://#Frames, #Triggers, ExpTime, Period, Delay
lblNumFrames->setEnabled(true); spinNumFrames->setEnabled(true);
lblExpTime->setEnabled(true); spinExpTime->setEnabled(true); comboExpUnit->setEnabled(true);
lblPeriod->setEnabled(true); spinPeriod->setEnabled(true); comboPeriodUnit->setEnabled(true);
@ -505,13 +506,15 @@ void qTabMeasurement::SetTimingMode(int mode){
if(myDet->setExternalCommunicationMode(slsDetectorDefs::TRIGGER_EXPOSURE)==slsDetectorDefs::TRIGGER_EXPOSURE)
success = true;
break;
case Trigger_Frame://Exposure Time, Number of Triggers
case Trigger_Frame://ExpTime, #Triggers
setNumFrames(1);
lblExpTime->setEnabled(true); spinExpTime->setEnabled(true); comboExpUnit->setEnabled(true);
lblNumTriggers->setEnabled(true); spinNumTriggers->setEnabled(true);
if(myDet->setExternalCommunicationMode(slsDetectorDefs::TRIGGER_FRAME)==slsDetectorDefs::TRIGGER_FRAME)
success = true;
break;
case Trigger_Readout://Number of Frames, Exposure Time, Acquisition Period, Delay
case Trigger_Readout://#Frames, ExpTime, Period, Delay
setNumTriggers(1);
lblNumFrames->setEnabled(true); spinNumFrames->setEnabled(true);
lblExpTime->setEnabled(true); spinExpTime->setEnabled(true); comboExpUnit->setEnabled(true);
lblPeriod->setEnabled(true); spinPeriod->setEnabled(true); comboPeriodUnit->setEnabled(true);
@ -519,13 +522,14 @@ void qTabMeasurement::SetTimingMode(int mode){
if(myDet->setExternalCommunicationMode(slsDetectorDefs::TRIGGER_READOUT)==slsDetectorDefs::TRIGGER_READOUT)
success = true;
break;
case Gated://Number of Frames, Number of Gates
case Gated://#Frames, #Gates
setNumTriggers(1);
lblNumFrames->setEnabled(true); spinNumFrames->setEnabled(true);
lblNumGates->setEnabled(true); spinNumGates->setEnabled(true);
if(myDet->setExternalCommunicationMode(slsDetectorDefs::GATE_FIX_NUMBER)==slsDetectorDefs::GATE_FIX_NUMBER)
success = true;
break;
case Gated_Start://Number of Frames, Exposure Time, Acquisition Period, Number of Triggers, Number of Gates
case Gated_Start://#Frames, #Triggers, #Gates, ExpTime, Period
lblNumFrames->setEnabled(true); spinNumFrames->setEnabled(true);
lblExpTime->setEnabled(true); spinExpTime->setEnabled(true); comboExpUnit->setEnabled(true);
lblPeriod->setEnabled(true); spinPeriod->setEnabled(true); comboPeriodUnit->setEnabled(true);
@ -534,7 +538,8 @@ void qTabMeasurement::SetTimingMode(int mode){
if(myDet->setExternalCommunicationMode(slsDetectorDefs::GATE_WITH_START_TRIGGER)==slsDetectorDefs::GATE_WITH_START_TRIGGER)
success = true;
break;
case Trigger_Window://Number of Triggers
case Trigger_Window://#Triggers
setNumFrames(1);
lblNumTriggers->setEnabled(true); spinNumTriggers->setEnabled(true);
if(myDet->setExternalCommunicationMode(slsDetectorDefs::TRIGGER_WINDOW)==slsDetectorDefs::TRIGGER_WINDOW)
success = true;