diff data/model/Model.cpp @ 954:35b05cac32d0 tonioni

Update subrepos and merge from default branch

--- a/data/model/Model.cpp	Fri Jul 18 11:07:30 2014 +0100
+++ b/data/model/Model.cpp	Tue Sep 02 16:23:48 2014 +0100
@@ -109,6 +109,7 @@
 int
 Model::alignToReference(int frame) const
 {
+//    cerr << "Model(" << this << ")::alignToReference(" << frame << ")" << endl;
     if (!m_alignment) {
         if (m_sourceModel) return m_sourceModel->alignToReference(frame);
         else return frame;
@@ -116,18 +117,21 @@
     int refFrame = m_alignment->toReference(frame);
     const Model *m = m_alignment->getReferenceModel();
     if (m && refFrame > m->getEndFrame()) refFrame = m->getEndFrame();
+//    cerr << "have alignment, aligned is " << refFrame << endl;
     return refFrame;
 }
 
 int
 Model::alignFromReference(int refFrame) const
 {
+//    cerr << "Model(" << this << ")::alignFromReference(" << refFrame << ")" << endl;
     if (!m_alignment) {
         if (m_sourceModel) return m_sourceModel->alignFromReference(refFrame);
         else return refFrame;
     }
     int frame = m_alignment->fromReference(refFrame);
     if (frame > getEndFrame()) frame = getEndFrame();
+//    cerr << "have alignment, aligned is " << frame << endl;
     return frame;
 }