Changes for Qwt6, but 2D plot still does not work...and should be checked if Qwt5 still works

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@100 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
bergamaschi
2012-10-22 15:34:14 +00:00
parent 6cec748335
commit 8715a416a0
11 changed files with 184 additions and 21 deletions

View File

@ -119,8 +119,11 @@ void SlsQtH1D::SetData(int n, double xmin, double xmax, double *data){
// if(firstXgt0<0)firstXgt0=0.001;
// if(firstYgt0<0)firstYgt0=0.001;
setRawData(x,y,ndata);
#if QWT_VERSION<0x060000
setRawData(x,y,ndata);
#else
setRawSamples(x,y,ndata);
#endif
}
void SlsQtH1D::SetData(int n, double* data_x, double *data_y){
@ -146,7 +149,11 @@ void SlsQtH1D::SetData(int n, double* data_x, double *data_y){
if(y[b]>0&&(firstYgt0<0||firstYgt0>y[b])) firstYgt0=y[b];
}
#if QWT_VERSION<0x060000
setRawData(x,y,ndata);
#else
setRawSamples(x,y,ndata);
#endif
}
int SlsQtH1D::SetUpArrays(int n){
@ -441,11 +448,19 @@ void SlsQt1DPlot::alignScales(){
}
void SlsQt1DPlot::UnknownStuff(){
#if QWT_VERSION<0x060000
// Disable polygon clipping
QwtPainter::setDeviceClipping(false);
//not supported for version 6
QwtPainter::setDeviceClipping(false);
canvas()->setPaintAttribute(QwtPlotCanvas::PaintCached, false);
canvas()->setPaintAttribute(QwtPlotCanvas::PaintPacked, false);
#else
// We don't need the cache here
canvas()->setPaintAttribute(QwtPlotCanvas::PaintCached, false);
canvas()->setPaintAttribute(QwtPlotCanvas::PaintPacked, false);
canvas()->setPaintAttribute(QwtPlotCanvas::BackingStore, false);
#endif
#if QT_VERSION >= 0x040000
#ifdef Q_WS_X11