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

displaying subframe index in gui

Browse Source
This commit is contained in:
Dhanya Maliakal 2015-09-23 11:50:47 +02:00
parent 754d0b7911
commit 2ed8b46ad0
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorGui/include/qDrawPlot.h
View File

@ -229,10 +229,10 @@ int ResetDaqForGui();
static void* DataStartAcquireThread(void *this_pointer); static void* DataStartAcquireThread(void *this_pointer);
/** This is called by the detector class to copy the data it jus acquired */ /** This is called by the detector class to copy the data it jus acquired */
static int GetDataCallBack(detectorData *data, int fIndex, void *this_pointer); static int GetDataCallBack(detectorData *data, int fIndex, int subIndex, void *this_pointer);
/** This is called by the GetDataCallBack function to copy the data */ /** This is called by the GetDataCallBack function to copy the data */
int GetData(detectorData *data, int fIndex); int GetData(detectorData *data, int fIndex, int subIndex);
/** This is called by detector class when acquisition is finished /** This is called by detector class when acquisition is finished
* @param currentProgress current progress of measurement * @param currentProgress current progress of measurement

12
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -735,8 +735,8 @@ void* qDrawPlot::DataStartAcquireThread(void *this_pointer){
//------------------------------------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------------------------------------
int qDrawPlot::GetDataCallBack(detectorData *data, int fIndex, void *this_pointer){ int qDrawPlot::GetDataCallBack(detectorData *data, int fIndex, int subIndex, void *this_pointer){
((qDrawPlot*)this_pointer)->GetData(data,fIndex); ((qDrawPlot*)this_pointer)->GetData(data,fIndex, subIndex);
return 0; return 0;
} }
@ -744,10 +744,11 @@ int qDrawPlot::GetDataCallBack(detectorData *data, int fIndex, void *this_pointe
//------------------------------------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------------------------------------
int qDrawPlot::GetData(detectorData *data,int fIndex){ int qDrawPlot::GetData(detectorData *data,int fIndex, int subIndex){
#ifdef VERYVERBOSE #ifdef VERYVERBOSE
cout << "******Entering GetDatafunction********" << endl; cout << "******Entering GetDatafunction********" << endl;
cout << "fIndex " << fIndex << endl; cout << "fIndex " << fIndex << endl;
cout << "subIndex " << subIndex << endl;
cout << "fname " << data->fileName << endl; cout << "fname " << data->fileName << endl;
cout << "npoints " << data->npoints << endl; cout << "npoints " << data->npoints << endl;
cout << "npy " << data->npy << endl; cout << "npy " << data->npy << endl;
@ -775,11 +776,14 @@ int qDrawPlot::GetData(detectorData *data,int fIndex){
if(fIndex!=-1){ if(fIndex!=-1){
currentFrameIndex=fIndex; currentFrameIndex=fIndex;
sprintf(temp_title,"#%d",fIndex); sprintf(temp_title,"#%d",fIndex);
if((myDet->getDetectorsType()==slsDetectorDefs::EIGER) && (subIndex != -1))
sprintf(temp_title,"#%d %d",fIndex,subIndex);
}else{ }else{
if(fileSaveEnable) strcpy(temp_title,"#%d"); if(fileSaveEnable) strcpy(temp_title,"#%d");
else sprintf(temp_title,"",currentFrame); else sprintf(temp_title,"",currentFrame);
} }
if(subIndex != -1)
sprintf(temp_title,"#%d %d",fIndex,subIndex);
//Plot Disabled //Plot Disabled
if(!plotEnable) return 0; if(!plotEnable) return 0;