Changeset 2450 in josm for trunk/src/org/openstreetmap/josm/gui/layer
- Timestamp:
- 2009-11-14T18:47:09+01:00 (14 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/layer
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java
r2322 r2450 9 9 import java.awt.Component; 10 10 import java.awt.Cursor; 11 import java.awt.Graphics;12 11 import java.awt.Graphics2D; 13 12 import java.awt.GridBagLayout; … … 63 62 import org.openstreetmap.josm.Main; 64 63 import org.openstreetmap.josm.actions.RenameLayerAction; 64 import org.openstreetmap.josm.data.Bounds; 65 65 import org.openstreetmap.josm.data.coor.CachedLatLon; 66 66 import org.openstreetmap.josm.data.coor.LatLon; … … 641 641 } 642 642 643 @Override public void paint(Graphics g, MapView mv) {643 @Override public void paint(Graphics2D g, MapView mv, Bounds box) { 644 644 int clickedIndex = -1; 645 645 -
trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
r2381 r2450 10 10 import java.awt.Color; 11 11 import java.awt.Component; 12 import java.awt.Graphics;13 12 import java.awt.Graphics2D; 14 13 import java.awt.GridBagLayout; … … 49 48 import org.openstreetmap.josm.actions.RenameLayerAction; 50 49 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTaskList; 50 import org.openstreetmap.josm.data.Bounds; 51 51 import org.openstreetmap.josm.data.coor.EastNorth; 52 52 import org.openstreetmap.josm.data.coor.LatLon; … … 143 143 tr("Select line drawing options"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); 144 144 switch (answer) { 145 146 147 148 149 145 case JOptionPane.CANCEL_OPTION: 146 case JOptionPane.CLOSED_OPTION: 147 return; 148 default: 149 // continue 150 150 } 151 151 if (group.getSelection() == r[0].getModel()) { … … 174 174 ); 175 175 switch (answer) { 176 177 178 179 180 181 182 183 176 case 0: 177 Main.pref.putColor("layer " + getName(), c.getColor()); 178 break; 179 case 1: 180 return; 181 case 2: 182 Main.pref.putColor("layer " + getName(), null); 183 break; 184 184 } 185 185 Main.map.repaint(); … … 444 444 445 445 @Override 446 public void paint(Graphics g, MapView mv) {446 public void paint(Graphics2D g, MapView mv, Bounds box) { 447 447 448 448 /**************************************************************** … … 490 490 if(lineWidth != 0) 491 491 { 492 Graphics2D g2d = (Graphics2D)g; 493 g2d.setStroke(new BasicStroke(lineWidth,BasicStroke.CAP_ROUND,BasicStroke.JOIN_ROUND)); 492 g.setStroke(new BasicStroke(lineWidth,BasicStroke.CAP_ROUND,BasicStroke.JOIN_ROUND)); 494 493 } 495 494 … … 531 530 532 531 switch (colored) { 533 case velocity: 534 double dtime = trkPnt.time - oldWp.time; 535 double vel = dist / dtime; 536 double velColor = vel / colorTracksTune * 255; 537 // Bad case first 538 if (dtime <= 0 || vel < 0 || velColor > 255) { 539 trkPnt.customColoring = colors[255]; 540 } else { 541 trkPnt.customColoring = colors[(int) (velColor)]; 532 case velocity: 533 double dtime = trkPnt.time - oldWp.time; 534 double vel = dist / dtime; 535 double velColor = vel / colorTracksTune * 255; 536 // Bad case first 537 if (dtime <= 0 || vel < 0 || velColor > 255) { 538 trkPnt.customColoring = colors[255]; 539 } else { 540 trkPnt.customColoring = colors[(int) (velColor)]; 541 } 542 break; 543 544 case dilution: 545 if (trkPnt.attr.get("hdop") != null) { 546 float hdop = ((Float) trkPnt.attr.get("hdop")).floatValue(); 547 if (hdop < 0) { 548 hdop = 0; 542 549 } 543 break; 544 545 case dilution: 546 if (trkPnt.attr.get("hdop") != null) { 547 float hdop = ((Float) trkPnt.attr.get("hdop")).floatValue(); 548 if (hdop < 0) { 549 hdop = 0; 550 } 551 int hdoplvl = Math.round(hdop * Main.pref.getInteger("hdop.factor", 25)); 552 // High hdop is bad, but high values in colors are green. 553 // Therefore inverse the logic 554 int hdopcolor = 255 - (hdoplvl > 255 ? 255 : hdoplvl); 555 trkPnt.customColoring = colors[hdopcolor]; 556 } 557 break; 550 int hdoplvl = Math.round(hdop * Main.pref.getInteger("hdop.factor", 25)); 551 // High hdop is bad, but high values in colors are green. 552 // Therefore inverse the logic 553 int hdopcolor = 255 - (hdoplvl > 255 ? 255 : hdoplvl); 554 trkPnt.customColoring = colors[hdopcolor]; 555 } 556 break; 558 557 } 559 558 … … 838 837 ); 839 838 switch(ret) { 840 841 842 843 844 839 case JOptionPane.CANCEL_OPTION: 840 case JOptionPane.CLOSED_OPTION: 841 return; 842 default: 843 // continue 845 844 } 846 845 … … 936 935 ); 937 936 switch(ret) { 938 939 940 941 942 937 case JOptionPane.CANCEL_OPTION: 938 case JOptionPane.CLOSED_OPTION: 939 return; 940 default: 941 // continue 943 942 } 944 943 } -
trunk/src/org/openstreetmap/josm/gui/layer/Layer.java
r2192 r2450 6 6 7 7 import java.awt.Component; 8 import java.awt.Graphics ;8 import java.awt.Graphics2D; 9 9 import java.awt.event.ActionEvent; 10 10 import java.beans.PropertyChangeListener; … … 20 20 import org.openstreetmap.josm.actions.SaveAction; 21 21 import org.openstreetmap.josm.actions.SaveAsAction; 22 import org.openstreetmap.josm.data.Bounds; 22 23 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; 23 24 import org.openstreetmap.josm.gui.MapView; … … 98 99 * @param mv The object that can translate GeoPoints to screen coordinates. 99 100 */ 100 abstract public void paint(Graphics g, MapView mv);101 abstract public void paint(Graphics2D g, MapView mv, Bounds box); 101 102 /** 102 103 * Return a representative small image for this layer. The image must not -
trunk/src/org/openstreetmap/josm/gui/layer/MapViewPaintable.java
r1169 r2450 2 2 package org.openstreetmap.josm.gui.layer; 3 3 4 import java.awt.Graphics ;4 import java.awt.Graphics2D; 5 5 6 import org.openstreetmap.josm.data.Bounds; 6 7 import org.openstreetmap.josm.gui.MapView; 7 8 … … 12 13 * @param mv The object that can translate GeoPoints to screen coordinates. 13 14 */ 14 abstract public void paint(Graphics g, MapView mv);15 void paint(Graphics2D g, MapView mv, Bounds bbox); 15 16 16 17 } -
trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
r2434 r2450 12 12 import java.awt.Component; 13 13 import java.awt.Composite; 14 import java.awt.Graphics;15 14 import java.awt.Graphics2D; 16 15 import java.awt.GridBagLayout; … … 40 39 import org.openstreetmap.josm.actions.RenameLayerAction; 41 40 import org.openstreetmap.josm.command.PurgePrimitivesCommand; 41 import org.openstreetmap.josm.data.Bounds; 42 42 import org.openstreetmap.josm.data.conflict.Conflict; 43 43 import org.openstreetmap.josm.data.conflict.ConflictCollection; … … 204 204 * Draw nodes last to overlap the ways they belong to. 205 205 */ 206 @Override public void paint(final Graphics g, final MapView mv) {206 @Override public void paint(final Graphics2D g, final MapView mv, Bounds box) { 207 207 boolean active = mv.getActiveLayer() == this; 208 208 boolean inactive = !active && Main.pref.getBoolean("draw.data.inactive_color", true); … … 245 245 painter.setNavigatableComponent(mv); 246 246 painter.inactive = inactive; 247 painter.visitAll(data, virtual );247 painter.visitAll(data, virtual, box); 248 248 Main.map.conflictDialog.paintConflicts(g, mv); 249 249 } -
trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java
r2381 r2450 9 9 import java.awt.Color; 10 10 import java.awt.Component; 11 import java.awt.Graphics ;11 import java.awt.Graphics2D; 12 12 import java.awt.GridBagLayout; 13 13 import java.awt.Point; … … 33 33 import org.openstreetmap.josm.Main; 34 34 import org.openstreetmap.josm.actions.RenameLayerAction; 35 import org.openstreetmap.josm.data.Bounds; 35 36 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener; 36 37 import org.openstreetmap.josm.data.coor.EastNorth; … … 122 123 } 123 124 124 @Override public void paint(Graphics g, MapView mv) {125 @Override public void paint(Graphics2D g, MapView mv, Bounds box) { 125 126 g.setColor(Main.pref.getColor(marktr("gps point"), "layer "+getName(), Color.gray)); 126 127 Point old = null; … … 244 245 JOptionPane.PLAIN_MESSAGE, null,options, options[0]); 245 246 switch (answer) { 246 247 248 249 250 251 252 253 247 case 0: 248 Main.pref.putColor("layer "+getName(), c.getColor()); 249 break; 250 case 1: 251 return; 252 case 2: 253 Main.pref.putColor("layer "+getName(), null); 254 break; 254 255 } 255 256 Main.map.repaint(); -
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
r2017 r2450 8 8 import java.awt.Color; 9 9 import java.awt.Component; 10 import java.awt.Graphics ;10 import java.awt.Graphics2D; 11 11 import java.awt.Point; 12 12 import java.awt.event.ActionEvent; … … 29 29 import org.openstreetmap.josm.Main; 30 30 import org.openstreetmap.josm.actions.RenameLayerAction; 31 import org.openstreetmap.josm.data.Bounds; 31 32 import org.openstreetmap.josm.data.coor.LatLon; 32 33 import org.openstreetmap.josm.data.gpx.GpxData; … … 152 153 } 153 154 154 @Override public void paint(Graphics g, MapView mv) {155 @Override public void paint(Graphics2D g, MapView mv, Bounds box) { 155 156 boolean mousePressedTmp = mousePressed; 156 157 Point mousePos = mv.getMousePosition(); … … 210 211 ); 211 212 switch (answer) { 212 213 214 215 216 217 218 219 213 case 0: 214 Main.pref.putColor("layer "+getName(), c.getColor()); 215 break; 216 case 1: 217 return; 218 case 2: 219 Main.pref.putColor("layer "+getName(), null); 220 break; 220 221 } 221 222 Main.map.repaint();
Note:
See TracChangeset
for help on using the changeset viewer.