comparison layer/SpectrogramLayer.cpp @ 1099:5c6271734790 spectrogram-minor-refactor

Switch in "standard" colour scale, bin scale, normalisation -- not quite handled elegantly or correctly yet
author Chris Cannam
date Wed, 13 Jul 2016 10:00:21 +0100
parents d9f1d2756b59
children 1364cbf4453d
comparison
equal deleted inserted replaced
1098:d9f1d2756b59 1099:5c6271734790
269 269
270 val = m_colourRotation; 270 val = m_colourRotation;
271 271
272 } else if (name == "Colour Scale") { 272 } else if (name == "Colour Scale") {
273 273
274 // linear, meter, db^2, db, phase
274 *min = 0; 275 *min = 0;
275 *max = 4; 276 *max = 4;
276 *deflt = 2; 277 *deflt = 2;
277 278
278 val = (int)m_colourScale; 279 val = (int)m_colourScale;
3567 setNormalization(ColumnOp::NormalizeHybrid); 3568 setNormalization(ColumnOp::NormalizeHybrid);
3568 } 3569 }
3569 } 3570 }
3570 3571
3571 bool normalizeVisibleArea = 3572 bool normalizeVisibleArea =
3572 (attributes.value("normalizeVisibleArea").trimmed() == "true"); 3573 (attributes.value("normalizeVisibleArea").trimmed() == "true");
3573 if (normalizeVisibleArea) { 3574 if (normalizeVisibleArea) {
3574 setNormalization(ColumnOp::NormalizeVisibleArea); 3575 setNormalization(ColumnOp::NormalizeVisibleArea);
3575 } 3576 }
3576 3577
3577 if (!haveNewStyleNormalization && m_normalization == ColumnOp::NormalizeHybrid) { 3578 if (!haveNewStyleNormalization && m_normalization == ColumnOp::NormalizeHybrid) {