chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Minor tweak.

Browse Source
This commit is contained in:
spx 2011-11-06 00:10:39 +00:00
parent c8e4608b41
commit 3bf00bccd0
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Library/Measure.cpp
View File

@ -699,32 +699,33 @@ void CMeasure::GetScaledValue(AUTOSCALE autoScale, int decimals, double theValue
_snwprintf_s(format, _TRUNCATE, L"%%.%if", decimals); _snwprintf_s(format, _TRUNCATE, L"%%.%if", decimals);
} }
int index = (autoScale == AUTOSCALE_1000 || autoScale == AUTOSCALE_1000K) ? AUTOSCALE_INDEX_1000 : AUTOSCALE_INDEX_1024; const double* tblScale =
g_TblScale[(autoScale == AUTOSCALE_1000 || autoScale == AUTOSCALE_1000K) ? AUTOSCALE_INDEX_1000 : AUTOSCALE_INDEX_1024];
if (theValue > (g_TblScale[index][0] * 0.99)) if (theValue >= tblScale[0])
{ {
value = theValue / tblScale[0];
wcsncat_s(format, L" T", _TRUNCATE); wcsncat_s(format, L" T", _TRUNCATE);
value = theValue / g_TblScale[index][0];
} }
else if (theValue > (g_TblScale[index][1] * 0.99)) else if (theValue >= tblScale[1])
{ {
value = theValue / tblScale[1];
wcsncat_s(format, L" G", _TRUNCATE); wcsncat_s(format, L" G", _TRUNCATE);
value = theValue / g_TblScale[index][1];
} }
else if (theValue > (g_TblScale[index][2] * 0.99)) else if (theValue >= tblScale[2])
{ {
value = theValue / tblScale[2];
wcsncat_s(format, L" M", _TRUNCATE); wcsncat_s(format, L" M", _TRUNCATE);
value = theValue / g_TblScale[index][2];
} }
else if (autoScale == AUTOSCALE_1024K || autoScale == AUTOSCALE_1000K || theValue > (g_TblScale[index][3] * 0.99)) else if (autoScale == AUTOSCALE_1024K || autoScale == AUTOSCALE_1000K || theValue >= tblScale[3])
{ {
value = theValue / tblScale[3];
wcsncat_s(format, L" k", _TRUNCATE); wcsncat_s(format, L" k", _TRUNCATE);
value = theValue / g_TblScale[index][3];
} }
else else
{ {
wcsncat_s(format, L" ", _TRUNCATE);
value = theValue; value = theValue;
wcsncat_s(format, L" ", _TRUNCATE);
} }
_snwprintf_s(buffer, sizeInWords, _TRUNCATE, format, value); _snwprintf_s(buffer, sizeInWords, _TRUNCATE, format, value);
} }