detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-15 22:37:14 +02:00
Code Issues Actions Packages Releases Activity

Merge branch '3.0.1' into developer

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-13 15:32:47 +01:00
parent 7ba90f98fc 52a9303a5e
commit 8872f86e31
7 changed files with 35 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -513,7 +513,10 @@ bool qDrawPlot::StartOrStopThread(bool start){
plot2D->GetPlot()->SetXMinMax(-0.5,nPixelsX+0.5);
plot2D->GetPlot()->SetYMinMax(startPixel,endPixel);
plot2D->GetPlot()->SetZoom(-0.5,startPixel,nPixelsX,endPixel-startPixel);
plot2D->GetPlot()->UnZoom();
if (boxPlot->title() == "Sample Plot")
plot2D->GetPlot()->UnZoom();
else
plot2D->GetPlot()->UnZoom(false);
/*XYRangeChanged = true;*/
boxPlot->setTitle("Old_Plot.raw");
@ -901,13 +904,13 @@ int qDrawPlot::GetData(detectorData *data,int fIndex, int subIndex){
memcpy(histYAngleAxis,data->values,nAnglePixelsX*sizeof(double));
SetHistXAxisTitle("Angles");
}
plotRequired = true;
UnlockLastImageArray();
currentFrame++;
#ifdef VERYVERBOSE
cout << "Exiting GetData Function " << endl;
#endif
emit UpdatePlotSignal();
plotRequired = true;
return 0;
}
@ -961,11 +964,11 @@ int qDrawPlot::GetData(detectorData *data,int fIndex, int subIndex){
imageTitle = temp_title;
//copy data
memcpy(lastImageArray+(currentScanDivLevel*nPixelsX),data->values,nPixelsX*sizeof(double));
plotRequired = true;
UnlockLastImageArray();
currentFrame++;
currentScanDivLevel++;
emit UpdatePlotSignal();
plotRequired = true;
return 0;
}
//file index
@ -980,11 +983,11 @@ int qDrawPlot::GetData(detectorData *data,int fIndex, int subIndex){
imageTitle = temp_title;
//copy data
for(unsigned int px=0;px<nPixelsX;px++) lastImageArray[currentScanDivLevel*nPixelsX+px] += data->values[px];
plotRequired = true;
UnlockLastImageArray();
currentFrame++;
currentScanDivLevel++;
emit UpdatePlotSignal();
plotRequired = true;
return 0;
}
//level0
@ -1006,10 +1009,10 @@ int qDrawPlot::GetData(detectorData *data,int fIndex, int subIndex){
imageTitle = temp_title;
//copy data
for(unsigned int px=0;px<nPixelsX;px++) lastImageArray[currentScanDivLevel*nPixelsX+px] += data->values[px];
plotRequired = true;
UnlockLastImageArray();
currentFrame++;
emit UpdatePlotSignal();
plotRequired = true;
return 0;
}
//level1
@ -1031,10 +1034,10 @@ int qDrawPlot::GetData(detectorData *data,int fIndex, int subIndex){
imageTitle = temp_title;
//copy data
for(unsigned int px=0;px<nPixelsX;px++) lastImageArray[currentScanDivLevel*nPixelsX+px] += data->values[px];
plotRequired = true;
UnlockLastImageArray();
currentFrame++;
emit UpdatePlotSignal();
plotRequired = true;
return 0;
}
@ -1233,14 +1236,14 @@ int qDrawPlot::GetData(detectorData *data,int fIndex, int subIndex){
}
/* pthread_mutex_unlock(&(last_image_complete_mutex));
}*/
plotRequired = true;
UnlockLastImageArray();
#ifdef VERYVERBOSE
cprintf(BLUE,"currentframe:%d \tcurrentframeindex:%d\n",currentFrame,currentFrameIndex);
#endif
emit UpdatePlotSignal();
plotRequired = true;
currentFrame++;
emit UpdatePlotSignal();
}