# HG changeset patch
# User Chris Cannam
# Date 1197566073 0
# Node ID 864703bf64aca78dd802c176c4c49c30d7148c58
# Parent  ef8a3028c7117fdec331e72f5e1692090dd38c84
* Fix #1841095 tapping time instant gives wrong time in aligned track
* Fix #1815654 source tidying: Labeller
* Fix (I hope) #1849999 Time value graphs one instant out

diff -r ef8a3028c711 -r 864703bf64ac framework/MainWindowBase.cpp
--- a/framework/MainWindowBase.cpp	Tue Dec 11 14:58:29 2007 +0000
+++ b/framework/MainWindowBase.cpp	Thu Dec 13 17:14:33 2007 +0000
@@ -687,6 +687,8 @@
         return;
     }
 
+    frame = pane->alignFromReference(frame);
+
     Layer *layer = dynamic_cast<TimeInstantLayer *>
         (pane->getSelectedLayer());
 
@@ -723,7 +725,7 @@
             SparseOneDimensionalModel::EditCommand *command =
                 new SparseOneDimensionalModel::EditCommand(sodm, tr("Add Point"));
 
-            if (m_labeller->actingOnPrevPoint()) {
+            if (m_labeller->requiresPrevPoint()) {
 
                 SparseOneDimensionalModel::PointList prevPoints =
                     sodm->getPreviousPoints(frame);
@@ -738,14 +740,14 @@
 
                 m_labeller->setSampleRate(sodm->getSampleRate());
 
-                if (havePrevPoint) {
+                if (m_labeller->actingOnPrevPoint()) {
                     command->deletePoint(prevPoint);
                 }
 
                 m_labeller->label<SparseOneDimensionalModel::Point>
                     (point, havePrevPoint ? &prevPoint : 0);
 
-                if (havePrevPoint) {
+                if (m_labeller->actingOnPrevPoint()) {
                     command->addPoint(prevPoint);
                 }
             }