Changeset 17890 in josm for trunk

Timestamp:

2021-05-13T00:19:28+02:00 (4 years ago)

Author:

simon04

Message:

fix #20880 - History browser: show color gutter based on timestamp

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (modified) (6 diffs)
• src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/history/TagTableModel.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/history/VersionTableModel.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/history/HistoryBrowserModelTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Color;
 import java.util.HashSet;
 import java.util.Objects;
@@ -44 +45 @@
 import org.openstreetmap.josm.gui.util.ChangeNotifier;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.ColorScale;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -89 +91 @@
     private final DiffTableModel referenceNodeListTableModel;
     private final DiffTableModel currentNodeListTableModel;
+    private final ColorScale dateScale;
 
     /**
@@ -101 +104 @@
         currentRelationMemberTableModel = new DiffTableModel();
         referenceRelationMemberTableModel = new DiffTableModel();
+        dateScale = ColorScale.createHSBScale(256);
 
         DataSet ds = MainApplication.getLayerManager().getActiveDataSet();
@@ -193 +197 @@
             setLatest(newLatest);
         }
+        if (!history.isEmpty()) {
+            this.dateScale.setRange(
+                    history.getEarliest().getInstant().toEpochMilli(),
+                    history.getLatest().getInstant().toEpochMilli());
+        }
         initTagTableModels();
         fireModelChange();
@@ -689 +698 @@
     }
 
+    /**
+     * Returns the color for the primitive in the given row
+     * @param row row number
+     * @return the color for the primitive in the given row
+     */
+    public Color getVersionColor(int row) {
+        HistoryOsmPrimitive primitive = getPrimitive(row);
+        return primitive != null && primitive.getInstant() != null ? getVersionColor(primitive) : null;
+    }
+
+    /**
+     * Returns the color for the given primitive timestamp
+     * @param primitive the history primitive
+     * @return the color for the given primitive timestamp
+     */
+    public Color getVersionColor(HistoryOsmPrimitive primitive) {
+        return dateScale.getColor(primitive.getInstant().toEpochMilli());
+    }
 }

trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java

@@ -5 +5 @@
 import java.awt.Component;
 
+import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 import javax.swing.JTable;
@@ -48 +49 @@
         String text = "";
         String tooltip = null;
+        setBorder(null);
         if (model.hasTag(key)) {
             switch(column) {
@@ -63 +65 @@
                     text = "v" + primitive.getVersion();
                     tooltip = tr("Key ''{0}'' was changed in version {1}", key, primitive.getVersion());
+                    setBorder(BorderFactory.createMatteBorder(0, 0, 0, 2, model.getVersionColor(primitive)));
                 }
             default: // Do nothing

trunk/src/org/openstreetmap/josm/gui/history/TagTableModel.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.history;
 
+import java.awt.Color;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -96 +97 @@
 
     /**
+     * Returns the color for the given primitive timestamp
+     * @param primitive the history primitive
+     * @return the color for the given primitive timestamp
+     */
+    public Color getVersionColor(HistoryOsmPrimitive primitive) {
+        return model.getVersionColor(primitive);
+    }
+
+    /**
      * Determines if a tag exists in the opposite point in time for the given key.
      * @param key tag key

trunk/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.history;
 
+import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 import javax.swing.JTable;
 import javax.swing.SwingConstants;
 import javax.swing.table.TableCellRenderer;
+import java.awt.Color;
 import java.awt.Component;
 
@@ -28 +30 @@
         }
         setText(v);
+        Color color = ((VersionTableModel) table.getModel()).getVersionColor(row);
+        if (color != null) {
+            setBorder(BorderFactory.createMatteBorder(0, 2, 0, 0, color));
+        } else {
+            setBorder(null);
+        }
         return this;
     }

trunk/src/org/openstreetmap/josm/gui/history/VersionTableModel.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.history;
 
+import java.awt.Color;
 import java.time.format.FormatStyle;
 
@@ -78 +79 @@
     }
 
+    /**
+     * Returns the color for the primitive in the given row
+     * @param row row number
+     * @return the color for the primitive in the given row
+     */
+    public Color getVersionColor(int row) {
+        return model.getVersionColor(row);
+    }
+
     @Override
     public void setValueAt(Object aValue, int row, int column) {

trunk/test/unit/org/openstreetmap/josm/gui/history/HistoryBrowserModelTest.java

@@ -20 +20 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+import java.awt.Color;
 
 /**
@@ -172 +174 @@
         assertEquals(1, model.getRelationMemberTableModel(PointInTimeType.REFERENCE_POINT_IN_TIME).getRowCount());
         assertEquals(1, model.getRelationMemberTableModel(PointInTimeType.CURRENT_POINT_IN_TIME).getRowCount());
+        assertEquals(new Color(0xff0000), model.getVersionColor(0));
+        assertEquals(new Color(0xff00e5), model.getVersionColor(1));
+        assertNull(model.getVersionColor(2));
     }
 }