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

Added an Identifier class for IHardware, ISensor and IParameter Identifier properties.

Browse Source
This commit is contained in:
Michael Möller
2010-05-06 19:20:38 +00:00
parent d897c6127c
commit a49919717e
19 changed files with 241 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Hardware/Sensor.cs
View File

@@ -46,6 +46,7 @@ namespace OpenHardwareMonitor.Hardware {
private string defaultName;
private string name;
private int index;
private bool defaultHidden;
private SensorType sensorType;
private IHardware hardware;
private ReadOnlyArray<IParameter> parameters;
@@ -64,31 +65,37 @@ namespace OpenHardwareMonitor.Hardware {
public Sensor(string name, int index, SensorType sensorType,
IHardware hardware) : this(name, index, null, sensorType, hardware,
new ParameterDescription[0]) { }
null) { }
public Sensor(string name, int index, float? limit,
SensorType sensorType, IHardware hardware) : this(name, index, limit,
sensorType, hardware, new ParameterDescription[0]) { }
public Sensor(string name, int index, float? limit, SensorType sensorType,
IHardware hardware, ParameterDescription[] parameterDescriptions) :
this(name, index, false, limit, sensorType, hardware,
parameterDescriptions) { }
public Sensor(string name, int index, float? limit, SensorType sensorType,
IHardware hardware, ParameterDescription[] parameterDescriptions)
public Sensor(string name, int index, bool defaultHidden,
float? limit, SensorType sensorType, IHardware hardware,
ParameterDescription[] parameterDescriptions)
{
this.defaultName = name;
this.index = index;
this.defaultHidden = defaultHidden;
this.defaultLimit = limit;
this.sensorType = sensorType;
this.hardware = hardware;
Parameter[] parameters = new Parameter[parameterDescriptions.Length];
Parameter[] parameters = new Parameter[parameterDescriptions == null ?
0 : parameterDescriptions.Length];
for (int i = 0; i < parameters.Length; i++ )
parameters[i] = new Parameter(parameterDescriptions[i], this);
this.parameters = parameters;
string configName = Config.Settings[Identifier + "/name"];
string configName = Config.Settings[
new Identifier(Identifier, "name").ToString()];
if (configName != null)
this.name = configName;
else
this.name = name;
string configLimit = Config.Settings[Identifier + "/limit"];
string configLimit = Config.Settings[
new Identifier(Identifier, "limit").ToString()];
if (configLimit != null && configLimit != "")
this.limit = float.Parse(configLimit);
else
@@ -103,10 +110,10 @@ namespace OpenHardwareMonitor.Hardware {
get { return sensorType; }
}
public string Identifier {
public Identifier Identifier {
get {
return hardware.Identifier + "/" + sensorType.ToString().ToLower() +
"/" + index;
return new Identifier(hardware.Identifier,
sensorType.ToString().ToLower(), index.ToString());
}
}
@@ -119,7 +126,7 @@ namespace OpenHardwareMonitor.Hardware {
name = value;
else
name = defaultName;
Config.Settings[Identifier + "/name"] = name;
Config.Settings[new Identifier(Identifier, "name").ToString()] = name;
}
}
@@ -127,6 +134,10 @@ namespace OpenHardwareMonitor.Hardware {
get { return index; }
}
public bool IsDefaultHidden {
get { return defaultHidden; }
}
public IReadOnlyArray<IParameter> Parameters {
get { return parameters; }
}
@@ -169,11 +180,11 @@ namespace OpenHardwareMonitor.Hardware {
set {
if (value.HasValue) {
limit = value;
Config.Settings[Identifier + "/limit"] =
Config.Settings[new Identifier(Identifier, "limit").ToString()] =
limit.ToString();
} else {
limit = defaultLimit;
Config.Settings[Identifier + "/limit"] = "";
Config.Settings[new Identifier(Identifier, "limit").ToString()] = "";
}
}
}