From 53749c3b77372dcf062ac1f54c42d83a6241dd99 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Tue, 10 Mar 2020 16:09:59 +0100 Subject: [PATCH] clean --- slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h | 3 --- slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlot.cpp | 4 +--- slsDetectorGui/src/qCloneWidget.cpp | 3 --- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h index 0980b84ed..25342f8a7 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h @@ -80,9 +80,6 @@ class SlsQt2DPlot : public QwtPlot { SlsQt2DZoomer *zoomer{nullptr}; QwtPlotPanner *panner{nullptr}; QwtScaleWidget *rightAxis{nullptr}; - - QwtLinearColorMap *colorMapLinearScale{nullptr}; - QwtLinearColorMap *colorMapLogScale{nullptr}; QList contourLevelsLinear; QList contourLevelsLog; bool disableZoom{false}; diff --git a/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlot.cpp b/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlot.cpp index daa1e156b..3e3e7a3e9 100644 --- a/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlot.cpp +++ b/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlot.cpp @@ -73,9 +73,7 @@ void SlsQt2DPlot::SetZFont(const QFont &f) { } void SlsQt2DPlot::SetupColorMap() { - colorMapLinearScale = myColourMap(0); - d_spectrogram->setColorMap(colorMapLinearScale); - colorMapLogScale = myColourMap(1); + d_spectrogram->setColorMap(myColourMap(0)); for (double level = 0.5; level < 10.0; level += 1.0) (contourLevelsLinear) += level; d_spectrogram->setContourLevels(contourLevelsLinear); diff --git a/slsDetectorGui/src/qCloneWidget.cpp b/slsDetectorGui/src/qCloneWidget.cpp index c83c8f68a..31ee53372 100644 --- a/slsDetectorGui/src/qCloneWidget.cpp +++ b/slsDetectorGui/src/qCloneWidget.cpp @@ -27,11 +27,8 @@ qCloneWidget::qCloneWidget(QWidget *parent, SlsQt1DPlot *p1, SlsQt2DPlot *p2, qCloneWidget::~qCloneWidget() { delete plot1d; - delete plot2d; - delete gainplot1d; - delete gainplot2d; }