detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-22 22:40:02 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer

Browse Source
This commit is contained in:
maliakal_d 2020-03-10 16:25:15 +01:00
commit 9467b4c610
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h
View File

@ -80,9 +80,6 @@ class SlsQt2DPlot : public QwtPlot {
SlsQt2DZoomer *zoomer{nullptr};
QwtPlotPanner *panner{nullptr};
QwtScaleWidget *rightAxis{nullptr};
QwtLinearColorMap *colorMapLinearScale{nullptr};
QwtLinearColorMap *colorMapLogScale{nullptr};
QList<double> contourLevelsLinear;
QList<double> contourLevelsLog;
bool disableZoom{false};

4
slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlot.cpp
View File

@ -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);

3
slsDetectorGui/src/qCloneWidget.cpp
View File

@ -27,11 +27,8 @@ qCloneWidget::qCloneWidget(QWidget *parent, SlsQt1DPlot *p1, SlsQt2DPlot *p2,
qCloneWidget::~qCloneWidget() {
delete plot1d;
delete plot2d;
delete gainplot1d;
delete gainplot2d;
}