comparison layer/SpectrumLayer.cpp @ 275:bbe57afe9d7d

* avoid trying to calculate fft from incomplete decoded audio file in spectrum

     m_originModel(0),
     m_channel(-1),
     m_channelSet(false),
     m_windowSize(1024),
     m_windowType(HanningWindow),
-    m_windowHopLevel(2)
+    m_windowHopLevel(2),
+    m_newFFTNeeded(true)
 {
     Preferences *prefs = Preferences::getInstance();
     connect(prefs, SIGNAL(propertyChanged(PropertyContainer::PropertyName)),
             this, SLOT(preferenceChanged(PropertyContainer::PropertyName)));
     setWindowType(prefs->getWindowType());

 void
 SpectrumLayer::setModel(DenseTimeValueModel *model)
 {
     if (m_originModel == model) return;
     m_originModel = model;
-    setupFFT();
+//!!!    setupFFT();
 }
 
 void
 SpectrumLayer::setupFFT()
 {

         return;
     }
 
     m_channel = channel;
 
-    if (!fft) setupFFT();
+//!!!    if (!fft) setupFFT();
 
     emit layerParametersChanged();
 }
 
 Layer::PropertyList

 void
 SpectrumLayer::setWindowSize(size_t ws)
 {
     if (m_windowSize == ws) return;
     m_windowSize = ws;
-    setupFFT();
+//!!!    setupFFT();
+    m_newFFTNeeded = true;
     emit layerParametersChanged();
 }
 
 void
 SpectrumLayer::setWindowHopLevel(size_t v)
 {
     if (m_windowHopLevel == v) return;
     m_windowHopLevel = v;
-    setupFFT();
+//!!!    setupFFT();
+    m_newFFTNeeded = true;
     emit layerParametersChanged();
 }
 
 void
 SpectrumLayer::setWindowType(WindowType w)
 {
     if (m_windowType == w) return;
     m_windowType = w;
-    setupFFT();
+//!!!    setupFFT();
+    m_newFFTNeeded = true;
     emit layerParametersChanged();
 }
 
 void
 SpectrumLayer::preferenceChanged(PropertyContainer::PropertyName name)

     
     return description;
 }
 
 void
+SpectrumLayer::paint(View *v, QPainter &paint, QRect rect) const
+{
+    if (!m_originModel || !m_originModel->isOK() ||
+        !m_originModel->isReady()) return;
+
+    if (m_newFFTNeeded) {
+        const_cast<SpectrumLayer *>(this)->setupFFT(); //ugh
+        m_newFFTNeeded = false;
+    }
+    
+    SliceLayer::paint(v, paint, rect);
+}
+
+void
 SpectrumLayer::getBiasCurve(BiasCurve &curve) const
 {
     curve = m_biasCurve;
 }