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

Timestamp:

2010-04-11T20:29:30+02:00 (15 years ago)

Author:

bastiK

Message:

• disable all filters if the filter dialog is not visible
• show the number of hidden/disabled object on screen in the upper right corner
• slightly different behaviour for showNotify and hideNotify in ToggleDialog (Now, expanding and collapsing a dialog does not trigger these notifications.)

File:

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

trunk/src/org/openstreetmap/josm/data/osm/Filters.java

@@ -1 +1 @@
 package org.openstreetmap.josm.data.osm;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trc;
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
 
 import java.util.Collection;
@@ -8 +14 @@
 import java.util.Map;
 
+import javax.swing.BorderFactory;
+import javax.swing.JLabel;
 import javax.swing.table.AbstractTableModel;
 
@@ -27 +35 @@
 
     private List<Filter> filters = new LinkedList<Filter>();
-    public void filter(){
+
+    public void executeFilters(){
         Collection<OsmPrimitive> seld = new LinkedList<OsmPrimitive> ();
         Collection<OsmPrimitive> self = new LinkedList<OsmPrimitive> ();
@@ -56 +65 @@
     }
 
-    private void loadPrefs(){
+    public void clearFilterFlags() {
+        DataSet ds = Main.main.getCurrentDataSet();
+        if (ds != null) {
+            ds.setFiltered();
+            ds.setDisabled();
+        }
+        disabledCount = 0;
+        hiddenCount = 0;
+        Main.map.mapView.repaint();
+    }
+
+
+    private void loadPrefs() {
         Map<String,String> prefs = Main.pref.getAllPrefix("filters.filter");
         for (String value : prefs.values()) {
@@ -88 +109 @@
         filters.add(f);
         savePref(filters.size()-1);
-        filter();
+        executeFilters();
         fireTableRowsInserted(filters.size()-1, filters.size()-1);
     }
@@ -97 +118 @@
         savePref(i);
         savePref(i+1);
-        filter();
+        executeFilters();
         fireTableRowsUpdated(i, i+1);
     }
@@ -106 +127 @@
         savePref(i);
         savePref(i-1);
-        filter();
+        executeFilters();
         fireTableRowsUpdated(i-1, i);
     }
@@ -113 +134 @@
         filters.remove(i);
         savePrefs();
-        filter();
+        executeFilters();
         fireTableRowsDeleted(i, i);
     }
@@ -120 +141 @@
         filters.set(i, f);
         savePref(i);
-        filter();
+        executeFilters();
         fireTableRowsUpdated(i, i);
     }
@@ -171 +192 @@
         Filter f = filters.get(row);
         switch(column){
-        case 0: f.enable = (Boolean)aValue;
-        savePref(row);
-        filter();
-        fireTableRowsUpdated(row, row);
-        break;
-        case 1: f.hide = (Boolean)aValue;
-        savePref(row);
-        filter();
-        break;
-        case 2: f.text = (String)aValue;
-        savePref(row);
-        break;
-        case 3: f.applyForChildren = (Boolean)aValue;
-        savePref(row);
-        filter();
-        break;
-        case 4: f.inverted = (Boolean)aValue;
-        savePref(row);
-        filter();
-        break;
+        case 0:
+            f.enable = (Boolean)aValue;
+            savePref(row);
+            executeFilters();
+            fireTableRowsUpdated(row, row);
+            break;
+        case 1:
+            f.hide = (Boolean)aValue;
+            savePref(row);
+            executeFilters();
+            break;
+        case 2:
+            f.text = (String)aValue;
+            savePref(row);
+            break;
+        case 3:
+            f.applyForChildren = (Boolean)aValue;
+            savePref(row);
+            executeFilters();
+            break;
+        case 4:
+            f.inverted = (Boolean)aValue;
+            savePref(row);
+            executeFilters();
+            break;
         }
         if(column!=0) {
@@ -215 +241 @@
         return null;
     }
+
+    private static class OSDLabel extends JLabel {
+        public OSDLabel(String text) {
+            super(text);
+            setOpaque(true);
+            setForeground(Color.black);
+            setBackground(new Color(0,0,0,0));
+            setFont(getFont().deriveFont(Font.PLAIN));
+            setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10));
+        }
+
+        @Override
+        public void paintComponent(Graphics g) {
+            g.setColor(new Color(255, 255, 255, 140));
+            g.fillRoundRect(getX(), getY(), getWidth(), getHeight(), 10, 10);
+            super.paintComponent(g);
+        }
+    }
+
+    private OSDLabel lblOSD = new OSDLabel("");
+
+    public void drawOSDText(Graphics2D g) {
+        String message = "<html>"+tr("<h2>Filter active</h2>");
+
+        if (disabledCount == 0 && hiddenCount == 0)
+            return;
+
+        if (hiddenCount != 0) {
+            message += tr("<p><b>{0}</b> objects hidden", hiddenCount);
+        }
+
+        if (hiddenCount != 0 && disabledCount != 0) {
+            message += "<br>";
+        }
+
+        if (disabledCount != 0) {
+            message += tr("<b>{0}</b> objects disabled", disabledCount);
+        }
+
+        message += tr("</p><p>Close the filter dialog to see all objects.<p></html>");
+
+        lblOSD.setText(message);
+        lblOSD.setSize(lblOSD.getPreferredSize());
+
+        int dx = Main.map.mapView.getWidth() - lblOSD.getPreferredSize().width - 15;
+        int dy = 15;
+        g.translate(dx, dy);
+        lblOSD.paintComponent(g);
+        g.translate(-dx, -dy);
+    }
 }