From c3e3cf336166d2ee7faa6b65a0fcad0d5810bbbe Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sat, 19 Feb 2011 03:34:58 -0600 Subject: [PATCH] [BPMDisplay] Added FormatString metric. --- Docs/Changelog_sm-ssc.txt | 6 +++++- Themes/_fallback/metrics.ini | 2 ++ src/BPMDisplay.cpp | 7 ++++--- src/BPMDisplay.h | 2 ++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt index 2c1cd0334d..9388049917 100644 --- a/Docs/Changelog_sm-ssc.txt +++ b/Docs/Changelog_sm-ssc.txt @@ -13,9 +13,13 @@ _____________________________________________________________________________ sm-ssc v1.2.2 | 201102?? -------------------------------------------------------------------------------- +20110219 +-------- +* [BPMDisplay] Added FormatString metric. [AJ] + 20110218 -------- -* [WheelBase] Added SetOpenSection Lua binding [AJ] +* [WheelBase] Added SetOpenSection Lua binding. [AJ] 20110217 -------- diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index c93357f68f..42029f569e 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -218,6 +218,8 @@ QuestionMarksText="???" RandomText="!!!" # xxx: localize me -aj VariousText="000" +FormatString="%03.0f" + [CodeDetector] # Codes on the MusicWheel that change stuff! PrevSteps1="Up,Up" diff --git a/src/BPMDisplay.cpp b/src/BPMDisplay.cpp index 19a28a077f..5acf484d4e 100644 --- a/src/BPMDisplay.cpp +++ b/src/BPMDisplay.cpp @@ -38,6 +38,7 @@ void BPMDisplay::Load() QUESTIONMARKS_TEXT.Load( m_sName, "QuestionMarksText" ); RANDOM_TEXT.Load( m_sName, "RandomText" ); VARIOUS_TEXT.Load( m_sName, "VariousText" ); + BPM_FORMAT_STRING.Load( m_sName, "FormatString" ); RunCommands( SET_NORMAL_COMMAND ); } @@ -76,9 +77,9 @@ void BPMDisplay::Update( float fDeltaTime ) { m_fBPMFrom = -1; if( (bool)SHOW_QMARKS ) - SetText( (RandomFloat(0,1)>0.90f) ? (RString)QUESTIONMARKS_TEXT : ssprintf("%03.0f",RandomFloat(0,999)) ); + SetText( (RandomFloat(0,1)>0.90f) ? (RString)QUESTIONMARKS_TEXT : ssprintf((RString)BPM_FORMAT_STRING,RandomFloat(0,999)) ); else - SetText( ssprintf("%03.0f",RandomFloat(0,999)) ); + SetText( ssprintf((RString)BPM_FORMAT_STRING, RandomFloat(0,999)) ); } else if(m_fBPMFrom == -1) { @@ -89,7 +90,7 @@ void BPMDisplay::Update( float fDeltaTime ) if( m_fBPMTo != -1) { const float fActualBPM = GetActiveBPM(); - SetText( ssprintf("%03.0f", fActualBPM) ); + SetText( ssprintf((RString)BPM_FORMAT_STRING, fActualBPM) ); } } diff --git a/src/BPMDisplay.h b/src/BPMDisplay.h index d6fb4f5e71..566993a681 100644 --- a/src/BPMDisplay.h +++ b/src/BPMDisplay.h @@ -94,6 +94,8 @@ protected: ThemeMetric RANDOM_TEXT; /** @brief The text used as one possible option for random BPM. */ ThemeMetric QUESTIONMARKS_TEXT; + /** @brief The format string used for the numbers. */ + ThemeMetric BPM_FORMAT_STRING; /** @brief The lowest valued BPM. */ float m_fBPMFrom;