diff --git a/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlot.cpp b/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlot.cpp index 654fc7058..0faea2f48 100644 --- a/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlot.cpp +++ b/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlot.cpp @@ -31,17 +31,7 @@ SlsQt2DPlot::SlsQt2DPlot(QWidget *parent) : QwtPlot(parent) { Update(); } -SlsQt2DPlot::~SlsQt2DPlot() { - if (d_spectrogram) { - d_spectrogram->detach(); - // delete d_spectrogram; - } - delete hist; - delete colorMapLinearScale; - delete colorMapLogScale; - delete zoomer; - delete panner; -} +SlsQt2DPlot::~SlsQt2DPlot() = default; void SlsQt2DPlot::SetTitle(QString title) { setTitle(title); } @@ -207,7 +197,10 @@ void SlsQt2DPlot::SetZMinMax(double zmin, double zmax) { } QwtLinearColorMap *SlsQt2DPlot::myColourMap(QVector colourStops) { - + std::cout << "Got: "; + for (int i = 0; i!=colourStops.size(); ++i) + std::cout << " " << colourStops[i]; + std::cout << '\n'; int ns = 5; double r[] = {0.00, 0.00, 0.87, 1.00, 0.51}; @@ -221,33 +214,24 @@ QwtLinearColorMap *SlsQt2DPlot::myColourMap(QVector colourStops) { for (int is = 0; is < ns - 1; is++) { c.setRgbF(r[is], g[is], b[is]); - copyMap->addColorStop(colourStops.value(is), c); + copyMap->addColorStop(colourStops[is], c); } return copyMap; } + QwtLinearColorMap *SlsQt2DPlot::myColourMap(int log) { - - int ns = 5; - - QVector cs1(0); - QVector lcs1(0); - - cs1.append(0.); - cs1.append(0.34); - cs1.append(0.61); - cs1.append(0.84); - cs1.append(1.); + QVector cs1{0.0, 0.34, 0.61 ,0.84, 1.0}; if (log) { - for (int is = 0; is < ns; is++) { - lcs1.append((pow(10, 2 * cs1.value(is)) - 1) / 99.0); - } + QVector lcs1(cs1.size()); + for (int i = 0; i < cs1.size(); ++i) + lcs1[i] = (pow(10, 2 * cs1[i]) - 1) / 99.0; return myColourMap(lcs1); } - return myColourMap(cs1); } + void SlsQt2DPlot::Update() { if (isLog) hist->SetMinimumToFirstGreaterThanZero();