Changeset 2120 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2009-09-13T22:23:19+02:00 (15 years ago)

Author:

stoecker

Message:

see #3475 - patch by Petr Dlouhý - code rework for display filtering

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• DataSet.java (modified) (2 diffs)
• OsmPrimitive.java (modified) (29 diffs)
• visitor/MapPaintVisitor.java (modified) (8 diffs)
• visitor/SimplePaintVisitor.java (modified) (8 diffs)

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

@@ -184 +184 @@
     }
 
+    public void setFiltered(Collection<? extends OsmPrimitive> selection) {
+        clearFiltered(nodes);
+        clearFiltered(ways);
+        clearFiltered(relations);
+        for (OsmPrimitive osm : selection) {
+            osm.setFiltered(true);
+        }
+    }
+
+    public void setFiltered(OsmPrimitive... osm) {
+        if (osm.length == 1 && osm[0] == null) {
+            setFiltered();
+            return;
+        }
+        clearFiltered(nodes);
+        clearFiltered(ways);
+        clearFiltered(relations);
+        for (OsmPrimitive o : osm)
+            if (o != null) {
+                o.setFiltered(true);
+            }
+    }
+
+    public void setDisabled(Collection<? extends OsmPrimitive> selection) {
+        clearDisabled(nodes);
+        clearDisabled(ways);
+        clearDisabled(relations);
+        for (OsmPrimitive osm : selection) {
+            osm.setDisabled(true);
+        }
+    }
+
+    public void setDisabled(OsmPrimitive... osm) {
+        if (osm.length == 1 && osm[0] == null) {
+            setDisabled();
+            return;
+        }
+        clearDisabled(nodes);
+        clearDisabled(ways);
+        clearDisabled(relations);
+        for (OsmPrimitive o : osm)
+            if (o != null) {
+                o.setDisabled(true);
+            }
+    }
+
     public void setSelected(Collection<? extends OsmPrimitive> selection) {
         clearSelection(nodes);
@@ -207 +253 @@
             }
         fireSelectionChanged(Arrays.asList(osm));
+    }
+
+    /**
+     * Remove the filtered parameter from every value in the collection.
+     * @param list The collection to remove the filtered parameter from.
+     */
+    private void clearFiltered(Collection<? extends OsmPrimitive> list) {
+        if (list == null)
+            return;
+        for (OsmPrimitive osm : list) {
+            osm.setFiltered(false);
+        }
+    }
+    /**
+     * Remove the disabled parameter from every value in the collection.
+     * @param list The collection to remove the disabled parameter from.
+     */
+    private void clearDisabled(Collection<? extends OsmPrimitive> list) {
+        if (list == null)
+            return;
+        for (OsmPrimitive osm : list) {
+            osm.setDisabled(false);
+        }
     }
 

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

@@ -96 +96 @@
      * new to the server! To create a new object, call the default constructor of
      * the respective class.
-     * 
+     *
      */
     private long id = 0;
@@ -105 +105 @@
      * Deleted objects are deleted from the server. If the objects are added (id=0),
      * the modified is ignored and the object is added to the server.
-     * 
+     *
      */
     private boolean modified = false;
@@ -111 +111 @@
     /**
      * <code>true</code>, if the object has been deleted.
-     * 
+     *
      */
     private boolean deleted = false;
@@ -119 +119 @@
      * introduced with the 0.4 API to be able to communicate deleted objects
      * (they will have visible=false).
-     * 
+     *
      */
     private boolean visible = true;
+
+    /**
+     * <code>true</code>, if the object has been set inactive
+     *
+     */
+    private boolean disabled = false;
+
+    /**
+     * <code>true</code>, if the object has been filtered out
+     *
+     */
+    private boolean filtered = false;
 
     /**
@@ -131 +143 @@
     /**
      * If set to true, this object is currently selected.
-     * 
+     *
      */
     private volatile boolean selected = false;
@@ -149 +161 @@
     /**
      * Creates a new primitive with id 0.
-     * 
+     *
      */
     public OsmPrimitive() {
@@ -158 +170 @@
      * Creates a new primitive for the given id. If the id > 0, the primitive is marked
      * as incomplete.
-     * 
+     *
      * @param id the id. > 0 required
      * @throws IllegalArgumentException thrown if id < 0
@@ -173 +185 @@
     /* accessors                                                                            */
     /* ------------------------------------------------------------------------------------ */
+    /**
+     * Sets whether this primitive is disabled or not.
+     *
+     * @param selected  true, if this primitive is disabled; false, otherwise
+     */
+    public void setDisabled(boolean disabled) {
+        this.disabled = disabled;
+    }
+
+    /**
+     * Replies true, if this primitive is disabled.
+     *
+     * @return true, if this primitive is disabled
+     */
+    public boolean isDisabled() {
+        return disabled;
+    }
+    /**
+     * Sets whether this primitive is filtered out or not.
+     *
+     * @param selected  true, if this primitive is filtered out; false, otherwise
+     */
+    public void setFiltered(boolean filtered) {
+        this.filtered = filtered;
+    }
+    /**
+     * Replies true, if this primitive is filtered out.
+     *
+     * @return true, if this primitive is filtered out
+     */
+    public boolean isFiltered() {
+        return filtered;
+    }
 
     /**
      * Sets whether this primitive is selected or not.
-     * 
+     *
      * @param selected  true, if this primitive is selected; false, otherwise
      * @since 1899
@@ -185 +230 @@
     /**
      * Replies true, if this primitive is selected.
-     * 
+     *
      * @return true, if this primitive is selected
      * @since 1899
@@ -195 +240 @@
     /**
      * Marks this primitive as being modified.
-     * 
+     *
      * @param modified true, if this primitive is to be modified
      */
@@ -205 +250 @@
      * Replies <code>true</code> if the object has been modified since it was loaded from
      * the server. In this case, on next upload, this object will be updated.
-     * 
+     *
      * @return <code>true</code> if the object has been modified since it was loaded from
      * the server
@@ -230 +275 @@
      */
     public boolean isUsable() {
-        return !deleted && !incomplete;
+        return !deleted && !incomplete && !disabled;
     }
 
@@ -238 +283 @@
      * Replies false, if this primitive is known on the server and has been deleted
      * on the server.
-     * 
+     *
      * @see #setVisible(boolean)
      */
@@ -248 +293 @@
      * Sets whether this primitive is visible, i.e. whether it is known on the server
      * and not deleted on the server.
-     * 
+     *
      * @see #isVisible()
      * @throws IllegalStateException thrown if visible is set to false on an primitive with
@@ -262 +307 @@
      * Replies the version number as returned by the API. The version is 0 if the id is 0 or
      * if this primitive is incomplete.
-     * 
+     *
      * @see #setVersion(int)
      */
@@ -271 +316 @@
     /**
      * Replies the id of this primitive.
-     * 
+     *
      * @return the id of this primitive.
      */
@@ -280 +325 @@
     /**
      * Sets the id and the version of this primitive if it is known to the OSM API.
-     * 
+     *
      * Since we know the id and its version it can't be incomplete anymore. incomplete
      * is set to false.
-     * 
+     *
      * @param id the id. > 0 required
      * @param version the version > 0 required
@@ -302 +347 @@
      * Clears the id and version known to the OSM API. The id and the version is set to 0.
      * incomplete is set to false.
-     * 
+     *
      * <strong>Caution</strong>: Do not use this method on primitives which are already added to a {@see DataSet}.
      * Ways and relations might already refer to the primitive and clearing the OSM ID
      * result in corrupt data.
-     * 
+     *
      * Here's an example use case:
      * <pre>
      *     // create a clone of an already existing node
      *     Node copy = new Node(otherExistingNode);
-     * 
+     *
      *     // reset the clones OSM id
      *     copy.clearOsmId();
      * </pre>
-     * 
+     *
      */
     public void clearOsmId() {
@@ -388 +433 @@
     /**
      * Sets whether this primitive is deleted or not.
-     * 
+     *
      * Also marks this primitive as modified if deleted is true and sets selected to false.
-     * 
+     *
      * @param deleted  true, if this primitive is deleted; false, otherwise
      */
@@ -442 +487 @@
     /**
      * Replies the map of key/value pairs. Never replies null. The map can be empty, though.
-     * 
+     *
      * @return Keys of this primitive. Changes made in returned map are not mapped
      * back to the primitive, use setKeys() to modify the keys
@@ -459 +504 @@
      * Sets the keys of this primitives to the key/value pairs in <code>keys</code>.
      * If <code>keys</code> is null removes all existing key/value pairs.
-     * 
+     *
      * @param keys the key/value pairs to set. If null, removes all existing key/value pairs.
      * @since 1924
@@ -474 +519 @@
      * Set the given value to the given key. If key is null, does nothing. If value is null,
      * removes the key and behaves like {@see #remove(String)}.
-     * 
+     *
      * @param key  The key, for which the value is to be set. Can be null, does nothing in this case.
      * @param value The value for the key. If null, removes the respective key/value pair.
-     * 
+     *
      * @see #remove(String)
      */
@@ -495 +540 @@
     /**
      * Remove the given key from the list
-     * 
+     *
      * @param key  the key to be removed. Ignored, if key is null.
      */
@@ -510 +555 @@
     /**
      * Removes all keys from this primitive.
-     * 
+     *
      * @since 1843
      */
@@ -521 +566 @@
      * Replies the value for key <code>key</code>. Replies null, if <code>key</code> is null.
      * Replies null, if there is no value for the given key.
-     * 
+     *
      * @param key the key. Can be null, replies null in this case.
      * @return the value for key <code>key</code>.
@@ -544 +589 @@
     /**
      * Replies true, if the map of key/value pairs of this primitive is not empty.
-     * 
+     *
      * @return true, if the map of key/value pairs of this primitive is not empty; false
      *   otherwise
-     * 
+     *
      * @since 1843
      */
@@ -656 +701 @@
      * Replies the name of this primitive. The default implementation replies the value
      * of the tag <tt>name</tt> or null, if this tag is not present.
-     * 
+     *
      * @return the name of this primitive
      */
@@ -673 +718 @@
      *   <li>name of the current locale</li>
      * </ul>
-     * 
+     *
      * null, if no such tag exists
-     * 
+     *
      * @return the name of this primitive
      */
@@ -693 +738 @@
     /**
      * Replies the display name of a primitive formatted by <code>formatter</code>
-     * 
+     *
      * @return the display name
      */

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

@@ -159 +159 @@
         } else if (n.isTagged()) {
             drawNode(n, nodeColor, taggedNodeSize, taggedNodeRadius, fillUnselectedNode);
+        } else if (n.isDisabled()) {
+            drawNode(n, inactiveColor, unselectedNodeSize, unselectedNodeRadius, fillUnselectedNode);
         } else {
             drawNode(n, nodeColor, unselectedNodeSize, unselectedNodeRadius, fillUnselectedNode);
@@ -307 +309 @@
         } else if(w.isSelected()) {
             color = selectedColor;
+        } else if(w.isDisabled()) {
+            color = inactiveColor;
         }
 
@@ -530 +534 @@
             for (RelationMember m : r.getMembers())
             {
-                if (m.isNode() && !m.getMember().incomplete && !m.getMember().isDeleted())
+                if (m.isNode() && !m.getMember().incomplete && !m.getMember().isDeleted() && !m.getMember().isFiltered())
                 {
                     drawSelectedMember(m.getMember(), styles != null ? getPrimitiveStyle(m.getMember()) : null, true, true);
@@ -1395 +1399 @@
             for (final Relation osm : data.relations)
             {
-                if(!osm.isDeleted() && !osm.incomplete && osm.mappaintVisibleCode != viewid)
+                if(!osm.isDeleted() && !osm.isFiltered() && !osm.incomplete && osm.mappaintVisibleCode != viewid)
                 {
                     osm.visit(this);
@@ -1412 +1416 @@
             for (final Way osm : data.ways)
             {
-                if (!osm.incomplete && !osm.isDeleted()
+                if (!osm.incomplete && !osm.isDeleted() && !osm.isFiltered()
                         && osm.mappaintVisibleCode != viewid && osm.mappaintDrawnCode != paintid)
                 {
@@ -1453 +1457 @@
             //    profilerN = 0;
             for (final OsmPrimitive osm : data.ways)
-                if (!osm.incomplete && !osm.isDeleted() && !osm.isSelected()
+                if (!osm.incomplete && !osm.isDeleted() && !osm.isFiltered() && !osm.isSelected()
                         && osm.mappaintVisibleCode != viewid )
                 {
@@ -1492 +1496 @@
         //profilerN = 0;
         for (final OsmPrimitive osm : data.nodes)
-            if (!osm.incomplete && !osm.isDeleted()
+            if (!osm.incomplete && !osm.isDeleted() && (osm.isSelected() || !osm.isFiltered())
                     && osm.mappaintVisibleCode != viewid && osm.mappaintDrawnCode != paintid)
             {
@@ -1512 +1516 @@
             currentColor = nodeColor;
             for (final OsmPrimitive osm : data.ways)
-                if (!osm.incomplete && !osm.isDeleted()
+                if (osm.isUsable() && !osm.isFiltered()
                         && osm.mappaintVisibleCode != viewid )
                 {

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

@@ -149 +149 @@
         //profilerN = 0;
         for (final OsmPrimitive osm : data.relations)
-            if (!osm.isDeleted() && !osm.isSelected())
+            if (!osm.isDeleted() && !osm.isSelected() && !osm.isFiltered())
             {
                 osm.visit(this);
@@ -163 +163 @@
         //profilerN = 0;
         for (final OsmPrimitive osm : data.ways)
-            if (!osm.isDeleted() && !osm.isSelected() && osm.isTagged())
+            if (!osm.isDeleted() && !osm.isSelected() && !osm.isFiltered() && osm.isTagged())
             {
                 osm.visit(this);
@@ -171 +171 @@
 
         for (final OsmPrimitive osm : data.ways)
-            if (!osm.isDeleted() && !osm.isSelected() && !osm.isTagged())
+            if (!osm.isDeleted() && !osm.isSelected() && !osm.isFiltered() && !osm.isTagged())
             {
                 osm.visit(this);
@@ -202 +202 @@
         //profilerN = 0;
         for (final OsmPrimitive osm : data.nodes)
-            if (!osm.isDeleted() && !osm.isSelected())
+            if (!osm.isDeleted() && !osm.isSelected() && !osm.isFiltered())
             {
                 osm.visit(this);
@@ -220 +220 @@
             currentColor = nodeColor;
             for (final OsmPrimitive osm : data.ways)
-                if (!osm.isDeleted())
+                if (!osm.isDeleted() && !osm.isDisabled() && !osm.isFiltered())
                 {
                     visitVirtual((Way)osm);
@@ -249 +249 @@
         if (n.incomplete) return;
 
-        if (inactive) {
+        if (inactive || n.isDisabled()) {
             drawNode(n, inactiveColor, unselectedNodeSize, unselectedNodeRadius, fillUnselectedNode);
         } else if (n.highlighted) {
@@ -312 +312 @@
         Color wayColor;
 
-        if (inactive) {
+        if (inactive || w.isDisabled()) {
             wayColor = inactiveColor;
         } else if(w.highlighted) {
@@ -345 +345 @@
 
         Color col;
-        if (inactive) {
+        if (inactive || r.isDisabled()) {
             col = inactiveColor;
         } else if (r.isSelected()) {