diff --git a/BeefTools/BeefPerf/src/BPClient.bf b/BeefTools/BeefPerf/src/BPClient.bf index 43a6c660..5b8a8fce 100644 --- a/BeefTools/BeefPerf/src/BPClient.bf +++ b/BeefTools/BeefPerf/src/BPClient.bf @@ -708,19 +708,19 @@ namespace BeefPerf if (intTimeUS < 1000) // < 1ms { int32 timeNS = (int32)((timeUS - intTimeUS) * 1000); - str.AppendF("{0}.{1:02}us", intTimeUS, timeNS / 10); + str.AppendF("{0}.{1:00}us", intTimeUS, timeNS / 10); } else if (intTimeUS < 1000*1000) // < 1s { - str.AppendF("{0}.{1:02}ms", (int32)(intTimeUS / 1000), (int32)((intTimeUS / 10) % 100)); + str.AppendF("{0}.{1:00}ms", (int32)(intTimeUS / 1000), (int32)((intTimeUS / 10) % 100)); } else if (intTimeUS < 10*1000*1000) // < 10s { - str.AppendF("{0}s:{1:03}.{2:01}ms", (int32)(intTimeUS / 1000 / 1000), (int32)((intTimeUS / 1000) % 1000), (int32)((intTimeUS / 100) % 10)); + str.AppendF("{0}s:{1:000}.{2:00}ms", (int32)(intTimeUS / 1000 / 1000), (int32)((intTimeUS / 1000) % 1000), (int32)((intTimeUS / 100) % 10)); } else if (intTimeUS < 60*1000*1000) // < 1m { - str.AppendF("{0}s:{1:03}ms", (int32)(intTimeUS / 1000 / 1000), (int32)((intTimeUS / 1000) % 1000)); + str.AppendF("{0}s:{1:000}ms", (int32)(intTimeUS / 1000 / 1000), (int32)((intTimeUS / 1000) % 1000)); } else { @@ -731,11 +731,11 @@ namespace BeefPerf public static void TimeToStr(double timeUS, String str, bool highPrecision = true) { int64 intTimeUS = (int64)timeUS; - str.AppendF("{0}:{1:02}:", (int32)((intTimeUS / 60 / 60 / 1000000)), (int32)((intTimeUS / 60 / 1000000) % 60)); + str.AppendF("{0}:{1:00}:", (int32)((intTimeUS / 60 / 60 / 1000000)), (int32)((intTimeUS / 60 / 1000000) % 60)); if (highPrecision) - str.AppendF("{0:02}.{1:06}", (int32)((intTimeUS / 1000000) % 60), (int32)((intTimeUS % 1000000))); + str.AppendF("{0:00}.{1:000000}", (int32)((intTimeUS / 1000000) % 60), (int32)((intTimeUS % 1000000))); else - str.AppendF("{0:02}.{1:02}", (int32)((intTimeUS / 1000000) % 60), (int32)((intTimeUS / 10000 % 100))); + str.AppendF("{0:00}.{1:00}", (int32)((intTimeUS / 1000000) % 60), (int32)((intTimeUS / 10000 % 100))); } public Result ParseTime(String str) diff --git a/BeefTools/BeefPerf/src/PerfView.bf b/BeefTools/BeefPerf/src/PerfView.bf index 42400dcd..e844201e 100644 --- a/BeefTools/BeefPerf/src/PerfView.bf +++ b/BeefTools/BeefPerf/src/PerfView.bf @@ -1323,14 +1323,14 @@ namespace BeefPerf //0:00:03.123456 {with zeroes trimmed} - str.AppendF("{0}:{1:02}:", (int32)((timeUS / 60 / 60 / 1000000)), (int32)((timeUS / 60 / 1000000) % 60)); + str.AppendF("{0}:{1:00}:", (int32)((timeUS / 60 / 60 / 1000000)), (int32)((timeUS / 60 / 1000000) % 60)); using (g.PushColor(0x80FFFFFF)) g.DrawString(str, xOfs + 4, -2); xOfs += g.mFont.GetWidth(str); str.Clear(); - str.AppendF("{0:02}.{1:06}", (int32)((timeUS / 1000000) % 60), (int32)((timeUS % 1000000))); + str.AppendF("{0:00}.{1:000000}", (int32)((timeUS / 1000000) % 60), (int32)((timeUS % 1000000))); int maxTrim = 0; if (pixelsPerUS < 0.012)