diff layer/Colour3DPlotRenderer.cpp @ 1100:102f986ec032 spectrogram-minor-refactor

Create, but don't yet use, a renderer in the colour 3d plot layer
author Chris Cannam
date Wed, 13 Jul 2016 13:06:28 +0100
parents 5c6271734790
children d84a0033b305
line wrap: on
line diff
--- a/layer/Colour3DPlotRenderer.cpp	Wed Jul 13 10:00:21 2016 +0100
+++ b/layer/Colour3DPlotRenderer.cpp	Wed Jul 13 13:06:28 2016 +0100
@@ -215,7 +215,7 @@
 bool
 Colour3DPlotRenderer::useBinResolutionForDrawBuffer(LayerGeometryProvider *v) const
 {
-    DenseThreeDimensionalModel *model = m_sources.source;
+    const DenseThreeDimensionalModel *model = m_sources.source;
     if (!model) return false;
     int binResolution = model->getResolution();
     int zoomLevel = v->getZoomLevel();
@@ -234,7 +234,7 @@
     // buffer is at the same resolution as the target in the cache, so
     // no extra scaling needed.
 
-    DenseThreeDimensionalModel *model = m_sources.source;
+    const DenseThreeDimensionalModel *model = m_sources.source;
     if (!model || !model->isOK() || !model->isReady()) {
 	throw std::logic_error("no source model provided, or model not ready");
     }
@@ -324,7 +324,7 @@
     // buffer is at bin resolution, i.e. buffer x == source column
     // number. We use toolkit smooth scaling for interpolation.
 
-    DenseThreeDimensionalModel *model = m_sources.source;
+    const DenseThreeDimensionalModel *model = m_sources.source;
     if (!model || !model->isOK() || !model->isReady()) {
 	throw std::logic_error("no source model provided, or model not ready");
     }
@@ -465,7 +465,7 @@
     if (maxbin < 0) maxbin = minbin+1;
 
     int divisor = 1;
-    DenseThreeDimensionalModel *sourceModel = m_sources.source;
+    const DenseThreeDimensionalModel *sourceModel = m_sources.source;
     if (usePeaksCache) {
         divisor = m_sources.peaks->getColumnsPerPeak();
         sourceModel = m_sources.peaks;
@@ -610,7 +610,7 @@
     if (minbin < 0) minbin = 0;
     if (maxbin < 0) maxbin = minbin+1;
 
-    FFTModel *fft = m_sources.fft;
+    const FFTModel *fft = m_sources.fft;
 
     FFTModel::PeakSet peakfreqs;