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

removed warnings and zmq only when not mythen

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-11-22 11:06:05 +01:00
parent 4292bf1ce8
commit 9031b3998b
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorGui/slsDetectorPlotting/src/SlsQt2DHist.cxx
View File

@ -13,13 +13,14 @@ using std::cout;
using std::endl; using std::endl;
SlsQt2DHist::SlsQt2DHist(int nbinsx, double xmin, double xmax, int nbinsy, double ymin, double ymax, double* d,double zmin,double zmax):QwtRasterData(){ SlsQt2DHist::SlsQt2DHist(int nbinsx, double xmin, double xmax, int nbinsy, double ymin, double ymax, double* d,double zmin,double zmax):QwtRasterData(){
x_min=0;x_max=0;y_min=0;y_max=0;
interp=0; interp=0;
nx_array=ny_array=0;data=0; nx_array=ny_array=0;data=0;
SetData(nbinsx,xmin,xmax,nbinsy,ymin,ymax,d,zmin,zmax); SetData(nbinsx,xmin,xmax,nbinsy,ymin,ymax,d,zmin,zmax);
} }
SlsQt2DHist::~SlsQt2DHist(){if(data) delete data;} SlsQt2DHist::~SlsQt2DHist(){if(data) delete [] data;}
int SlsQt2DHist::GetBinIndex(int bx, int by){ int SlsQt2DHist::GetBinIndex(int bx, int by){
int b = bx*ny+by; int b = bx*ny+by;
@ -72,7 +73,7 @@ void SlsQt2DHist::SetData(int nbinsx, double xmin, double xmax, int nbinsy,doubl
} }
if(nbinsx*nbinsy>nx_array*ny_array){ if(nbinsx*nbinsy>nx_array*ny_array){
if(data) delete data; if(data) delete [] data;
data = new double [nbinsx*nbinsy+1]; //one for under/overflow bin data = new double [nbinsx*nbinsy+1]; //one for under/overflow bin
nx_array = nbinsx; nx_array = nbinsx;
ny_array = nbinsy; ny_array = nbinsy;

5
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -332,8 +332,9 @@ void qDrawPlot::SetupWidgetWindow(){
myDet->registerMeasurementFinishedCallback(&(GetMeasurementFinishedCallBack),this); myDet->registerMeasurementFinishedCallback(&(GetMeasurementFinishedCallBack),this);
//Setting the callback function to get progress from detector class(using receivers) //Setting the callback function to get progress from detector class(using receivers)
myDet->registerProgressCallback(&(GetProgressCallBack),this); myDet->registerProgressCallback(&(GetProgressCallBack),this);
//stream data to the gui //stream data from receiver to the gui
myDet->enableDataStreamingFromReceiver(1); if(detType != slsDetectorDefs::MYTHEN)
myDet->enableDataStreamingFromReceiver(1);
qDefs::checkErrorMessage(myDet,"qDrawPlot::SetupWidgetWindow"); qDefs::checkErrorMessage(myDet,"qDrawPlot::SetupWidgetWindow");