comparison layer/SpectrumLayer.cpp @ 350:3a55cd576334

* Further model lifecycle fixes

     std::cerr << "SpectrumLayer::setModel(" << model << ") from " << m_originModel << std::endl;
     
     if (m_originModel == model) return;
 
     m_originModel = model;
+
+    if (m_sliceableModel) {
+        Model *m = const_cast<Model *>
+            (static_cast<const Model *>(m_sliceableModel));
+        m->aboutToDelete();
+        setSliceableModel(0);
+        delete m;
+    }
 
     m_newFFTNeeded = true;
 
     emit layerParametersChanged();
 }

 void
 SpectrumLayer::paint(View *v, QPainter &paint, QRect rect) const
 {
     if (!m_originModel || !m_originModel->isOK() ||
         !m_originModel->isReady()) {
-        std::cerr << "SpectrumLayer::paint: no origin model" << std::endl;
+        std::cerr << "SpectrumLayer::paint: no origin model, or origin model not OK or not ready" << std::endl;
         return;
     }
 
     if (m_newFFTNeeded) {
         std::cerr << "SpectrumLayer::paint: new FFT needed, calling setupFFT" << std::endl;