Mercurial > hg > svgui

diff widgets/ColourMapComboBox.cpp @ 1374:631897ba9fca zoom

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Tue, 06 Nov 2018 08:59:03 +0000
parents d79e21855aef
children
line wrap: on
line diff
--- a/widgets/ColourMapComboBox.cpp	Fri Oct 05 10:25:52 2018 +0100
+++ b/widgets/ColourMapComboBox.cpp	Tue Nov 06 08:59:03 2018 +0000
@@ -58,9 +58,9 @@
     if (size < 12) size = 12;
 
     for (int i = 0; i < ColourMapper::getColourMapCount(); ++i) {
-        QString name = ColourMapper::getColourMapName(i);
+        QString name = ColourMapper::getColourMapLabel(i);
         if (m_includeSwatches) {
-            ColourMapper mapper(i, 0.0, 1.0);
+            ColourMapper mapper(i, false, 0.0, 1.0);
             addItem(mapper.getExamplePixmap(QSize(size * 2, size)), name);
         } else {
             addItem(name);