comparison layer/FlexiNoteLayer.cpp @ 748:84e4cf889659 tonioni

Make pitch-track editing operations update the notes as well, automatically

 
     cerr << "FlexiNoteLayer::getAssociatedPitchModel()" << endl;
 
     for (int i = 0; i < v->getLayerCount(); ++i) {
         Layer *layer = v->getLayer(i);
-        if (layer && !layer->isLayerDormant(v)) {
+        if (layer && !layer->isLayerDormant(v) && 
+            layer->getLayerPresentationName() != "candidate") {
             cerr << "FlexiNoteLayer::getAssociatedPitchModel: looks like our layer is " << layer << endl;
             SparseTimeValueModel *model = qobject_cast<SparseTimeValueModel *>
                 (layer->getModel());
             cerr << "FlexiNoteLayer::getAssociatedPitchModel: and its model is " << model << endl;
             if (model && model->getScaleUnits() == "Hz") {

 
         FlexiNote note(*i);
 
         cerr << "snapSelectedNotesToPitchTrack: looking at note from " << note.frame << " to " << note.frame + note.duration << endl;
 
-        if (!s.contains(note.frame) ||
+        if (!s.contains(note.frame) &&
             !s.contains(note.frame + note.duration - 1)) {
             continue;
         }
 
         FlexiNote newNote(note);

    
     for (SparseModel<TimeValuePoint>::PointList::const_iterator i =
              dataPoints.begin(); i != dataPoints.end(); ++i) {
         if (i->frame >= note.frame &&
             i->frame < note.frame + note.duration) {
-            pitchValues.push_back((*i).value);
+            pitchValues.push_back(i->value);
         }
     }
         
     if (pitchValues.empty()) return false;