Changeset 14599 in josm for trunk/src/org

Timestamp:

2018-12-24T09:40:06+01:00 (6 years ago)

Author:

GerdP

Message:

fix #17035: Validator: Improve progress monitor (17035-progress-monitor-v2.patch)

• Each test can enable a counter that shows "{0} of {1} elements done" for the tested OSM elements. The counter is increased in steps of 1000. For now this is only enabled for MapCSSTagChecker.
• Don't show the name of the last executed test while postprocessing the results of all tests.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ValidateAction.java (modified) (1 diff)
• data/validation/Test.java (modified) (4 diffs)
• data/validation/tests/MapCSSTagChecker.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/ValidateAction.java

@@ -171 +171 @@
             tests = null;
             if (ValidatorPrefHelper.PREF_USE_IGNORE.get()) {
+                getProgressMonitor().setCustomText("");
                 getProgressMonitor().subTask(tr("Updating ignored errors ..."));
                 for (TestError error : errors) {

trunk/src/org/openstreetmap/josm/data/validation/Test.java

@@ -77 +77 @@
     protected long startTime;
 
+    private boolean showElementCount;
+
     /**
      * Constructor
@@ -203 +205 @@
             progressMonitor.setTicksCount(selection.size());
         }
+        long cnt = 0;
         for (OsmPrimitive p : selection) {
             if (isCanceled()) {
@@ -212 +215 @@
             if (progressMonitor != null) {
                 progressMonitor.worked(1);
+                cnt++;
+                // add frequently changing info to progress monitor so that it
+                // doesn't seem to hang when test takes long
+                if (showElementCount && cnt % 1000 == 0) {
+                    progressMonitor.setExtraText(tr("{0} of {1} elements done", cnt, selection.size()));
+                }
             }
         }
@@ -381 +390 @@
         errors.clear();
     }
+
+    protected void setShowElements(boolean b) {
+        showElementCount = b;
+    }
 }

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -1093 +1093 @@
     public void startTest(ProgressMonitor progressMonitor) {
         super.startTest(progressMonitor);
+        super.setShowElements(true);
         if (indexData == null) {
             indexData = new IndexData(checks);