comparison layer/SpectrogramLayer.cpp @ 1092:9b826dd23c84 spectrogram-minor-refactor

Colour scales (partly)

     m_colourRotation(0),
     m_initialRotation(0),
     m_minFrequency(10),
     m_maxFrequency(8000),
     m_initialMaxFrequency(8000),
-    m_colourScale(dBColourScale),
+    m_colourScale(ColourScale::LogColourScale),
     m_colourMap(0),
     m_frequencyScale(LinearFrequencyScale),
     m_binDisplay(AllBins),
     m_normalization(ColumnOp::NoNormalization),
     m_lastEmittedZoomStep(-1),

 	setWindowSize(8192);
 	setWindowHopLevel(4);
         m_initialMaxFrequency = 1500;
 	setMaxFrequency(1500);
         setMinFrequency(40);
-	setColourScale(LinearColourScale);
+	setColourScale(ColourScale::LinearColourScale);
         setColourMap(ColourMapper::Sunset);
         setFrequencyScale(LogFrequencyScale);
         colourConfigName = "spectrogram-melodic-colour";
         colourConfigDefault = int(ColourMapper::Sunset);
 //        setGain(20);

 	setWindowHopLevel(5);
         m_initialMaxFrequency = 2000;
 	setMaxFrequency(2000);
 	setMinFrequency(40);
 	setFrequencyScale(LogFrequencyScale);
-	setColourScale(LinearColourScale);
+	setColourScale(ColourScale::LinearColourScale);
 	setBinDisplay(PeakFrequencies);
         setNormalization(ColumnOp::NormalizeColumns);
         colourConfigName = "spectrogram-melodic-colour";
         colourConfigDefault = int(ColourMapper::Sunset);
     }

 
     } else if (name == "Colour Scale") {
 
 	*min = 0;
 	*max = 4;
-        *deflt = int(dBColourScale);
+        *deflt = 2;
 
 	val = (int)m_colourScale;
 
     } else if (name == "Colour") {
 

             m_lastEmittedZoomStep = vs;
         }
     } else if (name == "Colour Scale") {
 	switch (value) {
 	default:
-	case 0: setColourScale(LinearColourScale); break;
-	case 1: setColourScale(MeterColourScale); break;
-	case 2: setColourScale(dBSquaredColourScale); break;
-	case 3: setColourScale(dBColourScale); break;
-	case 4: setColourScale(PhaseColourScale); break;
+	case 0: setColourScale(ColourScale::LinearColourScale); break;
+	case 1: setColourScale(ColourScale::MeterColourScale); break;
+	case 2: setColourScale(ColourScale::LogColourScale); break; //!!! dB^2
+	case 3: setColourScale(ColourScale::LogColourScale); break;
+	case 4: setColourScale(ColourScale::PhaseColourScale); break;
 	}
     } else if (name == "Frequency Scale") {
 	switch (value) {
 	default:
 	case 0: setFrequencyScale(LinearFrequencyScale); break;

     
     emit layerParametersChanged();
 }
 
 void
-SpectrogramLayer::setColourScale(ColourScale colourScale)
+SpectrogramLayer::setColourScale(ColourScale::Scale colourScale)
 {
     if (m_colourScale == colourScale) return;
 
     invalidateImageCaches();
     
     m_colourScale = colourScale;
     
     emit layerParametersChanged();
 }
 
-SpectrogramLayer::ColourScale
+ColourScale::Scale
 SpectrogramLayer::getColourScale() const
 {
     return m_colourScale;
 }
 

 }
 
 unsigned char
 SpectrogramLayer::getDisplayValue(LayerGeometryProvider *v, double input) const
 {
-    int value;
+    int value = 0;
 
     double min = 0.0;
     double max = 1.0;
 
     if (m_normalization == ColumnOp::NormalizeVisibleArea) {
         min = m_viewMags[v->getId()].getMin();
         max = m_viewMags[v->getId()].getMax();
     } else if (m_normalization != ColumnOp::NormalizeColumns) {
-        if (m_colourScale == LinearColourScale //||
+        if (m_colourScale == ColourScale::LinearColourScale //||
 //            m_colourScale == MeterColourScale) {
             ) {
             max = 0.1;
         }
     }

     if (max == 0.0) max = 1.0;
     if (max == min) min = max - 0.0001;
 
     switch (m_colourScale) {
 	
-    default:
-    case LinearColourScale:
+    case ColourScale::LinearColourScale:
         value = int(((input - min) / (max - min)) * 255.0) + 1;
 	break;
 	
-    case MeterColourScale:
+    case ColourScale::MeterColourScale:
         value = AudioLevel::multiplier_to_preview
             ((input - min) / (max - min), 254) + 1;
 	break;
 
-    case dBSquaredColourScale:
+        //!!! check this
+/*    case dBSquaredColourScale:
         input = ((input - min) * (input - min)) / ((max - min) * (max - min));
         if (input > 0.0) {
             input = 10.0 * log10(input);
         } else {
             input = thresh;

 	input = (input - thresh) / (-thresh);
 	if (input < 0.0) input = 0.0;
 	if (input > 1.0) input = 1.0;
 	value = int(input * 255.0) + 1;
 	break;
-	
-    case dBColourScale:
+*/	
+    case ColourScale::LogColourScale:
         //!!! experiment with normalizing the visible area this way.
         //In any case, we need to have some indication of what the dB
         //scale is relative to.
         input = (input - min) / (max - min);
         if (input > 0.0) {

 	if (input < 0.0) input = 0.0;
 	if (input > 1.0) input = 1.0;
 	value = int(input * 255.0) + 1;
 	break;
 	
-    case PhaseColourScale:
+    case ColourScale::PhaseColourScale:
 	value = int((input * 127.0 / M_PI) + 128);
 	break;
+
+    case ColourScale::PlusMinusOneScale:
+    case ColourScale::AbsoluteScale:
+    default:
+        ;
     }
 
     if (value > UCHAR_MAX) value = UCHAR_MAX;
     if (value < 0) value = 0;
     return (unsigned char)value;

         sources.verticalBinLayer = this;
         sources.fft = getFFTModel();
         sources.source = sources.fft;
         sources.peaks = getPeakCache();
 
-        ::ColourScale::Parameters cparams;
-        //!!! todo 
+        ColourScale::Parameters cparams;
+        cparams.colourMap = m_colourMap;
+        cparams.scale = m_colourScale;
         
         Colour3DPlotRenderer::Parameters params;
-        params.colourScale = ::ColourScale(cparams);
+        params.colourScale = ColourScale(cparams);
         params.normalization = m_normalization;
         //!!! map properly:
         params.binDisplay = (Colour3DPlotRenderer::BinDisplay)(int)m_binDisplay;
         params.binScale = (Colour3DPlotRenderer::BinScale)(int)m_frequencyScale;
         //!!! and the rest

         }
         if (m_drawBuffer.width() < bufwid || m_drawBuffer.height() != h) {
             m_drawBuffer = QImage(bufwid, h, QImage::Format_Indexed8);
         }
         usePeaksCache = (increment * m_peakCacheDivisor) < zoomLevel;
-        if (m_colourScale == PhaseColourScale) usePeaksCache = false;
+        if (m_colourScale == ColourScale::PhaseColourScale) usePeaksCache = false;
     }
 
     for (int pixel = 0; pixel < 256; ++pixel) {
         m_drawBuffer.setColor((unsigned char)pixel,
                               m_palette.getColour((unsigned char)pixel).rgb());

                 column = getColumnFromFFTModel(fft,
                                                sx,
                                                minbin,
                                                maxbin - minbin + 1);
 
-                if (m_colourScale != PhaseColourScale) {
+                if (m_colourScale != ColourScale::PhaseColourScale) {
                     column = ColumnOp::fftScale(column, getFFTSize());
                 }
 
                 recordColumnExtents(column,
                                     sx,
                                     overallMag,
                                     overallMagChanged);
 
-                if (m_colourScale != PhaseColourScale) {
+                if (m_colourScale != ColourScale::PhaseColourScale) {
                     column = ColumnOp::normalize(column, m_normalization);
                 }
 
                 preparedColumn = ColumnOp::applyGain(column, m_gain);
                 

                                         int minbin,
                                         int bincount) const
 {
     vector<float> values(bincount, 0.f);
     
-    if (m_colourScale == PhaseColourScale) {
+    if (m_colourScale == ColourScale::PhaseColourScale) {
         fft->getPhasesAt(sx, values.data(), minbin, bincount);
     } else {
         fft->getMagnitudesAt(sx, values.data(), minbin, bincount);
     }
 

 SpectrogramLayer::getColumnFromGenericModel(DenseThreeDimensionalModel *model,
                                             int sx, // column number in model
                                             int minbin,
                                             int bincount) const
 {
-    if (m_colourScale == PhaseColourScale) {
+    if (m_colourScale == ColourScale::PhaseColourScale) {
         throw std::logic_error("can't use phase scale with generic 3d model");
     }
 
     auto col = model->getColumn(sx);
         

                                                    sx,
                                                    minbin,
                                                    maxbin - minbin + 1);
                 }
 
-                if (m_colourScale != PhaseColourScale) {
+                if (m_colourScale != ColourScale::PhaseColourScale) {
                     column = ColumnOp::fftScale(column, getFFTSize());
                 }
 
                 recordColumnExtents(column,
                                     sx,
                                     overallMag,
                                     overallMagChanged);
 
-                if (m_colourScale != PhaseColourScale) {
+                if (m_colourScale != ColourScale::PhaseColourScale) {
                     column = ColumnOp::normalize(column, m_normalization);
                 }
 
                 if (m_binDisplay == PeakBins) {
                     column = ColumnOp::peakPick(column);

     int toff = -textHeight + paint.fontMetrics().ascent() + 2;
 
     if (detailed && (h > textHeight * 3 + 10)) {
 
         int topLines = 2;
-        if (m_colourScale == PhaseColourScale) topLines = 1;
+        if (m_colourScale == ColourScale::PhaseColourScale) topLines = 1;
 
 	int ch = h - textHeight * (topLines + 1) - 8;
 //	paint.drawRect(4, textHeight + 4, cw - 1, ch + 1);
 	paint.drawRect(4 + cw - cbw, textHeight * topLines + 4, cbw - 1, ch + 1);
 

         if (dBmin < dBmax - 60.f) dBmin = dBmax - 60.f;
         bottom = QString("%1").arg(lrint(dBmin));
 
         //!!! & phase etc
 
-        if (m_colourScale != PhaseColourScale) {
+        if (m_colourScale != ColourScale::PhaseColourScale) {
             paint.drawText((cw + 6 - paint.fontMetrics().width("dBFS")) / 2,
                            2 + textHeight + toff, "dBFS");
         }
 
 //	paint.drawText((cw + 6 - paint.fontMetrics().width(top)) / 2,

     }
 //    SVDEBUG << "SpectrogramLayer::setMeasureRectYCoord: start " << r.startY << " <- " << y << ", end " << r.endY << " <- " << y << endl;
 
 }
 
+static ColourScale::Scale
+convertInColourScale(int fileScale)
+{
+    switch (fileScale) {
+    case 0: return ColourScale::LinearColourScale;
+    case 1: return ColourScale::MeterColourScale;
+    case 2: return ColourScale::LogColourScale; //!!!
+    case 3: return ColourScale::LogColourScale;
+    case 4: return ColourScale::PhaseColourScale;
+    default: return ColourScale::LinearColourScale;
+    }
+}
+
+static int
+convertOutColourScale(ColourScale::Scale scale)
+{
+    switch (scale) {
+    case ColourScale::LinearColourScale: return 0;
+    case ColourScale::MeterColourScale: return 1;
+    case ColourScale::LogColourScale: return 3; //!!!
+    case ColourScale::PhaseColourScale: return 4;
+    case ColourScale::PlusMinusOneScale:
+    case ColourScale::AbsoluteScale:
+    default: return 0;
+    }
+}
+
 void
 SpectrogramLayer::toXml(QTextStream &stream,
                         QString indent, QString extraAttributes) const
 {
     QString s;

 		 "colourRotation=\"%5\" "
 		 "frequencyScale=\"%6\" "
 		 "binDisplay=\"%7\" ")
 	.arg(m_minFrequency)
 	.arg(m_maxFrequency)
-	.arg(m_colourScale)
+	.arg(convertOutColourScale(m_colourScale))
 	.arg(m_colourMap)
 	.arg(m_colourRotation)
 	.arg(m_frequencyScale)
 	.arg(m_binDisplay);
 

     if (ok) {
         SVDEBUG << "SpectrogramLayer::setProperties: setting max freq to " << maxFrequency << endl;
         setMaxFrequency(maxFrequency);
     }
 
-    ColourScale colourScale = (ColourScale)
-	attributes.value("colourScale").toInt(&ok);
+    ColourScale::Scale colourScale = convertInColourScale
+        (attributes.value("colourScale").toInt(&ok));
     if (ok) setColourScale(colourScale);
 
     int colourMap = attributes.value("colourScheme").toInt(&ok);
     if (ok) setColourMap(colourMap);