From 7135f8cc1da83a0c85f542f282cb9b55533ec8e3 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 6 Apr 2004 23:21:27 +0000 Subject: [PATCH] extend log timestamps to three decimal places --- stepmania/src/RageLog.cpp | 4 ++-- stepmania/src/RageUtil.cpp | 9 +++++++++ stepmania/src/RageUtil.h | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/stepmania/src/RageLog.cpp b/stepmania/src/RageLog.cpp index ddead8e1ef..24ac3b7f95 100644 --- a/stepmania/src/RageLog.cpp +++ b/stepmania/src/RageLog.cpp @@ -242,7 +242,7 @@ void RageLog::Write( int where, const CString &line ) CString LineHeader; if( m_bTimestamping ) - LineHeader += SecondsToMMSSMsMs(RageTimer::GetTimeSinceStart()) + ": "; + LineHeader += SecondsToMMSSMsMsMs(RageTimer::GetTimeSinceStart()) + ": "; if( where & WRITE_LOUD ) LineHeader += "WARNING: "; @@ -384,7 +384,7 @@ void RageLog::MapLog(const CString &key, const char *fmt, ...) { CString s; if( m_bTimestamping ) - s += SecondsToMMSSMsMs(RageTimer::GetTimeSinceStart()) + ": "; + s += SecondsToMMSSMsMsMs(RageTimer::GetTimeSinceStart()) + ": "; va_list va; va_start(va, fmt); diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp index f5c9bb784d..9a76c86f68 100644 --- a/stepmania/src/RageUtil.cpp +++ b/stepmania/src/RageUtil.cpp @@ -126,6 +126,15 @@ CString SecondsToMMSSMsMs( float fSecs ) return sReturn; } +CString SecondsToMMSSMsMsMs( float fSecs ) +{ + const int iMinsDisplay = (int)fSecs/60; + const int iSecsDisplay = (int)fSecs - iMinsDisplay*60; + const float fLeftoverDisplay = (fSecs - iMinsDisplay*60 - iSecsDisplay) * 1000; + CString sReturn = ssprintf( "%02d:%02d.%03.0f", iMinsDisplay, iSecsDisplay, min(999.0f,fLeftoverDisplay) ); + return sReturn; +} + CString PrettyPercent( float fNumerator, float fDenominator) { return ssprintf("%0.2f%%",fNumerator/fDenominator*100); diff --git a/stepmania/src/RageUtil.h b/stepmania/src/RageUtil.h index af9d9c3a36..331e540dc1 100644 --- a/stepmania/src/RageUtil.h +++ b/stepmania/src/RageUtil.h @@ -140,6 +140,7 @@ bool IsHexVal( const CString &s ); float HHMMSSToSeconds( const CString &sHMS ); CString SecondsToHHMMSS( float fSecs ); CString SecondsToMMSSMsMs( float fSecs ); +CString SecondsToMMSSMsMsMs( float fSecs ); CString PrettyPercent( float fNumerator, float fDenominator ); inline CString PrettyPercent( int fNumerator, int fDenominator ) { return PrettyPercent( float(fNumerator), float(fDenominator) ); } CString Commify( int iNum );