Mercurial > hg > svgui
diff layer/ColourMapper.cpp @ 1071:65b183494331 spectrogram-minor-refactor
Start stubbing Colour3DPlotRenderer
author | Chris Cannam |
---|---|
date | Thu, 23 Jun 2016 17:07:21 +0100 |
parents | 9c890b7dfa83 |
children | 73d43e410a6b |
line wrap: on
line diff
--- a/layer/ColourMapper.cpp Thu Jun 23 14:51:10 2016 +0100 +++ b/layer/ColourMapper.cpp Thu Jun 23 17:07:21 2016 +0100 @@ -60,7 +60,6 @@ } ColourMapper::ColourMapper(int map, double min, double max) : - QObject(), m_map(map), m_min(min), m_max(max) @@ -85,25 +84,25 @@ QString ColourMapper::getColourMapName(int n) { - if (n >= getColourMapCount()) return tr("<unknown>"); + if (n >= getColourMapCount()) return QObject::tr("<unknown>"); StandardMap map = (StandardMap)n; switch (map) { - case Green: return tr("Green"); - case WhiteOnBlack: return tr("White on Black"); - case BlackOnWhite: return tr("Black on White"); - case Cherry: return tr("Cherry"); - case Wasp: return tr("Wasp"); - case Ice: return tr("Ice"); - case Sunset: return tr("Sunset"); - case FruitSalad: return tr("Fruit Salad"); - case Banded: return tr("Banded"); - case Highlight: return tr("Highlight"); - case Printer: return tr("Printer"); - case HighGain: return tr("High Gain"); + case Green: return QObject::tr("Green"); + case WhiteOnBlack: return QObject::tr("White on Black"); + case BlackOnWhite: return QObject::tr("Black on White"); + case Cherry: return QObject::tr("Cherry"); + case Wasp: return QObject::tr("Wasp"); + case Ice: return QObject::tr("Ice"); + case Sunset: return QObject::tr("Sunset"); + case FruitSalad: return QObject::tr("Fruit Salad"); + case Banded: return QObject::tr("Banded"); + case Highlight: return QObject::tr("Highlight"); + case Printer: return QObject::tr("Printer"); + case HighGain: return QObject::tr("High Gain"); } - return tr("<unknown>"); + return QObject::tr("<unknown>"); } QColor