comparison base/View.cpp @ 1:a23739e2338a

* Debug
* Update copyrights to 2006

 /* -*- c-basic-offset: 4 -*-  vi:set ts=8 sts=4 sw=4: */
 
 /*
     A waveform viewer and audio annotation editor.
-    Chris Cannam, Queen Mary University of London, 2005
+    Chris Cannam, Queen Mary University of London, 2005-2006
     
     This is experimental software.  Not for distribution.
 */
 
 #include "base/View.h"

 View::modelChanged()
 {
     QObject *obj = sender();
 
 #ifdef DEBUG_VIEW_WIDGET_PAINT
-    std::cerr << "View::modelChanged()" << std::endl;
+    std::cerr << "View(" << this << ")::modelChanged()" << std::endl;
 #endif
     delete m_cache;
     m_cache = 0;
 
     checkProgress(obj);

 void
 View::modelChanged(size_t startFrame, size_t endFrame)
 {
     QObject *obj = sender();
 
-#ifdef DEBUG_VIEW_WIDGET_PAINT
-    std::cerr << "View::modelChanged(" << startFrame << "," << endFrame << ")" << std::endl;
-#endif
-
     long myStartFrame = getStartFrame();
     size_t myEndFrame = getEndFrame();
+
+#ifdef DEBUG_VIEW_WIDGET_PAINT
+    std::cerr << "View(" << this << ")::modelChanged(" << startFrame << "," << endFrame << ") [me " << myStartFrame << "," << myEndFrame << "]" << std::endl;
+#endif
 
     if (myStartFrame > 0 && endFrame < size_t(myStartFrame)) {
 	checkProgress(obj);
 	return;
     }

 
 void
 View::modelReplaced()
 {
 #ifdef DEBUG_VIEW_WIDGET_PAINT
-    std::cerr << "View::modelReplaced()" << std::endl;
-#endif
+    std::cerr << "View(" << this << ")::modelReplaced()" << std::endl;
+#endif
+    delete m_cache;
+    m_cache = 0;
+
     m_newModel = true;
     update();
 }
 
 void