mir/openhardwaremonitor
2
0
Fork 0
mirror of https://github.com/openhardwaremonitor/openhardwaremonitor synced 2025-08-22 09:57:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added correct formatting for Throughput sensors in the gadget.

Browse Source
This commit is contained in:
Michael Möller 2020-02-22 20:22:15 +01:00
parent bf269aea61
commit 6641df4b50
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
GUI/SensorGadget.cs
View File

@ -4,7 +4,7 @@
License, v. 2.0. If a copy of the MPL was not distributed with this License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/. file, You can obtain one at http://mozilla.org/MPL/2.0/.
Copyright (C) 2010-2012 Michael Möller <mmoeller@openhardwaremonitor.org> Copyright (C) 2010-2020 Michael Möller <mmoeller@openhardwaremonitor.org>
*/ */
@ -558,9 +558,6 @@ namespace OpenHardwareMonitor.GUI {
case SensorType.Clock: case SensorType.Clock:
format = "{0:F0} MHz"; format = "{0:F0} MHz";
break; break;
case SensorType.Temperature:
format = "{0:F1} °C";
break;
case SensorType.Fan: case SensorType.Fan:
format = "{0:F0} RPM"; format = "{0:F0} RPM";
break; break;
@ -576,14 +573,33 @@ namespace OpenHardwareMonitor.GUI {
case SensorType.Factor: case SensorType.Factor:
format = "{0:F3}"; format = "{0:F3}";
break; break;
case SensorType.SmallData:
format = "{0:F1} MB";
break;
} }
if (sensor.SensorType == SensorType.Temperature && switch (sensor.SensorType) {
unitManager.TemperatureUnit == TemperatureUnit.Fahrenheit) { case SensorType.Temperature:
formatted = string.Format("{0:F1} °F", if (unitManager.TemperatureUnit == TemperatureUnit.Fahrenheit)
UnitManager.CelsiusToFahrenheit(sensor.Value)); {
} else { formatted = string.Format("{0:F1} °F",
formatted = string.Format(format, sensor.Value); UnitManager.CelsiusToFahrenheit(sensor.Value));
} else {
formatted = string.Format("{0:F1} °C", sensor.Value);
}
break;
case SensorType.Throughput:
if (sensor.Value < 1) {
formatted =
string.Format("{0:F1} KB/s", sensor.Value * 0x400);
} else {
formatted =
string.Format("{0:F1} MB/s", sensor.Value);
}
break;
default:
formatted = string.Format(format, sensor.Value);
break;
} }
} else { } else {
formatted = "-"; formatted = "-";