From 92c24918465a6a2a017f80abe1a8cc07cd2bd7fa Mon Sep 17 00:00:00 2001 From: "Raine M. Ekman" Date: Sat, 22 Feb 2014 21:03:33 +0200 Subject: [PATCH] Timer display widget: change bar:ticks:milliseconds to bar:beat:ticks, 1-based instead of 0-based --- src/gui/widgets/TimeDisplayWidget.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/gui/widgets/TimeDisplayWidget.cpp b/src/gui/widgets/TimeDisplayWidget.cpp index 95df88407..d13da37ff 100644 --- a/src/gui/widgets/TimeDisplayWidget.cpp +++ b/src/gui/widgets/TimeDisplayWidget.cpp @@ -72,18 +72,18 @@ void TimeDisplayWidget::setDisplayMode( DisplayMode displayMode ) { m_displayMode = displayMode; - m_milliSecondsLCD.setLabel( "MSEC" ); - switch( m_displayMode ) { case MinutesSeconds: m_majorLCD.setLabel( "MIN" ); m_minorLCD.setLabel( "SEC" ); + m_milliSecondsLCD.setLabel( "MSEC" ); break; case BarsTicks: m_majorLCD.setLabel( "BAR" ); - m_minorLCD.setLabel( "TICK" ); + m_minorLCD.setLabel( "BEAT" ); + m_milliSecondsLCD.setLabel( "TICK" ); break; default: break; @@ -102,16 +102,20 @@ void TimeDisplayWidget::updateTime() case MinutesSeconds: m_majorLCD.setValue( s->getMilliseconds() / 60000 ); m_minorLCD.setValue( ( s->getMilliseconds() / 1000 ) % 60 ); + m_milliSecondsLCD.setValue( s->getMilliseconds() % 1000 ); break; case BarsTicks: - m_majorLCD.setValue( s->getTacts() ); - m_minorLCD.setValue( ( s->getTicks() % s->ticksPerTact() ) / 3 ); + m_majorLCD.setValue( s->getTacts() + 1 ); + m_minorLCD.setValue( ( s->getTicks() % s->ticksPerTact() ) / + ( s->ticksPerTact() / s->getTimeSigModel().getNumerator() ) +1 ); +; + m_milliSecondsLCD.setValue( ( s->getTicks() % s->ticksPerTact() ) % + ( s->ticksPerTact() / s->getTimeSigModel().getNumerator() ) ); break; default: break; } - m_milliSecondsLCD.setValue( s->getMilliseconds() % 1000 ); }