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

fixed bugs to do with stacked trace and fixed file input range for scan

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@22 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2012-08-03 16:52:21 +00:00
parent 63f9d04981
commit 2dbdf8ff17
19 changed files with 885 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorGui/src/qTabAdvanced.cpp
View File

@ -64,11 +64,11 @@ void qTabAdvanced::Enable(bool enable){
void qTabAdvanced::getTemperature(){
char ctemp[200];
/** adc */
float tempadc = myDet->getADC(slsDetectorDefs::TEMPERATURE_ADC);
double tempadc = myDet->getADC(slsDetectorDefs::TEMPERATURE_ADC);
sprintf(ctemp,"%f%cC",tempadc,0x00B0);
dispTempAdc->setText(QString(ctemp));
/** fpga */
float tempfpga = myDet->getADC(slsDetectorDefs::TEMPERATURE_FPGA);
double tempfpga = myDet->getADC(slsDetectorDefs::TEMPERATURE_FPGA);
sprintf(ctemp,"%f%cC",tempfpga,0x00B0);
dispTempFpga->setText(QString(ctemp));
#ifdef VERBOSE