Changeset 1281 in josm for trunk/src/org

Timestamp:

2009-01-17T19:26:41+01:00 (16 years ago)

Author:

ulfl

Message:

add setIndeterminate() to the PleaseWaitDialog and use it at a few places
add some more user feedback for task long running on huge data

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/PleaseWaitDialog.java (modified) (1 diff)
• gui/layer/OsmDataLayer.java (modified) (1 diff)
• io/BoundingBoxDownloader.java (modified) (1 diff)
• io/OsmReader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java

@@ -50 +50 @@
         });
     }
+    
+    public void setIndeterminate(boolean newValue) {
+        progressBar.setIndeterminate(newValue);
+    }
 }

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -222 +222 @@
     @Override public void mergeFrom(final Layer from) {
         final MergeVisitor visitor = new MergeVisitor(data,((OsmDataLayer)from).data);
-        for (final OsmPrimitive osm : ((OsmDataLayer)from).data.allPrimitives())
+        int i=0;
+        int max = ((OsmDataLayer)from).data.allPrimitives().size();
+
+        System.out.format("Add/Merge data:");
+        
+        for (final OsmPrimitive osm : ((OsmDataLayer)from).data.allPrimitives()) {
+            i++;
+            if(i%100 == 0) {
+                double perc = (((double)i) / ((double)max) * 100.0);
+                System.out.format(" " + (int)perc + "%%");
+            }
             osm.visit(visitor);
+        }
         visitor.fixReferences();
+        System.out.println("");
 
         // copy the merged layer's data source info

trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java

@@ -93 +93 @@
             Main.pleaseWaitDlg.progress.setValue(0);
             Main.pleaseWaitDlg.currentAction.setText(tr("Contacting OSM Server..."));
+            Main.pleaseWaitDlg.setIndeterminate(true); 
             final InputStream in = getInputStream("map?bbox="+lon1+","+lat1+","+lon2+","+lat2, Main.pleaseWaitDlg);
+            Main.pleaseWaitDlg.setIndeterminate(false); 
             if (in == null)
                 return null;

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -501 +501 @@
              throw new SAXException(e1);
         }
+            
+          Main.pleaseWaitDlg.currentAction.setText(tr("Prepare OSM data..."));
+          Main.pleaseWaitDlg.setIndeterminate(true); 
 
           System.out.println("");
@@ -522 +525 @@
                     o.id = 0;
 
-          System.out.println("File loaded!");
+          System.out.println("Data loaded!");
+          Main.pleaseWaitDlg.setIndeterminate(false); 
+          Main.pleaseWaitDlg.progress.setValue(0); 
           
           return osm;