# HG changeset patch
# User moel.mich
# Date 1297545462 0
# Node ID 6dc6410489f4d935db7023087d11f03fae6a9c55
# Parent  a608358af25801676a44c6671a65858009743639
Fixed Issue 164.

diff -r a608358af258 -r 6dc6410489f4 Hardware/Computer.cs
--- a/Hardware/Computer.cs	Fri Feb 11 22:29:26 2011 +0000
+++ b/Hardware/Computer.cs	Sat Feb 12 21:17:42 2011 +0000
@@ -151,42 +151,43 @@
       IHardware hardware, TextWriter w, string space) 
     {
       w.WriteLine("{0}|", space);
-      w.WriteLine("{0}+-+ {1} ({2})",
+      w.WriteLine("{0}+- {1} ({2})",
         space, hardware.Name, hardware.Identifier);
       ISensor[] sensors = hardware.Sensors;
       Array.Sort(sensors, CompareSensor);
       foreach (ISensor sensor in sensors) {
-        w.WriteLine("{0}|   +- {1}[{2}] : {3} : {4}",
-          space, sensor.SensorType, sensor.Index, 
-            string.Format(CultureInfo.InvariantCulture, "{0} : {1} : {2}",
-            sensor.Value, sensor.Min, sensor.Max), sensor.Name);
+        w.WriteLine("{0}|  +- {1,-14} : {2,8:G6} {3,8:G6} {4,8:G6} ({5})", 
+          space, sensor.Name, sensor.Value, sensor.Min, sensor.Max, 
+          sensor.Identifier);
       }
       foreach (IHardware subHardware in hardware.SubHardware)
-        ReportHardwareSensorTree(subHardware, w, "|   ");
+        ReportHardwareSensorTree(subHardware, w, "|  ");
     }
 
     private static void ReportHardwareParameterTree(
-      IHardware hardware, TextWriter w, string space) 
-    {
+      IHardware hardware, TextWriter w, string space) {
       w.WriteLine("{0}|", space);
-      w.WriteLine("{0}+-+ {1} ({2})",
+      w.WriteLine("{0}+- {1} ({2})",
         space, hardware.Name, hardware.Identifier);
       ISensor[] sensors = hardware.Sensors;
       Array.Sort(sensors, CompareSensor);
       foreach (ISensor sensor in sensors) {
+        string innerSpace = space + "|  ";
         if (sensor.Parameters.Length > 0) {
-          w.WriteLine("{0}|   +- {1}[{2}] : {3}",
-            space, sensor.SensorType, sensor.Index, sensor.Name);
+          w.WriteLine("{0}|", innerSpace);
+          w.WriteLine("{0}+- {1} ({2})",
+            innerSpace, sensor.Name, sensor.Identifier);
           foreach (IParameter parameter in sensor.Parameters) {
-            w.WriteLine("{0}|      +- {1} : {2}",
-              space, parameter.Name,
+            string innerInnerSpace = innerSpace + "|  ";
+            w.WriteLine("{0}+- {1} : {2}",
+              innerInnerSpace, parameter.Name,
               string.Format(CultureInfo.InvariantCulture, "{0} : {1}",
                 parameter.DefaultValue, parameter.Value));
           }
         }
       }
       foreach (IHardware subHardware in hardware.SubHardware)
-        ReportHardwareParameterTree(subHardware, w, "|   ");
+        ReportHardwareParameterTree(subHardware, w, "|  ");
     }
 
     private static void ReportHardware(IHardware hardware, TextWriter w) {
diff -r a608358af258 -r 6dc6410489f4 Hardware/Heatmaster/HeatmasterGroup.cs
--- a/Hardware/Heatmaster/HeatmasterGroup.cs	Fri Feb 11 22:29:26 2011 +0000
+++ b/Hardware/Heatmaster/HeatmasterGroup.cs	Sat Feb 12 21:17:42 2011 +0000
@@ -182,10 +182,12 @@
 
     public string GetReport() {
       if (report.Length > 0) {
-        report.Insert(0, "Serial Port Heatmaster" + Environment.NewLine +
-          Environment.NewLine);
-        report.AppendLine();
-        return report.ToString();
+        StringBuilder r = new StringBuilder();
+        r.AppendLine("Serial Port Heatmaster");
+        r.AppendLine();
+        r.Append(report);
+        r.AppendLine();
+        return r.ToString();
       } else
         return null;
     }
diff -r a608358af258 -r 6dc6410489f4 Hardware/Ring0.cs
--- a/Hardware/Ring0.cs	Fri Feb 11 22:29:26 2011 +0000
+++ b/Hardware/Ring0.cs	Sat Feb 12 21:17:42 2011 +0000
@@ -168,10 +168,12 @@
 
     public static string GetReport() {
       if (report.Length > 0) {
-        report.Insert(0, "Ring0" + Environment.NewLine +
-          Environment.NewLine);
-        report.AppendLine();
-        return report.ToString();
+        StringBuilder r = new StringBuilder();
+        r.AppendLine("Ring0");
+        r.AppendLine();
+        r.Append(report);
+        r.AppendLine();
+        return r.ToString();
       } else
         return null;
     }
diff -r a608358af258 -r 6dc6410489f4 Hardware/TBalancer/TBalancerGroup.cs
--- a/Hardware/TBalancer/TBalancerGroup.cs	Fri Feb 11 22:29:26 2011 +0000
+++ b/Hardware/TBalancer/TBalancerGroup.cs	Sat Feb 12 21:17:42 2011 +0000
@@ -163,10 +163,12 @@
 
     public string GetReport() {
       if (report.Length > 0) {
-        report.Insert(0, "FTD2XX" + Environment.NewLine +
-          Environment.NewLine);
-        report.AppendLine();
-        return report.ToString();
+        StringBuilder r = new StringBuilder();
+        r.AppendLine("FTD2XX");
+        r.AppendLine();
+        r.Append(report);
+        r.AppendLine();
+        return r.ToString();
       } else
         return null;
     }