comparison data/model/AlignmentModel.cpp @ 1869:cb9209ef373a startup-timing

Merge from default branch

     m_pathSource(pathSource),
     m_path(nullptr),
     m_reversePath(nullptr),
     m_pathBegun(false),
     m_pathComplete(false),
-    m_relativePitch(0)
+    m_relativePitch(0),
+    m_explicitlySetCompletion(-1)
 {
     setPathFrom(pathSource);
 
     if (m_reference == m_aligned) {
         // Trivial alignment, e.g. of main model to itself, which we

 }
 
 bool
 AlignmentModel::isReady(int *completion) const
 {
+    if (m_explicitlySetCompletion != -1) {
+        if (completion) *completion = m_explicitlySetCompletion;
+        return (m_explicitlySetCompletion == 100);
+    }
     if (!m_pathBegun && !m_pathSource.isNone()) {
         if (completion) *completion = 0;
 #ifdef DEBUG_ALIGNMENT_MODEL
         SVCERR << "AlignmentModel::isReady: path not begun" << endl;
 #endif

 
 ModelId
 AlignmentModel::getAlignedModel() const
 {
     return m_aligned;
+}
+
+void
+AlignmentModel::setCompletion(int completion)
+{
+    m_explicitlySetCompletion = completion;
+    emit completionChanged(getId());
 }
 
 sv_frame_t
 AlignmentModel::toReference(sv_frame_t frame) const
 {

 
 sv_frame_t
 AlignmentModel::performAlignment(const Path &path, sv_frame_t frame) const
 {
     // The path consists of a series of points, each with frame equal
-    // to the frame on the source model and mapframe equal to the
-    // frame on the target model.  Both should be monotonically
-    // increasing.
+    // to the frame on the source model (aligned model) and mapframe
+    // equal to the frame on the target model (reference model).  Both
+    // should be monotonically increasing.
 
     const Path::Points &points = path.getPoints();
 
     if (points.empty()) {
 #ifdef DEBUG_ALIGNMENT_MODEL