comparison data/model/AlignmentModel.cpp @ 1752:6d09d68165a4 by-id

Further review of ById: make IDs only available when adding a model to the ById store, not by querying the item directly. This means any id encountered in the wild must have been added to the store at some point (even if later released), which simplifies reasoning about lifecycles

 
     return performAlignment(*m_reversePath, frame);
 }
 
 void
-AlignmentModel::pathSourceChangedWithin(sv_frame_t, sv_frame_t)
+AlignmentModel::pathSourceChangedWithin(ModelId, sv_frame_t, sv_frame_t)
 {
     if (!m_pathComplete) return;
     constructPath();
     constructReversePath();
 }    
 
 void
-AlignmentModel::pathSourceCompletionChanged()
+AlignmentModel::pathSourceCompletionChanged(ModelId)
 {
     auto pathSourceModel =
         ModelById::getAs<SparseTimeValueModel>(m_pathSource);
     if (!pathSourceModel) return;
     

             SVCERR << "AlignmentModel: path complete" << endl;
 #endif
         }
     }
 
-    emit completionChanged();
+    emit completionChanged(getId());
 }
 
 void
 AlignmentModel::constructPath() const
 {

         ModelById::getAs<SparseTimeValueModel>(m_pathSource);
     
     if (pathSourceModel) {
 
         connect(pathSourceModel.get(),
-                SIGNAL(modelChangedWithin(sv_frame_t, sv_frame_t)),
-                this, SLOT(pathSourceChangedWithin(sv_frame_t, sv_frame_t)));
+                SIGNAL(modelChangedWithin(ModelId, sv_frame_t, sv_frame_t)),
+                this, SLOT(pathSourceChangedWithin(ModelId, sv_frame_t, sv_frame_t)));
         
-        connect(pathSourceModel.get(), SIGNAL(completionChanged()),
-                this, SLOT(pathSourceCompletionChanged()));
+        connect(pathSourceModel.get(), SIGNAL(completionChanged(ModelId)),
+                this, SLOT(pathSourceCompletionChanged(ModelId)));
 
         constructPath();
         constructReversePath();
 
         if (pathSourceModel->isReady()) {
-            pathSourceCompletionChanged();
+            pathSourceCompletionChanged(m_pathSource);
         }
     }
 }
 
 void