comparison view/View.cpp @ 320:984c1975f1ff

* Some tidying up to handling of alignment; add alignment status label to
  pane; ensure alignment when dragging with mouse as well as when playing

 	    update();
 
 	    changeVisible = true;
 	}
 
-	if (e) emit centreFrameChanged(f, m_followPan, m_followPlay);
+	if (e) emit centreFrameChanged(alignFromReference(f),
+                                       m_followPan, m_followPlay);
     }
 
     return changeVisible;
 }
 

 	    this,    SLOT(layerNameChanged()));
     connect(layer, SIGNAL(modelChanged()),
 	    this,    SLOT(modelChanged()));
     connect(layer, SIGNAL(modelCompletionChanged()),
 	    this,    SLOT(modelCompletionChanged()));
+    connect(layer, SIGNAL(modelAlignmentCompletionChanged()),
+	    this,    SLOT(modelAlignmentCompletionChanged()));
     connect(layer, SIGNAL(modelChanged(size_t, size_t)),
 	    this,    SLOT(modelChanged(size_t, size_t)));
     connect(layer, SIGNAL(modelReplaced()),
 	    this,    SLOT(modelReplaced()));
 

                this,    SLOT(layerNameChanged()));
     disconnect(layer, SIGNAL(modelChanged()),
                this,    SLOT(modelChanged()));
     disconnect(layer, SIGNAL(modelCompletionChanged()),
                this,    SLOT(modelCompletionChanged()));
+    disconnect(layer, SIGNAL(modelAlignmentCompletionChanged()),
+               this,    SLOT(modelAlignmentCompletionChanged()));
     disconnect(layer, SIGNAL(modelChanged(size_t, size_t)),
                this,    SLOT(modelChanged(size_t, size_t)));
     disconnect(layer, SIGNAL(modelReplaced()),
                this,    SLOT(modelReplaced()));
 

     QObject *obj = sender();
     checkProgress(obj);
 }
 
 void
+View::modelAlignmentCompletionChanged()
+{
+    std::cerr << "View(" << this << ")::modelAlignmentCompletionChanged()" << std::endl;
+
+    QObject *obj = sender();
+    checkProgress(obj);
+}
+
+void
 View::modelReplaced()
 {
 #ifdef DEBUG_VIEW_WIDGET_PAINT
     std::cerr << "View(" << this << ")::modelReplaced()" << std::endl;
 #endif

 
 void
 View::globalCentreFrameChanged(unsigned long f)
 {
     if (m_followPan) {
-        setCentreFrame(f, false);
+        setCentreFrame(alignToReference(f), false);
     }
 }
 
 void
 View::viewCentreFrameChanged(View *, unsigned long )

     }
 
     return models;
 }
 
+Model *
+View::getAligningModel() const
+{
+    if (!m_manager ||
+        !m_manager->getAlignMode() ||
+        !m_manager->getPlaybackModel()) {
+        return 0;
+    }
+
+    Model *anyModel = 0;
+    Model *goodModel = 0;
+
+    for (LayerList::const_iterator i = m_layers.begin();
+         i != m_layers.end(); ++i) {
+
+        Layer *layer = *i;
+
+        if (!layer) continue;
+        if (dynamic_cast<TimeRulerLayer *>(layer)) continue;
+
+        Model *model = (*i)->getModel();
+        if (!model) continue;
+
+        if (model->getAlignmentReference()) {
+            anyModel = model;
+            if (layer->isLayerOpaque() ||
+                dynamic_cast<RangeSummarisableTimeValueModel *>(model)) {
+                goodModel = model;
+            }
+        }
+    }
+
+    if (goodModel) return goodModel;
+    else return anyModel;
+}
+
+size_t
+View::alignFromReference(size_t f) const
+{
+    Model *aligningModel = getAligningModel();
+    if (!aligningModel) return f;
+    return aligningModel->alignFromReference(f);
+}
+
+size_t
+View::alignToReference(size_t f) const
+{
+    Model *aligningModel = getAligningModel();
+    if (!aligningModel) return f;
+    return aligningModel->alignToReference(f);
+}
+
 int
 View::getAlignedPlaybackFrame() const
 {
-    if (!m_manager) return 0;
-    if (!m_manager->getAlignMode() ||
-        !m_manager->getPlaybackModel()) {
-        return m_manager->getPlaybackFrame();
-    }
-
-    RangeSummarisableTimeValueModel *waveformModel = 0;
-    for (LayerList::const_iterator i = m_layers.begin(); i != m_layers.end(); ++i) {
-
-        if (!*i) continue;
-        if (dynamic_cast<TimeRulerLayer *>(*i)) continue;
-
-        Model *model = (*i)->getModel();
-        if (!model) continue;
-
-        waveformModel = dynamic_cast<RangeSummarisableTimeValueModel *>(model);
-        if (!waveformModel) {
-            waveformModel = dynamic_cast<RangeSummarisableTimeValueModel *>
-                (model->getSourceModel());
-        }
-
-        if (waveformModel) break;
-    }
+    Model *aligningModel = getAligningModel();
 
     int pf = m_manager->getPlaybackFrame();
 
-    if (!waveformModel) return pf;
-
-    RangeSummarisableTimeValueModel *pm =
-        dynamic_cast<RangeSummarisableTimeValueModel *>
-        (m_manager->getPlaybackModel());
+    if (!aligningModel) return pf;
+
+    Model *pm = m_manager->getPlaybackModel();
 
 //    std::cerr << "View[" << this << "]::getAlignedPlaybackFrame: pf = " << pf;
 
     if (pm) {
         pf = pm->alignFromReference(pf);
 //        std::cerr << " -> " << pf;
     }
 
-    int af = waveformModel->alignToReference(pf);
+    int af = aligningModel->alignToReference(pf);
 
 //    std::cerr << ", aligned = " << af << std::endl;
     return af;
 }