mir/openhardwaremonitor
2
0
Fork 0
mirror of https://github.com/openhardwaremonitor/openhardwaremonitor synced 2025-09-01 14:55:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring: New class Computer manages all the hardware and creates events.

Browse Source
This commit is contained in:
Michael Möller
2010-02-07 16:37:15 +00:00
parent 15162a2a12
commit 31adbedc3c
9 changed files with 325 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Hardware/Sensor.cs
View File

@@ -59,12 +59,7 @@ namespace OpenHardwareMonitor.Hardware {
private int count = 0;
private const int MAX_MINUTES = 120;
private string GetIdentifier() {
return hardware.Identifier + "/" + sensorType.ToString().ToLower() +
"/" + index;
}
public Sensor(string name, int index, SensorType sensorType,
IHardware hardware)
: this(name, index, null, sensorType, hardware) { }
@@ -77,24 +72,35 @@ namespace OpenHardwareMonitor.Hardware {
this.defaultLimit = limit;
this.sensorType = sensorType;
this.hardware = hardware;
string configName =
Utilities.Config.Settings[GetIdentifier() + "/name"];
string configName =
Utilities.Config.Settings[Identifier + "/name"];
if (configName != null)
this.name = configName;
else
this.name = name;
string configLimit =
Utilities.Config.Settings[GetIdentifier() + "/limit"];
Utilities.Config.Settings[Identifier + "/limit"];
if (configLimit != null && configLimit != "")
this.limit = float.Parse(configLimit);
else
this.limit = limit;
}
public IHardware Hardware {
get { return hardware; }
}
public SensorType SensorType {
get { return sensorType; }
}
public string Identifier {
get {
return hardware.Identifier + "/" + sensorType.ToString().ToLower() +
"/" + index;
}
}
public string Name {
get {
return name;
@@ -104,7 +110,7 @@ namespace OpenHardwareMonitor.Hardware {
name = value;
else
name = defaultName;
Utilities.Config.Settings[GetIdentifier() + "/name"] = name;
Utilities.Config.Settings[Identifier + "/name"] = name;
}
}
@@ -150,11 +156,11 @@ namespace OpenHardwareMonitor.Hardware {
set {
if (value.HasValue) {
limit = value;
Utilities.Config.Settings[GetIdentifier() + "/limit"] =
Utilities.Config.Settings[Identifier + "/limit"] =
limit.ToString();
} else {
limit = defaultLimit;
Utilities.Config.Settings[GetIdentifier() + "/limit"] = "";
Utilities.Config.Settings[Identifier + "/limit"] = "";
}
}
}