comparison layer/SpectrogramLayer.cpp @ 1103:d84a0033b305 spectrogram-minor-refactor

Turn BinDisplay and BinScale into enum classes

     m_minFrequency(10),
     m_maxFrequency(8000),
     m_initialMaxFrequency(8000),
     m_colourScale(ColourScale::LogColourScale),
     m_colourMap(0),
-    m_binScale(Colour3DPlotRenderer::LinearBinScale),
-    m_binDisplay(Colour3DPlotRenderer::AllBins),
+    m_binScale(BinScale::Linear),
+    m_binDisplay(BinDisplay::AllBins),
     m_normalization(ColumnOp::NoNormalization),
     m_lastEmittedZoomStep(-1),
     m_synchronous(false),
     m_haveDetailedScale(false),
     m_exiting(false),

         m_initialMaxFrequency = 1500;
 	setMaxFrequency(1500);
         setMinFrequency(40);
 	setColourScale(ColourScale::LinearColourScale);
         setColourMap(ColourMapper::Sunset);
-        setBinScale(Colour3DPlotRenderer::LogBinScale);
+        setBinScale(BinScale::Log);
         colourConfigName = "spectrogram-melodic-colour";
         colourConfigDefault = int(ColourMapper::Sunset);
 //        setGain(20);
     } else if (config == MelodicPeaks) {
 	setWindowSize(4096);
 	setWindowHopLevel(5);
         m_initialMaxFrequency = 2000;
 	setMaxFrequency(2000);
 	setMinFrequency(40);
-	setBinScale(Colour3DPlotRenderer::LogBinScale);
+	setBinScale(BinScale::Log);
 	setColourScale(ColourScale::LinearColourScale);
-	setBinDisplay(Colour3DPlotRenderer::PeakFrequencies);
+	setBinDisplay(BinDisplay::PeakFrequencies);
         setNormalization(ColumnOp::NormalizeColumns);
         colourConfigName = "spectrogram-melodic-colour";
         colourConfigDefault = int(ColourMapper::Sunset);
     }
 

 
     } else if (name == "Frequency Scale") {
 
 	*min = 0;
 	*max = 1;
-        *deflt = int(Colour3DPlotRenderer::LinearBinScale);
+        *deflt = int(BinScale::Linear);
 	val = (int)m_binScale;
 
     } else if (name == "Bin Display") {
 
 	*min = 0;
 	*max = 2;
-        *deflt = int(Colour3DPlotRenderer::AllBins);
+        *deflt = int(BinDisplay::AllBins);
 	val = (int)m_binDisplay;
 
     } else if (name == "Normalization") {
 	
         *min = 0;

 	case 4: setColourScale(ColourScale::PhaseColourScale); break;
 	}
     } else if (name == "Frequency Scale") {
 	switch (value) {
 	default:
-	case 0: setBinScale(Colour3DPlotRenderer::LinearBinScale); break;
-	case 1: setBinScale(Colour3DPlotRenderer::LogBinScale); break;
+	case 0: setBinScale(BinScale::Linear); break;
+	case 1: setBinScale(BinScale::Log); break;
 	}
     } else if (name == "Bin Display") {
 	switch (value) {
 	default:
-	case 0: setBinDisplay(Colour3DPlotRenderer::AllBins); break;
-	case 1: setBinDisplay(Colour3DPlotRenderer::PeakBins); break;
-	case 2: setBinDisplay(Colour3DPlotRenderer::PeakFrequencies); break;
+	case 0: setBinDisplay(BinDisplay::AllBins); break;
+	case 1: setBinDisplay(BinDisplay::PeakBins); break;
+	case 2: setBinDisplay(BinDisplay::PeakFrequencies); break;
 	}
     } else if (name == "Normalization") {
         switch (value) {
         default:
         case 0: setNormalization(ColumnOp::NoNormalization); break;

 }
 
 int
 SpectrogramLayer::getFFTOversampling() const
 {
-    if (m_binDisplay != Colour3DPlotRenderer::AllBins) {
+    if (m_binDisplay != BinDisplay::AllBins) {
         return 1;
     }
 
     Preferences::SpectrogramSmoothing smoothing = 
         Preferences::getInstance()->getSpectrogramSmoothing();

 {
     return m_colourMap;
 }
 
 void
-SpectrogramLayer::setBinScale(Colour3DPlotRenderer::BinScale binScale)
+SpectrogramLayer::setBinScale(BinScale binScale)
 {
     if (m_binScale == binScale) return;
 
     invalidateImageCaches();
     m_binScale = binScale;
 
     emit layerParametersChanged();
 }
 
-Colour3DPlotRenderer::BinScale
+BinScale
 SpectrogramLayer::getBinScale() const
 {
     return m_binScale;
 }
 
 void
-SpectrogramLayer::setBinDisplay(Colour3DPlotRenderer::BinDisplay binDisplay)
+SpectrogramLayer::setBinDisplay(BinDisplay binDisplay)
 {
     if (m_binDisplay == binDisplay) return;
 
     invalidateImageCaches();
     m_binDisplay = binDisplay;
 
     emit layerParametersChanged();
 }
 
-Colour3DPlotRenderer::BinDisplay
+BinDisplay
 SpectrogramLayer::getBinDisplay() const
 {
     return m_binDisplay;
 }
 

 
     sv_samplerate_t sr = m_model->getSampleRate();
     double minf = getEffectiveMinFrequency();
     double maxf = getEffectiveMaxFrequency();
 
-    bool logarithmic = (m_binScale == Colour3DPlotRenderer::LogBinScale);
+    bool logarithmic = (m_binScale == BinScale::Log);
 
     q0 = v->getFrequencyForY(y, minf, maxf, logarithmic);
     q1 = v->getFrequencyForY(y - 1, minf, maxf, logarithmic);
 
     // Now map these on to ("proportions of") actual bins

 
     sv_samplerate_t sr = m_model->getSampleRate();
     double minf = getEffectiveMinFrequency();
     double maxf = getEffectiveMaxFrequency();
 
-    bool logarithmic = (m_binScale == Colour3DPlotRenderer::LogBinScale);
+    bool logarithmic = (m_binScale == BinScale::Log);
 
     double q = v->getFrequencyForY(y, minf, maxf, logarithmic);
 
     // Now map on to ("proportions of") actual bins
 

 
     sv_samplerate_t sr = m_model->getSampleRate();
 
     bool haveAdj = false;
 
-    bool peaksOnly = (m_binDisplay == Colour3DPlotRenderer::PeakBins ||
-		      m_binDisplay == Colour3DPlotRenderer::PeakFrequencies);
+    bool peaksOnly = (m_binDisplay == BinDisplay::PeakBins ||
+		      m_binDisplay == BinDisplay::PeakFrequencies);
 
     for (int q = q0i; q <= q1i; ++q) {
 
 	for (int s = s0i; s <= s1i; ++s) {
 

 
 //    cerr << "(giving actual minFreq " << minFreq << " and display minFreq " << displayMinFreq << ")" << endl;
 
     int increment = getWindowIncrement();
     
-    bool logarithmic = (m_binScale == Colour3DPlotRenderer::LogBinScale);
+    bool logarithmic = (m_binScale == BinScale::Log);
 
     MagnitudeRange overallMag = m_viewMags[v->getId()];
     bool overallMagChanged = false;
 
 #ifdef DEBUG_SPECTROGRAM_REPAINT

 
     } else {
 
         // neither limitation applies, so use a short soft limit
 
-        if (m_binDisplay == Colour3DPlotRenderer::PeakFrequencies) {
+        if (m_binDisplay == BinDisplay::PeakFrequencies) {
             softTimeLimit = 0.15;
         } else {
             softTimeLimit = 0.1;
         }
     }
 
-    if (m_binDisplay != Colour3DPlotRenderer::PeakFrequencies) {
+    if (m_binDisplay != BinDisplay::PeakFrequencies) {
 
         for (int y = 0; y < h; ++y) {
             double q0 = 0, q1 = 0;
             if (!getYBinRange(v, h-y-1, q0, q1)) {
                 binfory[y] = -1;

     DenseThreeDimensionalModel *peakCacheModel = 0;
     FFTModel *fftModel = 0;
     DenseThreeDimensionalModel *sourceModel = 0;
     
 #ifdef DEBUG_SPECTROGRAM_REPAINT
-    cerr << "SpectrogramLayer::paintDrawBuffer: Note: bin display = " << m_binDisplay << ", w = " << w << ", binforx[" << w-1 << "] = " << binforx[w-1] << ", binforx[0] = " << binforx[0] << endl;
+    cerr << "SpectrogramLayer::paintDrawBuffer: Note: bin display = " << int(m_binDisplay) << ", w = " << w << ", binforx[" << w-1 << "] = " << binforx[w-1] << ", binforx[0] = " << binforx[0] << endl;
 #endif
 
     int divisor = 1;
     if (usePeaksCache) {
         peakCacheModel = getPeakCache();

     bool interpolate = false;
     Preferences::SpectrogramSmoothing smoothing = 
         Preferences::getInstance()->getSpectrogramSmoothing();
     if (smoothing == Preferences::SpectrogramInterpolated ||
         smoothing == Preferences::SpectrogramZeroPaddedAndInterpolated) {
-        if (m_binDisplay != Colour3DPlotRenderer::PeakBins &&
-            m_binDisplay != Colour3DPlotRenderer::PeakFrequencies) {
+        if (m_binDisplay != BinDisplay::PeakBins &&
+            m_binDisplay != BinDisplay::PeakFrequencies) {
             interpolate = true;
         }
     }
 
     int psx = -1;

 
                 if (m_colourScale != ColourScale::PhaseColourScale) {
                     column = ColumnOp::normalize(column, m_normalization);
                 }
 
-                if (m_binDisplay == Colour3DPlotRenderer::PeakBins) {
+                if (m_binDisplay == BinDisplay::PeakBins) {
                     column = ColumnOp::peakPick(column);
                 }
 
                 preparedColumn =
                     ColumnOp::distribute(ColumnOp::applyGain(column, m_gain),

 SpectrogramLayer::getYForFrequency(const LayerGeometryProvider *v, double frequency) const
 {
     return v->getYForFrequency(frequency,
 			       getEffectiveMinFrequency(),
 			       getEffectiveMaxFrequency(),
-			       m_binScale == Colour3DPlotRenderer::LogBinScale);
+			       m_binScale == BinScale::Log);
 }
 
 double
 SpectrogramLayer::getFrequencyForY(const LayerGeometryProvider *v, int y) const
 {
     return v->getFrequencyForY(y,
 			       getEffectiveMinFrequency(),
 			       getEffectiveMaxFrequency(),
-			       m_binScale == Colour3DPlotRenderer::LogBinScale);
+			       m_binScale == BinScale::Log);
 }
 
 int
 SpectrogramLayer::getCompletion(LayerGeometryProvider *) const
 {

 
     sv_samplerate_t sr = m_model->getSampleRate();
     min = double(sr) / getFFTSize();
     max = double(sr) / 2;
     
-    logarithmic = (m_binScale == Colour3DPlotRenderer::LogBinScale);
+    logarithmic = (m_binScale == BinScale::Log);
     unit = "Hz";
     return true;
 }
 
 bool

 	haveValues = true;
     }
 
     QString adjFreqText = "", adjPitchText = "";
 
-    if (m_binDisplay == Colour3DPlotRenderer::PeakFrequencies) {
+    if (m_binDisplay == BinDisplay::PeakFrequencies) {
 
 	if (!getAdjustedYBinSourceRange(v, x, y, freqMin, freqMax,
 					adjFreqMin, adjFreqMax)) {
 	    return "";
 	}

 					  m_model->getSampleRate() / 2));
 
     int fw = paint.fontMetrics().width(tr("43Hz"));
     if (tw < fw) tw = fw;
 
-    int tickw = (m_binScale == Colour3DPlotRenderer::LogBinScale ? 10 : 4);
+    int tickw = (m_binScale == BinScale::Log ? 10 : 4);
     
     return cw + tickw + tw + 13;
 }
 
 void

 
     //!!! cache this?
 
     int h = rect.height(), w = rect.width();
 
-    int tickw = (m_binScale == Colour3DPlotRenderer::LogBinScale ? 10 : 4);
-    int pkw = (m_binScale == Colour3DPlotRenderer::LogBinScale ? 10 : 0);
+    int tickw = (m_binScale == BinScale::Log ? 10 : 4);
+    int pkw = (m_binScale == BinScale::Log ? 10 : 0);
 
     int bins = getFFTSize() / 2;
     sv_samplerate_t sr = m_model->getSampleRate();
 
     if (m_maxFrequency > 0) {

 	}
 
 	int freq = int((sr * bin) / getFFTSize());
 
 	if (py >= 0 && (vy - py) < textHeight - 1) {
-	    if (m_binScale == Colour3DPlotRenderer::LinearBinScale) {
+	    if (m_binScale == BinScale::Linear) {
 		paint.drawLine(w - tickw, h - vy, w, h - vy);
 	    }
 	    continue;
 	}
 

 	}
 
 	py = vy;
     }
 
-    if (m_binScale == Colour3DPlotRenderer::LogBinScale) {
+    if (m_binScale == BinScale::Log) {
 
         // piano keyboard
 
         PianoScale().paintPianoVertical
             (v, paint, QRect(w - pkw - 1, 0, pkw, h),

     SpectrogramRangeMapper mapper(sr, getFFTSize());
     double newdist = mapper.getValueForPosition(step);
 
     double newmin, newmax;
 
-    if (m_binScale == Colour3DPlotRenderer::LogBinScale) {
+    if (m_binScale == BinScale::Log) {
 
         // need to pick newmin and newmax such that
         //
         // (log(newmin) + log(newmax)) / 2 == logmid
         // and

 	.arg(m_minFrequency)
 	.arg(m_maxFrequency)
 	.arg(convertOutColourScale(m_colourScale))
 	.arg(m_colourMap)
 	.arg(m_colourRotation)
-	.arg(m_binScale)
-	.arg(m_binDisplay);
+	.arg(int(m_binScale))
+	.arg(int(m_binDisplay));
 
     // New-style normalization attributes, allowing for more types of
     // normalization in future: write out the column normalization
     // type separately, and then whether we are normalizing visible
     // area as well afterwards

     if (ok) setColourMap(colourMap);
 
     int colourRotation = attributes.value("colourRotation").toInt(&ok);
     if (ok) setColourRotation(colourRotation);
 
-    Colour3DPlotRenderer::BinScale binScale = (Colour3DPlotRenderer::BinScale)
+    BinScale binScale = (BinScale)
 	attributes.value("frequencyScale").toInt(&ok);
     if (ok) setBinScale(binScale);
 
-    Colour3DPlotRenderer::BinDisplay binDisplay = (Colour3DPlotRenderer::BinDisplay)
+    BinDisplay binDisplay = (BinDisplay)
 	attributes.value("binDisplay").toInt(&ok);
     if (ok) setBinDisplay(binDisplay);
 
     bool haveNewStyleNormalization = false;