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

fixed a few warnings

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-17 08:46:04 +01:00
parent bbcf75bc09
commit c1e735c1b4
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorGui/include/qDebugStream.h
View File

@ -87,7 +87,7 @@ protected:
m_string.append(p, p + n); m_string.append(p, p + n);
//changed from uint because of 64 bit //changed from uint because of 64 bit
int pos = 0; unsigned int pos = 0;
while (pos != string::npos){ while (pos != string::npos){
pos = m_string.find('\n'); pos = m_string.find('\n');

2
slsDetectorGui/include/qDrawPlot.h
View File

@ -408,7 +408,7 @@ unsigned int nPixelsX;
/** Number of angle Pixels in X Axis */ /** Number of angle Pixels in X Axis */
int nAnglePixelsX; int nAnglePixelsX;
/** Number of pixel bins in Y Axis */ /** Number of pixel bins in Y Axis */
int nPixelsY; unsigned int nPixelsY;
/** Min Pixel number for Y Axis*/ /** Min Pixel number for Y Axis*/
double minPixelsY; double minPixelsY;
/** Max Pixel number for Y Axis*/ /** Max Pixel number for Y Axis*/

29
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -290,7 +290,7 @@ void qDrawPlot::SetupWidgetWindow(){
nHists = 1; nHists = 1;
if(histXAxis) delete [] histXAxis; histXAxis = new double [nPixelsX]; if(histXAxis) delete [] histXAxis; histXAxis = new double [nPixelsX];
if(histYAxis[0]) delete [] histYAxis[0];histYAxis[0] = new double [nPixelsX]; if(histYAxis[0]) delete [] histYAxis[0];histYAxis[0] = new double [nPixelsX];
for(unsigned int px=0;px<(int)nPixelsX;px++) {histXAxis[px] = px;histYAxis[0][px] = 0;} for(unsigned int px=0;px<nPixelsX;px++) {histXAxis[px] = px;histYAxis[0][px] = 0;}
Clear1DPlot(); Clear1DPlot();
plot1D->SetXTitle("X Axis"); plot1D->SetXTitle("X Axis");
plot1D->SetYTitle("Y Axis"); plot1D->SetYTitle("Y Axis");
@ -541,7 +541,7 @@ void qDrawPlot::SetScanArgument(int scanArg){
//get #scansets for level 0 and level 1 //get #scansets for level 0 and level 1
int numScan0 = myDet->getScanSteps(0); numScan0 = ((numScan0==0)?1:numScan0); int numScan0 = myDet->getScanSteps(0); numScan0 = ((numScan0==0)?1:numScan0);
int numScan1 = myDet->getScanSteps(1); numScan1 = ((numScan1==0)?1:numScan1); int numScan1 = myDet->getScanSteps(1); numScan1 = ((numScan1==0)?1:numScan1);
int numPos=myDet->getPositions(); //int numPos=myDet->getPositions();
number_of_exposures = number_of_frames * numScan0 * numScan1; number_of_exposures = number_of_frames * numScan0 * numScan1;
if(anglePlot) number_of_exposures = numScan0 * numScan1;// * numPos; if(anglePlot) number_of_exposures = numScan0 * numScan1;// * numPos;
@ -594,11 +594,11 @@ void qDrawPlot::SetScanArgument(int scanArg){
if(lastImageArray) delete [] lastImageArray; lastImageArray = new double[nPixelsY*nPixelsX]; if(lastImageArray) delete [] lastImageArray; lastImageArray = new double[nPixelsY*nPixelsX];
//initializing 1d x axis //initializing 1d x axis
for(unsigned int px=0;px<(int)nPixelsX;px++) histXAxis[px] = px;/*+10;*/ for(unsigned int px=0;px<nPixelsX;px++) histXAxis[px] = px;/*+10;*/
//initializing 2d array //initializing 2d array
for(int py=0;py<(int)nPixelsY;py++) for(unsigned int py=0;py<nPixelsY;py++)
for(int px=0;px<(int)nPixelsX;px++) for(unsigned int px=0;px<nPixelsX;px++)
lastImageArray[py*nPixelsX+px] = 0; lastImageArray[py*nPixelsX+px] = 0;
@ -653,8 +653,8 @@ void qDrawPlot::SetupMeasurement(){
if(!running) if(!running)
lastImageNumber = 0;/**Just now */ lastImageNumber = 0;/**Just now */
//initializing 2d array //initializing 2d array
for(int py=0;py<(int)nPixelsY;py++) for(unsigned int py=0;py<nPixelsY;py++)
for(int px=0;px<(int)nPixelsX;px++) for(unsigned int px=0;px<nPixelsX;px++)
lastImageArray[py*nPixelsX+px] = 0; lastImageArray[py*nPixelsX+px] = 0;
//1d with no scan //1d with no scan
@ -801,7 +801,7 @@ int qDrawPlot::GetData(detectorData *data,int fIndex, int subIndex){
sprintf(temp_title,"#%d %d",fIndex,subIndex); 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,"#%d",currentFrame);
} }
if(subIndex != -1) if(subIndex != -1)
sprintf(temp_title,"#%d %d",fIndex,subIndex); sprintf(temp_title,"#%d %d",fIndex,subIndex);
@ -1637,12 +1637,13 @@ void qDrawPlot::SavePlot(){
fName = QFileDialog::getSaveFileName(0,tr("Save Image"),fName,tr("PNG Files (*.png);;XPM Files(*.xpm);;JPEG Files(*.jpg)"),0,QFileDialog::ShowDirsOnly); fName = QFileDialog::getSaveFileName(0,tr("Save Image"),fName,tr("PNG Files (*.png);;XPM Files(*.xpm);;JPEG Files(*.jpg)"),0,QFileDialog::ShowDirsOnly);
if (!fName.isEmpty()) if (!fName.isEmpty()) {
if(savedImage.save(fName)) if(savedImage.save(fName))
qDefs::Message(qDefs::INFORMATION,"The Image has been successfully saved","qDrawPlot::SavePlot"); qDefs::Message(qDefs::INFORMATION,"The Image has been successfully saved","qDrawPlot::SavePlot");
else else
qDefs::Message(qDefs::WARNING,"Attempt to save image failed.\n" qDefs::Message(qDefs::WARNING,"Attempt to save image failed.\n"
"Formats: .png, .jpg, .xpm.","qDrawPlot::SavePlot"); "Formats: .png, .jpg, .xpm.","qDrawPlot::SavePlot");
}
} }
@ -1740,7 +1741,7 @@ void qDrawPlot::DisableZoom(bool disable){
int qDrawPlot::UpdateTrimbitPlot(bool fromDetector,bool Histogram){ int qDrawPlot::UpdateTrimbitPlot(bool fromDetector,bool Histogram){
int ret,i,actualPixelsX; int ret,actualPixelsX;
double min=0,max=0,sum=0; double min=0,max=0,sum=0;
#ifdef VERBOSE #ifdef VERBOSE
if(fromDetector) cout << "Geting Trimbits from Detector" << endl; if(fromDetector) cout << "Geting Trimbits from Detector" << endl;
@ -1788,8 +1789,8 @@ int qDrawPlot::UpdateTrimbitPlot(bool fromDetector,bool Histogram){
if(histXAxis) delete [] histXAxis; histXAxis = new double [nPixelsX]; if(histXAxis) delete [] histXAxis; histXAxis = new double [nPixelsX];
if(histYAxis[0]) delete [] histYAxis[0]; histYAxis[0]= new double [nPixelsX]; if(histYAxis[0]) delete [] histYAxis[0]; histYAxis[0]= new double [nPixelsX];
//initializing //initializing
for(unsigned int px=0;px<(int)nPixelsX;px++) histXAxis[px] = px; for(unsigned int px=0;px<nPixelsX;px++) histXAxis[px] = px;
for(i=0;i<nPixelsX;i++) histYAxis[0][i] = 0; for(unsigned int i=0;i<nPixelsX;i++) histYAxis[0][i] = 0;
//data //data
memcpy(histYAxis[0],histTrimbits,nPixelsX*sizeof(double)); memcpy(histYAxis[0],histTrimbits,nPixelsX*sizeof(double));
@ -1820,14 +1821,14 @@ int qDrawPlot::UpdateTrimbitPlot(bool fromDetector,bool Histogram){
//create intervals //create intervals
histogramSamples.resize(TRIM_HISTOGRAM_XMAX+1); histogramSamples.resize(TRIM_HISTOGRAM_XMAX+1);
for(i=0; i<TRIM_HISTOGRAM_XMAX+1; i++){ for(unsigned int i=0; i<TRIM_HISTOGRAM_XMAX+1; i++){
histogramSamples[i].interval.setInterval(i,i+1); histogramSamples[i].interval.setInterval(i,i+1);
histogramSamples[i].value = 0; histogramSamples[i].value = 0;
} }
//fill histogram values //fill histogram values
int value = 0; int value = 0;
for(i=0;i<actualPixelsX;i++){ for(int i=0;i<actualPixelsX;i++){
if( (histTrimbits[i] <= TRIM_HISTOGRAM_XMAX) && (histTrimbits[i] >= 0)){//if(histogramSamples[j].interval.contains(data->values[i])) if( (histTrimbits[i] <= TRIM_HISTOGRAM_XMAX) && (histTrimbits[i] >= 0)){//if(histogramSamples[j].interval.contains(data->values[i]))
value = (int) histTrimbits[i]; value = (int) histTrimbits[i];
histogramSamples[value].value += 1; histogramSamples[value].value += 1;