Changeset 1272 in josm for trunk

Timestamp:

2009-01-17T10:53:39+01:00 (15 years ago)

Author:

ulfl

Message:

tweak profiler output
comment out unused getColors()

File:

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

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

@@ -121 +121 @@
         }
         n.mappaintVisibleCode = 0;
-
-        profilerVisibleNodes++;
 
         IconElemStyle nodeStyle = (IconElemStyle)getPrimitiveStyle(n);
@@ -753 +751 @@
         Point p = nc.getPoint(n.eastNorth);
         if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth()) || (p.y > nc.getHeight())) return;
+
+        profilerVisibleNodes++;
+
         int w = icon.getIconWidth(), h=icon.getIconHeight();
         icon.paintIcon ( Main.map.mapView, g, p.x-w/2, p.y-h/2 );
@@ -846 +847 @@
                     || (p.y > nc.getHeight()))
                 return;
+
+            profilerVisibleNodes++;
+
             g.setColor(color);
             if (fill) {
@@ -868 +872 @@
     }
 
-    public void getColors()
+    /*public void getColors()
     {
         super.getColors();
         untaggedColor = Main.pref.getColor(marktr("untagged"),Color.GRAY);
         textColor = Main.pref.getColor (marktr("text"), Color.WHITE);
-    }
+    }*/
 
     // Shows areas before non-areas
@@ -944 +948 @@
             if(profiler)
             {
-                System.out.format("Relations: %4dms, calls=%5d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
+                System.out.format("Relations: %4dms, calls=%7d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
                 profilerLast = java.lang.System.currentTimeMillis();
             }
@@ -966 +970 @@
             if(profiler)
             {
-                System.out.format("Areas    : %4dms, calls=%5d, visible=%d\n",
+                System.out.format("Areas    : %4dms, calls=%7d, visible=%d\n",
                     (java.lang.System.currentTimeMillis()-profilerLast), profilerN, profilerVisibleAreas);
                 profilerLast = java.lang.System.currentTimeMillis();
@@ -982 +986 @@
             if(profiler)
             {
-                System.out.format("Ways     : %4dms, calls=%5d, visible=%d\n",
+                System.out.format("Ways     : %4dms, calls=%7d, visible=%d\n",
                     (java.lang.System.currentTimeMillis()-profilerLast), profilerN, profilerVisibleWays);
                 profilerLast = java.lang.System.currentTimeMillis();
@@ -1001 +1005 @@
             if(profiler)
             {
-                System.out.format("Ways     : %4dms, calls=%5d, visible=%d\n",
+                System.out.format("Ways     : %4dms, calls=%7d, visible=%d\n",
                     (java.lang.System.currentTimeMillis()-profilerLast), profilerN, profilerVisibleWays);
                 profilerLast = java.lang.System.currentTimeMillis();
@@ -1021 +1025 @@
         if(profiler)
         {
-            System.out.format("Selected : %4dms, calls=%5d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
+            System.out.format("Selected : %4dms, calls=%7d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
             profilerLast = java.lang.System.currentTimeMillis();
         }
@@ -1045 +1049 @@
         if(profiler)
         {
-            System.out.format("Nodes    : %4dms, calls=%5d, visible=%d\n",
+            System.out.format("Nodes    : %4dms, calls=%7d, visible=%d\n",
                 (java.lang.System.currentTimeMillis()-profilerLast), profilerN, profilerVisibleNodes);
             profilerLast = java.lang.System.currentTimeMillis();
@@ -1067 +1071 @@
             if(profiler)
             {
-                System.out.format("Virtual  : %4dms, calls=%5d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
+                System.out.format("Virtual  : %4dms, calls=%7d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
                 profilerLast = java.lang.System.currentTimeMillis();
             }
@@ -1081 +1085 @@
         if(profiler)
         {
-            System.out.format("Segments :         calls=%5d, visible=%d\n", profilerSegments, profilerVisibleSegments);
+            System.out.format("Segments :         calls=%7d, visible=%d\n", profilerSegments, profilerVisibleSegments);
             System.out.format("All      : %4dms\n", (profilerLast-profilerStart));
         }