comparison base/View.cpp @ 22:a1a6acb7cd37

* Some fixes to waveform layer greyscaling
* Tidying in panner class

 
 View::View(QWidget *w, bool showProgress) :
     QFrame(w),
     m_centreFrame(0),
     m_zoomLevel(1024),
-    m_newModel(true),
     m_followPan(true),
     m_followZoom(true),
     m_followPlay(PlaybackScrollPage),
     m_lightBackground(true),
     m_showProgress(showProgress),

 
 long
 View::getFrameForX(int x) const
 {
     return (long(x) * long(m_zoomLevel)) + getStartFrame();
+}
+
+int
+View::getZoomLevel() const
+{
+    return m_zoomLevel;
 }
 
 void
 View::setZoomLevel(size_t z)
 {

     connect(layer, SIGNAL(modelChanged(size_t, size_t)),
 	    this,    SLOT(modelChanged(size_t, size_t)));
     connect(layer, SIGNAL(modelReplaced()),
 	    this,    SLOT(modelReplaced()));
 
-    m_newModel = true;
     update();
 
     emit propertyContainerAdded(layer);
 }
 

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

 		ph -= i->second->height();
 	    }
 	}
     }
 }
-/*!!!
-void
-View::identifyLocalFeatures(bool on, int x, int y)
-{
-    for (LayerList::const_iterator i = m_layers.end(); i != m_layers.begin(); ) {
-	--i;
-#ifdef DEBUG_VIEW_WIDGET_PAINT
-	std::cerr << "View::identifyLocalFeatures: calling on " << *i << std::endl;
-#endif
-	if ((*i)->identifyLocalFeatures(on, x, y)) break;
-    }
-}
-*/
 
 void
 View::paintEvent(QPaintEvent *e)
 {
 //    Profiler prof("View::paintEvent", true);
 //    std::cerr << "View::paintEvent" << std::endl;
 
     if (m_layers.empty()) {
 	QFrame::paintEvent(e);
 	return;
-    }
-
-    if (m_newModel) {
-	m_newModel = false;
     }
 
     // ensure our constraints are met
     m_zoomLevel = getZoomConstraintBlockSize(m_zoomLevel,
 					     ZoomConstraint::RoundUp);