Changeset 1277 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2009-01-17T15:01:20+01:00 (15 years ago)

Author:

ulfl

Message:

tweak profiler output

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified) (11 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java

@@ -921 +921 @@
         showIcons = Main.pref.getInteger("mappaint.showicons", 100000);
         useStrokes = Main.pref.getInteger("mappaint.strokes", 100000);
-
+        LatLon ll1 = nc.getLatLon(0,0);
+        LatLon ll2 = nc.getLatLon(100,0);
+        dist = ll1.greatCircleDistance(ll2);
+        
         long profilerStart = java.lang.System.currentTimeMillis();
         long profilerLast = profilerStart;
@@ -929 +932 @@
                 (useStyleCache ? "cache=true, " : "cache=false, ") +
                 "fillareas " + fillAreas + ", " +
-                "fillalpha=" + fillAlpha + "%)");
+                "fillalpha=" + fillAlpha + "%, " +
+                "dist=" + (int)dist + "m)");
 
         getSettings(virtual);
@@ -954 +958 @@
         profilerVisibleSegments = 0;
 
-        LatLon ll1 = nc.getLatLon(0,0);
-        LatLon ll2 = nc.getLatLon(100,0);
-        dist = ll1.greatCircleDistance(ll2);
-        System.out.format("Circum   : %4f Dist: %f\n", circum, dist);
-        
         if(profiler)
         {
-            System.out.format("Prepare  : %4dms\n", (java.lang.System.currentTimeMillis()-profilerLast));
+            System.out.format("Prepare  : %5dms\n", (java.lang.System.currentTimeMillis()-profilerLast));
             profilerLast = java.lang.System.currentTimeMillis();
         }
@@ -981 +980 @@
             if(profiler)
             {
-                System.out.format("Relations: %4dms, calls=%7d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
+                System.out.format("Relations: %5dms, calls=%7d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
                 profilerLast = java.lang.System.currentTimeMillis();
             }
@@ -1003 +1002 @@
             if(profiler)
             {
-                System.out.format("Areas    : %4dms, calls=%7d, visible=%d\n",
+                System.out.format("Areas    : %5dms, calls=%7d, visible=%d\n",
                     (java.lang.System.currentTimeMillis()-profilerLast), profilerN, profilerVisibleAreas);
                 profilerLast = java.lang.System.currentTimeMillis();
@@ -1019 +1018 @@
             if(profiler)
             {
-                System.out.format("Ways     : %4dms, calls=%7d, visible=%d\n",
+                System.out.format("Ways     : %5dms, calls=%7d, visible=%d\n",
                     (java.lang.System.currentTimeMillis()-profilerLast), profilerN, profilerVisibleWays);
                 profilerLast = java.lang.System.currentTimeMillis();
@@ -1038 +1037 @@
             if(profiler)
             {
-                System.out.format("Ways     : %4dms, calls=%7d, visible=%d\n",
+                System.out.format("Ways     : %5dms, calls=%7d, visible=%d\n",
                     (java.lang.System.currentTimeMillis()-profilerLast), profilerN, profilerVisibleWays);
                 profilerLast = java.lang.System.currentTimeMillis();
@@ -1058 +1057 @@
         if(profiler)
         {
-            System.out.format("Selected : %4dms, calls=%7d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
+            System.out.format("Selected : %5dms, calls=%7d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
             profilerLast = java.lang.System.currentTimeMillis();
         }
@@ -1077 +1076 @@
         if(profiler)
         {
-            System.out.format("Nodes    : %4dms, calls=%7d, visible=%d\n",
+            System.out.format("Nodes    : %5dms, calls=%7d, visible=%d\n",
                 (java.lang.System.currentTimeMillis()-profilerLast), profilerN, profilerVisibleNodes);
             profilerLast = java.lang.System.currentTimeMillis();
@@ -1099 +1098 @@
             if(profiler)
             {
-                System.out.format("Virtual  : %4dms, calls=%7d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
+                System.out.format("Virtual  : %5dms, calls=%7d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
                 profilerLast = java.lang.System.currentTimeMillis();
             }
@@ -1108 +1107 @@
         if(profiler)
         {
-            System.out.format("Segments :         calls=%7d, visible=%d\n", profilerSegments, profilerVisibleSegments);
-            System.out.format("All      : %4dms\n", (profilerLast-profilerStart));
+            System.out.format("Segments :          calls=%7d, visible=%d\n", profilerSegments, profilerVisibleSegments);
+            System.out.format("All      : %5dms\n", (profilerLast-profilerStart));
         }
     }