hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #369 from softrabbit/stable-0.4

Browse Source 
Timer display widget: cosmetic fixes
This commit is contained in:
Tobias Doerffel
2014-02-22 20:38:00 +01:00
parent 0db83c6ede 92c2491846
commit 49a28a7960
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/widgets/TimeDisplayWidget.cpp
View File

@@ -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 );
}