Mercurial > hg > svcore

changeset 306:4669894a89ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* textual changes
author Chris Cannam
date Tue, 09 Oct 2007 16:21:10 +0000
parents fc656505c573
children b1a3f7bc035d
files data/model/Labeller.h
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/data/model/Labeller.h	Mon Oct 08 14:44:38 2007 +0000
+++ b/data/model/Labeller.h	Tue Oct 09 16:21:10 2007 +0000
@@ -82,14 +82,14 @@
     TypeNameMap getTypeNames() const {
         TypeNameMap m;
         m[ValueNone] = tr("No numbering");
-        m[ValueFromSimpleCounter] = tr("Simple counter starting from 1");
-        m[ValueFromCyclicalCounter] = tr("Cyclical counter starting from 1");
+        m[ValueFromSimpleCounter] = tr("Simple counter");
+        m[ValueFromCyclicalCounter] = tr("Cyclical counter");
         m[ValueFromTwoLevelCounter] = tr("Cyclical two-level counter (bar/beat)");
         m[ValueFromFrameNumber] = tr("Audio sample frame number");
         m[ValueFromRealTime] = tr("Time in seconds");
         m[ValueFromRealTimeDifference] = tr("Duration to the following item");
         m[ValueFromTempo] = tr("Tempo (bpm) based on duration to following item");
-        m[ValueFromExistingNeighbour] = tr("Same value as the nearest previous item");
+        m[ValueFromExistingNeighbour] = tr("Same as the nearest previous item");
         m[ValueFromLabel] = tr("Value extracted from the item's label (where possible)");
         return m;
     }
@@ -133,6 +133,9 @@
         } else if (m_type == ValueFromTwoLevelCounter) {
             newPoint.label = tr("%1.%2").arg(m_counter2).arg(m_counter);
             incrementCounter();
+        } else if (m_type == ValueFromFrameNumber) {
+            // avoid going through floating-point value
+            newPoint.label = tr("%1").arg(newPoint.frame);
         } else {
             float value = getValueFor<PointType>(newPoint, prevPoint);
             if (actingOnPrevPoint() && prevPoint) {