Index: trunk/src/org/openstreetmap/josm/data/osm/FilterWorker.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/FilterWorker.java (revision 3356) +++ trunk/src/org/openstreetmap/josm/data/osm/FilterWorker.java (revision 3356) @@ -0,0 +1,76 @@ +package org.openstreetmap.josm.data.osm; + +import java.util.Collection; + +/** + * + * @author Petr_Dlouhý + */ +public class FilterWorker { + /** + * Apply the filters to the primitives of the data set. + * + * There are certain rules to ensure that a way is not displayed "naked" + * without its nodes (1) and on the other hand to avoid hiding a way but + * leaving its nodes visible as a cloud of points (2). + * + * In normal (non-inverted) mode only problem (2) is relevant. + * Untagged child nodes of filtered ways that are not used by other + * unfiltered ways are filtered as well. + * + * If a filter applies explicitly to a node, (2) is ignored and it + * is filtered in any case. + * + * In inverted mode usually only problem (1) is relevant. + * If the inverted filter applies explicitly to a node, this no longer + * means it is filtered in any case: + * E.g. the filter [searchtext="highway=footway", inverted=true] displays + * the footways only. But that does not mean, the nodes of the footway + * (which do not have the highway tag) should be filtered as well. + * + * So first the Filter is applied for ways and relations. Then to nodes + * (but hides them only if they are not used by any unfiltered way). + */ + public static void executeFilters(Collection all, FilterMatcher filterMatcher) { + for (OsmPrimitive primitive: all) { + if (filterMatcher.isHidden(primitive)) { + primitive.setDisabledState(true); + } else if (filterMatcher.isDisabled(primitive)) { + primitive.setDisabledState(false); + } else { + primitive.unsetDisabledState(); + } + } + + for (OsmPrimitive primitive: all) { + if (primitive instanceof Way && primitive.isDisabled()) { + Way w = (Way)primitive; + for (Node n: w.getNodes()) { + + if (n.isTagged()) { + continue; + } + + boolean disabled = w.isDisabled(); + boolean hidden = w.isDisabledAndHidden(); + for (OsmPrimitive ref: n.getReferrers()) { + if (ref instanceof Way) { + disabled = disabled && ref.isDisabled(); + hidden = hidden && ref.isDisabledAndHidden(); + } + } + + if (disabled) { + n.setDisabledState(hidden); + } + } + } + } + } + + public static void clearFilterFlags(Collection prims) { + for (OsmPrimitive osm : prims) { + osm.unsetDisabledState(); + } + } +} Index: trunk/src/org/openstreetmap/josm/data/osm/Filters.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/Filters.java (revision 3355) +++ (revision ) @@ -1,381 +1,0 @@ -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; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import javax.swing.BorderFactory; -import javax.swing.JLabel; -import javax.swing.JOptionPane; -import javax.swing.table.AbstractTableModel; - -import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.actions.search.SearchCompiler.ParseError; - -/** - * - * @author Petr_Dlouhý - */ -public class Filters extends AbstractTableModel { - - // number of primitives that are disabled but not hidden - public int disabledCount; - // number of primitives that are disabled and hidden - public int disabledAndHiddenCount; - - public Filters() { - loadPrefs(); - } - - private final List filters = new LinkedList(); - private final FilterMatcher filterMatcher = new FilterMatcher(); - - private void updateFilters() { - try { - filterMatcher.update(filters); - executeFilters(); - } catch (ParseError e) { - JOptionPane.showMessageDialog( - Main.parent, - e.getMessage(), - tr("Error in filter"), - JOptionPane.ERROR_MESSAGE); - } - } - - - /** - * Apply the filters to the primitives of the data set. - * - * There are certain rules to ensure that a way is not displayed "naked" - * without its nodes (1) and on the other hand to avoid hiding a way but - * leaving its nodes visible as a cloud of points (2). - * - * In normal (non-inverted) mode only problem (2) is relevant. - * Untagged child nodes of filtered ways that are not used by other - * unfiltered ways are filtered as well. - * - * If a filter applies explicitly to a node, (2) is ignored and it - * is filtered in any case. - * - * In inverted mode usually only problem (1) is relevant. - * If the inverted filter applies explicitly to a node, this no longer - * means it is filtered in any case: - * E.g. the filter [searchtext="highway=footway", inverted=true] displays - * the footways only. But that does not mean, the nodes of the footway - * (which do not have the highway tag) should be filtered as well. - * - * So first the Filter is applied for ways and relations. Then to nodes - * (but hides them only if they are not used by any unfiltered way). - */ - public void executeFilters() { - DataSet ds = Main.main.getCurrentDataSet(); - if (ds == null) - return; - - final Collection all = ds.allNonDeletedCompletePrimitives(); - - for (OsmPrimitive primitive: all) { - if (filterMatcher.isHidden(primitive)) { - primitive.setDisabledState(true); - } else if (filterMatcher.isDisabled(primitive)) { - primitive.setDisabledState(false); - } else { - primitive.unsetDisabledState(); - } - } - - for (OsmPrimitive primitive: all) { - if (primitive instanceof Way && primitive.isDisabled()) { - Way w = (Way)primitive; - for (Node n: w.getNodes()) { - - if (n.isTagged()) { - continue; - } - - boolean disabled = w.isDisabled(); - boolean hidden = w.isDisabledAndHidden(); - for (OsmPrimitive ref: n.getReferrers()) { - if (ref instanceof Way) { - disabled = disabled && ref.isDisabled(); - hidden = hidden && ref.isDisabledAndHidden(); - } - } - - if (disabled) { - n.setDisabledState(hidden); - } - } - } - } - - disabledCount = 0; - disabledAndHiddenCount = 0; - // collect disabled and selected the primitives - final Collection deselect = new HashSet(); - for (OsmPrimitive osm : all) { - if (osm.isDisabled()) { - disabledCount++; - if (osm.isSelected()) { - deselect.add(osm); - } - if (osm.isDisabledAndHidden()) { - disabledAndHiddenCount++; - } - } - } - disabledCount -= disabledAndHiddenCount; - if (!deselect.isEmpty()) { - ds.clearSelection(deselect); - } - - Main.map.mapView.repaint(); - Main.map.filterDialog.updateDialogHeader(); - } - - public void clearFilterFlags() { - DataSet ds = Main.main.getCurrentDataSet(); - if (ds != null) { - for (OsmPrimitive osm : ds.allPrimitives()) { - osm.unsetDisabledState(); - } - } - disabledCount = 0; - disabledAndHiddenCount = 0; - } - - private void loadPrefs() { - Map prefs = Main.pref.getAllPrefix("filters.filter"); - for (String value : prefs.values()) { - filters.add(new Filter(value)); - } - updateFilters(); - } - - private void savePrefs() { - Map prefs = Main.pref.getAllPrefix("filters.filter"); - for (String key : prefs.keySet()) { - String[] sts = key.split("\\."); - if (sts.length != 3) - throw new Error("Incompatible filter preferences"); - Main.pref.put("filters.filter." + sts[2], null); - } - - int i = 0; - for (Filter flt : filters) { - Main.pref.put("filters.filter." + i++, flt.getPrefString()); - } - } - - private void savePref(int i) { - if (i >= filters.size()) { - Main.pref.put("filters.filter." + i, null); - } else { - Main.pref.put("filters.filter." + i, filters.get(i).getPrefString()); - } - } - - public void addFilter(Filter f) { - filters.add(f); - savePref(filters.size() - 1); - updateFilters(); - fireTableRowsInserted(filters.size() - 1, filters.size() - 1); - } - - public void moveDownFilter(int i) { - if (i >= filters.size() - 1) - return; - filters.add(i + 1, filters.remove(i)); - savePref(i); - savePref(i + 1); - updateFilters(); - fireTableRowsUpdated(i, i + 1); - } - - public void moveUpFilter(int i) { - if (i == 0) - return; - filters.add(i - 1, filters.remove(i)); - savePref(i); - savePref(i - 1); - updateFilters(); - fireTableRowsUpdated(i - 1, i); - } - - public void removeFilter(int i) { - filters.remove(i); - savePrefs(); - updateFilters(); - fireTableRowsDeleted(i, i); - } - - public void setFilter(int i, Filter f) { - filters.set(i, f); - savePref(i); - updateFilters(); - fireTableRowsUpdated(i, i); - } - - public Filter getFilter(int i) { - return filters.get(i); - } - - public int getRowCount() { - return filters.size(); - } - - public int getColumnCount() { - return 5; - } - - @Override - public String getColumnName(int column) { - String[] names = { /* translators notes must be in front */ - /* column header: enable filter */trc("filter", "E"), - /* column header: hide filter */trc("filter", "H"), - /* column header: filter text */trc("filter", "Text"), - /* column header: inverted filter */trc("filter", "I"), - /* column header: filter mode */trc("filter", "M") }; - return names[column]; - } - - @Override - public Class getColumnClass(int column) { - Class[] classes = { Boolean.class, Boolean.class, String.class, Boolean.class, String.class }; - return classes[column]; - } - - public boolean isCellEnabled(int row, int column) { - if (!filters.get(row).enable && column != 0) - return false; - return true; - } - - @Override - public boolean isCellEditable(int row, int column) { - if (!filters.get(row).enable && column != 0) - return false; - if (column < 4) - return true; - return false; - } - - @Override - public void setValueAt(Object aValue, int row, int column) { - Filter f = filters.get(row); - switch (column) { - case 0: - f.enable = (Boolean) aValue; - savePref(row); - updateFilters(); - fireTableRowsUpdated(row, row); - break; - case 1: - f.hiding = (Boolean) aValue; - savePref(row); - updateFilters(); - break; - case 2: - f.text = (String) aValue; - savePref(row); - break; - case 3: - f.inverted = (Boolean) aValue; - savePref(row); - updateFilters(); - break; - } - if (column != 0) { - fireTableCellUpdated(row, column); - } - } - - public Object getValueAt(int row, int column) { - Filter f = filters.get(row); - switch (column) { - case 0: - return f.enable; - case 1: - return f.hiding; - case 2: - return f.text; - case 3: - return f.inverted; - case 4: - switch (f.mode) { /* translators notes must be in front */ - case replace: /* filter mode: replace */ - return trc("filter", "R"); - case add: /* filter mode: add */ - return trc("filter", "A"); - case remove: /* filter mode: remove */ - return trc("filter", "D"); - case in_selection: /* filter mode: in selection */ - return trc("filter", "F"); - } - } - return null; - } - - /** - * On screen display label - */ - 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 = "" + tr("

Filter active

"); - - if (disabledCount == 0 && disabledAndHiddenCount == 0) - return; - - if (disabledAndHiddenCount != 0) { - message += tr("

{0} objects hidden", disabledAndHiddenCount); - } - - if (disabledAndHiddenCount != 0 && disabledCount != 0) { - message += "
"; - } - - if (disabledCount != 0) { - message += tr("{0} objects disabled", disabledCount); - } - - message += tr("

Close the filter dialog to see all objects.

"); - - 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); - } -} Index: trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java (revision 3355) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java (revision 3356) @@ -26,5 +26,4 @@ import org.openstreetmap.josm.actions.search.SearchAction; import org.openstreetmap.josm.data.osm.Filter; -import org.openstreetmap.josm.data.osm.Filters; import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent; import org.openstreetmap.josm.data.osm.event.DataSetListener; @@ -43,5 +42,5 @@ private JTable userTable; - private Filters filters = new Filters(); + private FilterTableModel filterModel = new FilterTableModel(); private SideButton addButton; private SideButton editButton; @@ -61,5 +60,5 @@ public void showNotify() { DatasetEventManager.getInstance().addDatasetListener(listenerAdapter, FireMode.IN_EDT_CONSOLIDATED); - filters.executeFilters(); + filterModel.executeFilters(); } @@ -67,5 +66,5 @@ public void hideNotify() { DatasetEventManager.getInstance().removeDatasetListener(listenerAdapter); - filters.clearFilterFlags(); + filterModel.clearFilterFlags(); Main.map.mapView.repaint(); } @@ -79,5 +78,5 @@ Filter filter = (Filter)SearchAction.showSearchDialog(new Filter()); if(filter != null){ - filters.addFilter(filter); + filterModel.addFilter(filter); } } @@ -90,8 +89,8 @@ int index = userTable.getSelectionModel().getMinSelectionIndex(); if(index < 0) return; - Filter f = filters.getFilter(index); + Filter f = filterModel.getFilter(index); Filter filter = (Filter)SearchAction.showSearchDialog(f); if(filter != null){ - filters.setFilter(index, filter); + filterModel.setFilter(index, filter); } } @@ -104,5 +103,5 @@ int index = userTable.getSelectionModel().getMinSelectionIndex(); if(index < 0) return; - filters.removeFilter(index); + filterModel.removeFilter(index); } }); @@ -114,5 +113,5 @@ int index = userTable.getSelectionModel().getMinSelectionIndex(); if(index < 0) return; - filters.moveUpFilter(index); + filterModel.moveUpFilter(index); userTable.getSelectionModel().setSelectionInterval(index-1, index-1); } @@ -125,5 +124,5 @@ int index = userTable.getSelectionModel().getMinSelectionIndex(); if(index < 0) return; - filters.moveDownFilter(index); + filterModel.moveDownFilter(index); userTable.getSelectionModel().setSelectionInterval(index+1, index+1); } @@ -144,5 +143,5 @@ JPanel pnl = new JPanel(); pnl.setLayout(new BorderLayout()); - userTable = new JTable(filters){ + userTable = new JTable(filterModel){ @Override protected JTableHeader createDefaultTableHeader() { @@ -183,5 +182,5 @@ public void processDatasetEvent(AbstractDatasetChangedEvent event) { - filters.executeFilters(); + filterModel.executeFilters(); } @@ -189,5 +188,5 @@ @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,int row,int column) { - Filters model = (Filters)table.getModel(); + FilterTableModel model = (FilterTableModel)table.getModel(); Component cell = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); cell.setEnabled(model.isCellEnabled(row, column)); @@ -198,5 +197,5 @@ static class BooleanRenderer extends JCheckBox implements TableCellRenderer { public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,int row,int column) { - Filters model = (Filters)table.getModel(); + FilterTableModel model = (FilterTableModel)table.getModel(); setSelected((Boolean)value); setEnabled(model.isCellEnabled(row, column)); @@ -209,5 +208,5 @@ SwingUtilities.invokeLater(new Runnable() { public void run() { - setTitle(tr("Filter Hidden:{0} Disabled:{1}", filters.disabledAndHiddenCount, filters.disabledCount)); + setTitle(tr("Filter Hidden:{0} Disabled:{1}", filterModel.disabledAndHiddenCount, filterModel.disabledCount)); } }); @@ -215,5 +214,5 @@ public void drawOSDText(Graphics2D g) { - filters.drawOSDText(g); + filterModel.drawOSDText(g); } } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java (revision 3356) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java (revision 3356) @@ -0,0 +1,328 @@ +package org.openstreetmap.josm.gui.dialogs; + +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; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +import javax.swing.BorderFactory; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.table.AbstractTableModel; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.search.SearchCompiler.ParseError; +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.Filter; +import org.openstreetmap.josm.data.osm.FilterMatcher; +import org.openstreetmap.josm.data.osm.FilterWorker; +import org.openstreetmap.josm.data.osm.OsmPrimitive; + +/** + * + * @author Petr_Dlouhý + */ +public class FilterTableModel extends AbstractTableModel { + + // number of primitives that are disabled but not hidden + public int disabledCount; + // number of primitives that are disabled and hidden + public int disabledAndHiddenCount; + + public FilterTableModel() { + loadPrefs(); + } + + private final List filters = new LinkedList(); + private final FilterMatcher filterMatcher = new FilterMatcher(); + + private void updateFilters() { + try { + filterMatcher.update(filters); + executeFilters(); + } catch (ParseError e) { + JOptionPane.showMessageDialog( + Main.parent, + e.getMessage(), + tr("Error in filter"), + JOptionPane.ERROR_MESSAGE); + } + } + + + + public void executeFilters() { + DataSet ds = Main.main.getCurrentDataSet(); + if (ds == null) + return; + + final Collection all = ds.allNonDeletedCompletePrimitives(); + + FilterWorker.executeFilters(all, filterMatcher); + + disabledCount = 0; + disabledAndHiddenCount = 0; + // collect disabled and selected the primitives + final Collection deselect = new HashSet(); + for (OsmPrimitive osm : all) { + if (osm.isDisabled()) { + disabledCount++; + if (osm.isSelected()) { + deselect.add(osm); + } + if (osm.isDisabledAndHidden()) { + disabledAndHiddenCount++; + } + } + } + disabledCount -= disabledAndHiddenCount; + if (!deselect.isEmpty()) { + ds.clearSelection(deselect); + } + + Main.map.mapView.repaint(); + Main.map.filterDialog.updateDialogHeader(); + } + + public void clearFilterFlags() { + DataSet ds = Main.main.getCurrentDataSet(); + if (ds != null) { + FilterWorker.clearFilterFlags(ds.allPrimitives()); + } + disabledCount = 0; + disabledAndHiddenCount = 0; + } + + private void loadPrefs() { + Map prefs = Main.pref.getAllPrefix("filters.filter"); + for (String value : prefs.values()) { + filters.add(new Filter(value)); + } + updateFilters(); + } + + private void savePrefs() { + Map prefs = Main.pref.getAllPrefix("filters.filter"); + for (String key : prefs.keySet()) { + String[] sts = key.split("\\."); + if (sts.length != 3) + throw new Error("Incompatible filter preferences"); + Main.pref.put("filters.filter." + sts[2], null); + } + + int i = 0; + for (Filter flt : filters) { + Main.pref.put("filters.filter." + i++, flt.getPrefString()); + } + } + + private void savePref(int i) { + if (i >= filters.size()) { + Main.pref.put("filters.filter." + i, null); + } else { + Main.pref.put("filters.filter." + i, filters.get(i).getPrefString()); + } + } + + public void addFilter(Filter f) { + filters.add(f); + savePref(filters.size() - 1); + updateFilters(); + fireTableRowsInserted(filters.size() - 1, filters.size() - 1); + } + + public void moveDownFilter(int i) { + if (i >= filters.size() - 1) + return; + filters.add(i + 1, filters.remove(i)); + savePref(i); + savePref(i + 1); + updateFilters(); + fireTableRowsUpdated(i, i + 1); + } + + public void moveUpFilter(int i) { + if (i == 0) + return; + filters.add(i - 1, filters.remove(i)); + savePref(i); + savePref(i - 1); + updateFilters(); + fireTableRowsUpdated(i - 1, i); + } + + public void removeFilter(int i) { + filters.remove(i); + savePrefs(); + updateFilters(); + fireTableRowsDeleted(i, i); + } + + public void setFilter(int i, Filter f) { + filters.set(i, f); + savePref(i); + updateFilters(); + fireTableRowsUpdated(i, i); + } + + public Filter getFilter(int i) { + return filters.get(i); + } + + public int getRowCount() { + return filters.size(); + } + + public int getColumnCount() { + return 5; + } + + @Override + public String getColumnName(int column) { + String[] names = { /* translators notes must be in front */ + /* column header: enable filter */trc("filter", "E"), + /* column header: hide filter */trc("filter", "H"), + /* column header: filter text */trc("filter", "Text"), + /* column header: inverted filter */trc("filter", "I"), + /* column header: filter mode */trc("filter", "M") }; + return names[column]; + } + + @Override + public Class getColumnClass(int column) { + Class[] classes = { Boolean.class, Boolean.class, String.class, Boolean.class, String.class }; + return classes[column]; + } + + public boolean isCellEnabled(int row, int column) { + if (!filters.get(row).enable && column != 0) + return false; + return true; + } + + @Override + public boolean isCellEditable(int row, int column) { + if (!filters.get(row).enable && column != 0) + return false; + if (column < 4) + return true; + return false; + } + + @Override + public void setValueAt(Object aValue, int row, int column) { + Filter f = filters.get(row); + switch (column) { + case 0: + f.enable = (Boolean) aValue; + savePref(row); + updateFilters(); + fireTableRowsUpdated(row, row); + break; + case 1: + f.hiding = (Boolean) aValue; + savePref(row); + updateFilters(); + break; + case 2: + f.text = (String) aValue; + savePref(row); + break; + case 3: + f.inverted = (Boolean) aValue; + savePref(row); + updateFilters(); + break; + } + if (column != 0) { + fireTableCellUpdated(row, column); + } + } + + public Object getValueAt(int row, int column) { + Filter f = filters.get(row); + switch (column) { + case 0: + return f.enable; + case 1: + return f.hiding; + case 2: + return f.text; + case 3: + return f.inverted; + case 4: + switch (f.mode) { /* translators notes must be in front */ + case replace: /* filter mode: replace */ + return trc("filter", "R"); + case add: /* filter mode: add */ + return trc("filter", "A"); + case remove: /* filter mode: remove */ + return trc("filter", "D"); + case in_selection: /* filter mode: in selection */ + return trc("filter", "F"); + } + } + return null; + } + + /** + * On screen display label + */ + 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 = "" + tr("

Filter active

"); + + if (disabledCount == 0 && disabledAndHiddenCount == 0) + return; + + if (disabledAndHiddenCount != 0) { + message += tr("

{0} objects hidden", disabledAndHiddenCount); + } + + if (disabledAndHiddenCount != 0 && disabledCount != 0) { + message += "
"; + } + + if (disabledCount != 0) { + message += tr("{0} objects disabled", disabledCount); + } + + message += tr("

Close the filter dialog to see all objects.

"); + + 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); + } +}