Release version 0.1.7. Improved report writer.

This commit is contained in:
Michael Möller
2010-02-01 21:04:14 +00:00
parent f3657cc53a
commit 432a947633
6 changed files with 28 additions and 12 deletions
+1 -1
View File
@@ -116,7 +116,7 @@ namespace OpenHardwareMonitor.Hardware.ATI {
}
if (!found)
hardware.Add(new ATIGPU(
adapterInfo[i].AdapterName,
adapterInfo[i].AdapterName.Trim(),
adapterInfo[i].AdapterIndex,
adapterInfo[i].BusNumber,
adapterInfo[i].DeviceNumber));
+7 -7
View File
@@ -111,7 +111,7 @@ namespace OpenHardwareMonitor.Hardware.CPU {
AppendRegister(nameBuilder, edx);
}
}
cpuBrandString = nameBuilder.ToString();
cpuBrandString = nameBuilder.ToString().Trim('\0');
nameBuilder.Replace("(R)", " ");
nameBuilder.Replace("(TM)", " ");
nameBuilder.Replace("(tm)", " ");
@@ -177,8 +177,6 @@ namespace OpenHardwareMonitor.Hardware.CPU {
}
public string GetReport() {
if (hardware.Count == 0)
return null;
StringBuilder r = new StringBuilder();
@@ -199,10 +197,12 @@ namespace OpenHardwareMonitor.Hardware.CPU {
r.AppendLine("CPUID Return Values");
r.AppendLine();
r.AppendLine(" Function EAX EBX ECX EDX");
AppendCpuidData(r, cpuidData, CPUID);
AppendCpuidData(r, cpuidExtData, CPUID_EXT);
r.AppendLine();
if (cpuidData != null) {
r.AppendLine(" Function EAX EBX ECX EDX");
AppendCpuidData(r, cpuidData, CPUID);
AppendCpuidData(r, cpuidExtData, CPUID_EXT);
r.AppendLine();
}
return r.ToString();
}
+1 -1
View File
@@ -107,7 +107,7 @@ namespace OpenHardwareMonitor.Hardware.LPC {
}
public string Identifier {
get { return "/lpc/f71882fg"; }
get { return "/lpc/" + chip.ToString().ToLower(); }
}
public Image Icon {
+1 -1
View File
@@ -131,7 +131,7 @@ namespace OpenHardwareMonitor.Hardware.LPC {
}
public string Identifier {
get { return "/lpc/it87"; }
get { return "/lpc/" + chip.ToString().ToLower(); }
}
public Image Icon {
+16
View File
@@ -21,10 +21,26 @@ namespace OpenHardwareMonitor.Hardware {
w.WriteLine();
w.WriteLine("Open Hardware Monitor Report");
w.WriteLine();
NewSection(w);
w.Write("Version: "); w.WriteLine(version.ToString());
w.WriteLine();
NewSection(w);
foreach (IGroup group in groupList) {
foreach (IHardware hardware in group.Hardware) {
w.WriteLine("|");
w.WriteLine("+-+ {0} ({1})",
new object[] { hardware.Name, hardware.Identifier });
foreach (ISensor sensor in hardware.Sensors) {
w.WriteLine("| +- {0} : {1} : {2} : {3}",
new object[] { sensor.SensorType, sensor.Index, sensor.Name,
sensor.Value });
}
}
}
w.WriteLine();
foreach (IGroup group in groupList) {
string report = group.GetReport();
if (report != null) {
+2 -2
View File
@@ -69,5 +69,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.1.6.0")]
[assembly: AssemblyFileVersion("0.1.6.0")]
[assembly: AssemblyVersion("0.1.7.0")]
[assembly: AssemblyFileVersion("0.1.7.0")]