comparison view/Overview.cpp @ 211:e2baee498ec8

* Rejig handling of scrolling views.  Ensures, among other things, that playing
  when there is a scroll mode view present (e.g. a spectrum) does not drag
  any page mode views into scroll mode with it.

     m_clickedInRange(false)
 {
     setObjectName(tr("Overview"));
     m_followPan = false;
     m_followZoom = false;
+    setPlaybackFollow(PlaybackIgnore);
 }
 
 void
 Overview::modelChanged(size_t startFrame, size_t endFrame)
 {

 {
     View::modelReplaced();
 }
 
 void
-Overview::registerView(View *widget)
-{
-    m_widgets.insert(widget);
+Overview::registerView(View *view)
+{
+    m_views.insert(view);
     update(); 
 }
 
 void
-Overview::unregisterView(View *widget)
-{
-    m_widgets.erase(widget);
+Overview::unregisterView(View *view)
+{
+    m_views.erase(view);
     update();
 }
 
 void
-Overview::viewManagerCentreFrameChanged(void *p, unsigned long f, bool)
-{
-//    std::cerr << "Overview[" << this << "]::viewManagerCentreFrameChanged(" 
-//	      << p << ", " << f << ")" << std::endl;
-
+Overview::globalCentreFrameChanged(unsigned long f)
+{
+    update();
+}
+
+void
+Overview::viewCentreFrameChanged(View *v, unsigned long f)
+{
+    if (m_views.find(v) != m_views.end()) {
+	update();
+    }
+}    
+
+void
+Overview::viewManagerZoomLevelChanged(void *p, unsigned long z, bool)
+{
     if (p == this) return;
-    if (m_widgets.find(p) != m_widgets.end()) {
-	update();
-    }
-}
-
-void
-Overview::viewManagerZoomLevelChanged(void *p, unsigned long z, bool)
-{
-    if (p == this) return;
-    if (m_widgets.find(p) != m_widgets.end()) {
+    View *v = (View *)p;
+    if (m_views.find(v) != m_views.end()) {
 	update();
     }
 }
 
 void

     if (centreFrame > (startFrame + getModelsEndFrame())/2) {
 	centreFrame = (startFrame + getModelsEndFrame())/2;
     }
     if (centreFrame != m_centreFrame) {
 	m_centreFrame = centreFrame;
-	emit centreFrameChanged(this, m_centreFrame, false);
+	emit centreFrameChanged(m_centreFrame, false, PlaybackIgnore);
     }
 
     View::paintEvent(e);
 
     QPainter paint;

     int y = 0;
 
     int prevx0 = -10;
     int prevx1 = -10;
 
-    for (WidgetSet::iterator i = m_widgets.begin(); i != m_widgets.end(); ++i) {
+    for (ViewSet::iterator i = m_views.begin(); i != m_views.end(); ++i) {
 	if (!*i) continue;
 
 	View *w = (View *)*i;
 
 	long f0 = w->getFrameForX(0);

 
 void
 Overview::mousePressEvent(QMouseEvent *e)
 {
     m_clickPos = e->pos();
-    for (WidgetSet::iterator i = m_widgets.begin(); i != m_widgets.end(); ++i) {
+    for (ViewSet::iterator i = m_views.begin(); i != m_views.end(); ++i) {
 	if (*i) {
 	    m_clickedInRange = true;
 	    m_dragCentreFrame = ((View *)*i)->getCentreFrame();
 	    break;
 	}

 	if (newCentreFrame > 0) --newCentreFrame;
     }
     
     if (std::max(m_centreFrame, newCentreFrame) -
 	std::min(m_centreFrame, newCentreFrame) > size_t(m_zoomLevel)) {
-	emit centreFrameChanged(this, newCentreFrame, true);
+	emit centreFrameChanged(newCentreFrame, true, PlaybackIgnore);
     }
 }
 
 void
 Overview::mouseDoubleClickEvent(QMouseEvent *e)
 {
     long frame = getFrameForX(e->x());
-    emit centreFrameChanged(this, frame, true);
+    emit centreFrameChanged(frame, true, PlaybackIgnore);
 }
 
 void
 Overview::enterEvent(QEvent *)
 {