From 1867df11ceb0d238474aab538e3967427d71778f Mon Sep 17 00:00:00 2001
From: ThorstenB <brehmt@gmail.com>
Date: Mon, 9 Apr 2012 00:00:13 +0200
Subject: [PATCH] performance monitor: improve layout also change default
 measurement interval to 1 second

---
 Nasal/performance_monitor/monitor.nas | 16 ++++++++--------
 preferences.xml                       | 10 ++--------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/Nasal/performance_monitor/monitor.nas b/Nasal/performance_monitor/monitor.nas
index 235474afd..cedb6376a 100644
--- a/Nasal/performance_monitor/monitor.nas
+++ b/Nasal/performance_monitor/monitor.nas
@@ -12,16 +12,16 @@ var dialog = {
 
         # "private"
         var font = { name: "FIXED_8x13" };
-        me.header = ["  submodule", "cumulative/ms", "total/ms", "min/ms", "max/ms", "mean/ms", "stddev/ms", "iterations" ];
+        me.header = ["  submodule", "cumulative/ms", "total/ms", "max/ms", "min/ms", "mean/ms", "stddev/ms", "iterations" ];
         me.columns = [
-            { type: "text", property: "name",          format: " %s",   label: "------------------", halign: "fill", font: font },
-            { type: "text", property: "cumulative-ms", format:" %8.2f", label: "------------",       halign: "fill", font: font },
-            { type: "text", property: "total-ms",      format:" %8.2f", label: "------------",       halign: "fill", font: font },
-            { type: "text", property: "min-ms",        format: "%5.2f", label: "---------",          halign: "fill", font: font },
+            { type: "text", property: "name",          format:   " %s", label: "------------------", halign: "fill", font: font },
+            { type: "text", property: "cumulative-ms", format: "%9.2f", label: "-------------",      halign: "fill", font: font },
+            { type: "text", property: "total-ms",      format: "%6.2f", label: "----------",         halign: "fill", font: font },
             { type: "text", property: "max-ms",        format: "%5.2f", label: "---------",          halign: "fill", font: font },
-            { type: "text", property: "mean-ms",       format:" %5.2f", label: "---------",          halign: "fill", font: font },
-            { type: "text", property: "stddev-ms",     format:" %5.2f", label: "---------",          halign: "fill", font: font },
-            { type: "text", property: "count",         format:" %3d",   label: "------",             halign: "fill", font: font },
+            { type: "text", property: "min-ms",        format: "%5.2f", label: "---------",          halign: "fill", font: font },
+            { type: "text", property: "mean-ms",       format: "%5.2f", label: "---------",          halign: "fill", font: font },
+            { type: "text", property: "stddev-ms",     format: "%5.2f", label: "---------",          halign: "fill", font: font },
+            { type: "text", property: "count",         format: "%3d",   label: "------",             halign: "fill", font: font },
         ];
         me.name = "performance-monitor";
         me.dialog = nil;
diff --git a/preferences.xml b/preferences.xml
index 0d3281a10..1be374f9c 100644
--- a/preferences.xml
+++ b/preferences.xml
@@ -766,14 +766,8 @@ Started September 2000 by David Megginson, david@megginson.com
 		</user>
 
 		<performance-monitor>
-			<enabled type="bool"
-							 archive="n">false</enabled>
-			<interval-s type="double"
-									archive="n">4.0</interval-s>
-			<min-jitter-ms type="double"
-										 archive="n">0.0</min-jitter-ms>
-			<min-time-ms type="double"
-									 archive="n">100.0</min-time-ms>
+			<enabled type="bool" userarchive="n" preserve="y">false</enabled>
+			<interval-s type="double" userarchive="n" preserve="y">1.0</interval-s>
 		</performance-monitor>
 
 		<!-- animated jetway options -->