diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h index c1a80c395..967eb68fe 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h @@ -92,9 +92,10 @@ public: void SetData(int nbinsx, double xmin, double xmax, int nbinsy,double ymin, double ymax,double *d,double zmin=0, double zmax=-1){ hist->SetData(nbinsx,xmin,xmax,nbinsy,ymin,ymax,d,zmin,zmax); - } + + double* GetDataPtr() {return hist->GetDataPtr();} int GetBinIndex(int bx,int by) {return hist->GetBinIndex(bx,by);} int FindBinIndex(double x,double y) {return hist->FindBinIndex(x,y);} diff --git a/slsDetectorGui/src/qCloneWidget.cpp b/slsDetectorGui/src/qCloneWidget.cpp index 707db9781..5d4f79692 100644 --- a/slsDetectorGui/src/qCloneWidget.cpp +++ b/slsDetectorGui/src/qCloneWidget.cpp @@ -190,6 +190,7 @@ void qCloneWidget::SetCloneHists(int nHists,int histNBins,double* histXAxis,doub void qCloneWidget::SetCloneHists2D(int nbinsx,double xmin,double xmax,int nbinsy, double ymin, double ymax, double *d){ cloneplot2D->GetPlot()->SetData(nbinsx,xmin,xmax,nbinsy,ymin,ymax,d); + cloneplot2D->UpdateNKeepSetRangeIfSet(); } @@ -226,6 +227,7 @@ void qCloneWidget::SetRange(bool IsXYRange[],double XYRangeValues[]){ }else{ cloneplot2D->GetPlot()->SetXMinMax(XYRangeValues[qDefs::XMINIMUM],XYRangeValues[qDefs::XMAXIMUM]); cloneplot2D->GetPlot()->SetYMinMax(XYRangeValues[qDefs::YMINIMUM],XYRangeValues[qDefs::YMAXIMUM]); + cloneplot2D->GetPlot()->Update(); } } diff --git a/slsDetectorGui/src/qTabPlot.cpp b/slsDetectorGui/src/qTabPlot.cpp index 6fa2c46f9..3e60667a0 100644 --- a/slsDetectorGui/src/qTabPlot.cpp +++ b/slsDetectorGui/src/qTabPlot.cpp @@ -1116,6 +1116,8 @@ void qTabPlot::Refresh(){ boxFrequency->setEnabled(true); connect(boxScan, SIGNAL(toggled(bool)), this, SLOT(EnableScanBox())); EnableScanBox(); + if(myDet->getDetectorsType() == slsDetectorDefs::EIGER) + comboFrequency->setCurrentIndex(1); SetFrequency(); }else{