comparison layer/SpectrogramLayer.cpp @ 28:202d1dca67d2

* Rationalise the local feature identification API in Layer subclasses
* Add segmentation mode to TimeInstantLayer

     size_t completion = m_fillThread->getFillCompletion();
 //    std::cerr << "SpectrogramLayer::getCompletion: completion = " << completion << std::endl;
     return completion;
 }
 
-int
-SpectrogramLayer::getNearestFeatureFrame(int frame, 
-					 size_t &resolution,
-					 bool snapRight) const
+bool
+SpectrogramLayer::snapToFeatureFrame(int &frame,
+				     size_t &resolution,
+				     SnapType snap) const
 {
     resolution = getWindowIncrement();
-    int snapFrame = (frame / resolution) * resolution;
-    if (snapRight) snapFrame += resolution;
-    return snapFrame;
-}
+    int left = (frame / resolution) * resolution;
+    int right = left + resolution;
+
+    switch (snap) {
+    case SnapLeft:  frame = left;  break;
+    case SnapRight: frame = right; break;
+    case SnapNearest:
+    case SnapNeighbouring:
+	if (frame - left > right - frame) frame = right;
+	else frame = left;
+	break;
+    }
+    
+    return true;
+} 
 
 QString
 SpectrogramLayer::getFeatureDescription(QPoint &pos) const
 {
     int x = pos.x();