Mercurial > hg > sonic-visualiser
comparison main/PreferencesDialog.cpp @ 1445:8e4e598a8c25 3.0-integration
Add swatches to colour map combo (optionally, as it turns out they are quite visually distracting)
author | Chris Cannam |
---|---|
date | Fri, 16 Dec 2016 15:55:59 +0000 |
parents | a9c30afdbbfe |
children | 11484141d969 |
comparison
equal
deleted
inserted
replaced
1444:90189d1383e3 | 1445:8e4e598a8c25 |
---|---|
36 | 36 |
37 #include <set> | 37 #include <set> |
38 | 38 |
39 #include "widgets/WindowTypeSelector.h" | 39 #include "widgets/WindowTypeSelector.h" |
40 #include "widgets/IconLoader.h" | 40 #include "widgets/IconLoader.h" |
41 #include "widgets/ColourMapComboBox.h" | |
41 #include "base/Preferences.h" | 42 #include "base/Preferences.h" |
42 #include "base/ResourceFinder.h" | 43 #include "base/ResourceFinder.h" |
43 #include "layer/ColourMapper.h" | 44 #include "layer/ColourMapper.h" |
44 | 45 |
45 #include "bqaudioio/AudioFactory.h" | 46 #include "bqaudioio/AudioFactory.h" |
143 m_spectrogramMColour = (settings.value("spectrogram-melodic-colour", | 144 m_spectrogramMColour = (settings.value("spectrogram-melodic-colour", |
144 int(ColourMapper::Sunset)).toInt()); | 145 int(ColourMapper::Sunset)).toInt()); |
145 m_colour3DColour = (settings.value("colour-3d-plot-colour", | 146 m_colour3DColour = (settings.value("colour-3d-plot-colour", |
146 int(ColourMapper::Green)).toInt()); | 147 int(ColourMapper::Green)).toInt()); |
147 settings.endGroup(); | 148 settings.endGroup(); |
148 QComboBox *spectrogramGColour = new QComboBox; | 149 |
149 QComboBox *spectrogramMColour = new QComboBox; | 150 ColourMapComboBox *spectrogramGColour = new ColourMapComboBox(true); |
150 QComboBox *colour3DColour = new QComboBox; | 151 spectrogramGColour->setCurrentIndex(m_spectrogramGColour); |
151 for (i = 0; i < ColourMapper::getColourMapCount(); ++i) { | 152 |
152 spectrogramGColour->addItem(ColourMapper::getColourMapName(i)); | 153 ColourMapComboBox *spectrogramMColour = new ColourMapComboBox(true); |
153 spectrogramMColour->addItem(ColourMapper::getColourMapName(i)); | 154 spectrogramMColour->setCurrentIndex(m_spectrogramMColour); |
154 colour3DColour->addItem(ColourMapper::getColourMapName(i)); | 155 |
155 if (i == m_spectrogramGColour) spectrogramGColour->setCurrentIndex(i); | 156 ColourMapComboBox *colour3DColour = new ColourMapComboBox(true); |
156 if (i == m_spectrogramMColour) spectrogramMColour->setCurrentIndex(i); | 157 colour3DColour->setCurrentIndex(m_colour3DColour); |
157 if (i == m_colour3DColour) colour3DColour->setCurrentIndex(i); | 158 |
158 } | 159 connect(spectrogramGColour, SIGNAL(colourMapChanged(int)), |
159 connect(spectrogramGColour, SIGNAL(currentIndexChanged(int)), | |
160 this, SLOT(spectrogramGColourChanged(int))); | 160 this, SLOT(spectrogramGColourChanged(int))); |
161 connect(spectrogramMColour, SIGNAL(currentIndexChanged(int)), | 161 connect(spectrogramMColour, SIGNAL(colourMapChanged(int)), |
162 this, SLOT(spectrogramMColourChanged(int))); | 162 this, SLOT(spectrogramMColourChanged(int))); |
163 connect(colour3DColour, SIGNAL(currentIndexChanged(int)), | 163 connect(colour3DColour, SIGNAL(colourMapChanged(int)), |
164 this, SLOT(colour3DColourChanged(int))); | 164 this, SLOT(colour3DColourChanged(int))); |
165 | 165 |
166 m_tuningFrequency = prefs->getTuningFrequency(); | 166 m_tuningFrequency = prefs->getTuningFrequency(); |
167 | 167 |
168 QDoubleSpinBox *frequency = new QDoubleSpinBox; | 168 QDoubleSpinBox *frequency = new QDoubleSpinBox; |