changeset 1102:36a981a0fa31 spectrogram-minor-refactor

Delete renderers
author Chris Cannam
date Wed, 13 Jul 2016 13:44:11 +0100
parents 1364cbf4453d
children d84a0033b305
files layer/Colour3DPlotLayer.cpp layer/SpectrogramLayer.cpp
diffstat 2 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/layer/Colour3DPlotLayer.cpp	Wed Jul 13 13:30:39 2016 +0100
+++ b/layer/Colour3DPlotLayer.cpp	Wed Jul 13 13:44:11 2016 +0100
@@ -79,6 +79,8 @@
     delete m_cache;
     delete m_peaksCache; //!!! this one is to go...
     delete m_peakCache;
+
+    cacheInvalid(); //!!! dup with above?
 }
 
 void
@@ -130,6 +132,13 @@
     m_peaksCache = 0;
     m_cacheValidStart = 0;
     m_cacheValidEnd = 0;
+
+    //!!!
+    for (ViewRendererMap::iterator i = m_renderers.begin();
+         i != m_renderers.end(); ++i) {
+        delete i->second;
+    }
+    m_renderers.clear();
 }
 
 void
--- a/layer/SpectrogramLayer.cpp	Wed Jul 13 13:30:39 2016 +0100
+++ b/layer/SpectrogramLayer.cpp	Wed Jul 13 13:44:11 2016 +0100
@@ -132,6 +132,7 @@
 
 SpectrogramLayer::~SpectrogramLayer()
 {
+    invalidateImageCaches();
     invalidateFFTModel();
 }