Changeset 16252 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2020-04-11T08:54:12+02:00 (4 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/SelectionManager.java
r16119 r16252 26 26 import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors; 27 27 import org.openstreetmap.josm.gui.layer.AbstractMapViewPaintable; 28 import org.openstreetmap.josm.tools. Utils;28 import org.openstreetmap.josm.tools.ColorHelper; 29 29 30 30 /** … … 83 83 if (mousePos == null || mousePosStart == null || mousePos == mousePosStart) 84 84 return; 85 Color color = Utils.complement(PaintColors.getBackgroundColor());85 Color color = ColorHelper.complement(PaintColors.getBackgroundColor()); 86 86 g.setColor(color); 87 87 if (lassoMode) { -
trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
r15731 r16252 75 75 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher; 76 76 import org.openstreetmap.josm.gui.widgets.ScrollableTable; 77 import org.openstreetmap.josm.tools.ColorHelper; 77 78 import org.openstreetmap.josm.tools.GBC; 78 79 import org.openstreetmap.josm.tools.ImageOverlay; … … 612 613 } 613 614 if (s.getBackgroundColorOverride() != null) { 614 text.append(tableRow(tr("Background:"), Utils.toString(s.getBackgroundColorOverride())));615 text.append(tableRow(tr("Background:"), ColorHelper.color2html(s.getBackgroundColorOverride()))); 615 616 } 616 617 text.append(tableRow(tr("Style is currently active?"), s.active ? tr("Yes") : tr("No"))) -
trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java
r16184 r16252 15 15 import org.openstreetmap.josm.tools.GenericParser; 16 16 import org.openstreetmap.josm.tools.Logging; 17 import org.openstreetmap.josm.tools.Utils;18 17 19 18 /** … … 251 250 sb.append(Arrays.toString((float[]) val)); 252 251 } else if (val instanceof Color) { 253 sb.append( Utils.toString((Color) val));252 sb.append(ColorHelper.color2html((Color) val)); 254 253 } else if (val != null) { 255 254 sb.append(val); -
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Functions.java
r16112 r16252 271 271 */ 272 272 public static float red(Color c) { // NO_UCD (unused code) 273 return Utils.colorInt2float(c.getRed());273 return ColorHelper.int2float(c.getRed()); 274 274 } 275 275 … … 281 281 */ 282 282 public static float green(Color c) { // NO_UCD (unused code) 283 return Utils.colorInt2float(c.getGreen());283 return ColorHelper.int2float(c.getGreen()); 284 284 } 285 285 … … 291 291 */ 292 292 public static float blue(Color c) { // NO_UCD (unused code) 293 return Utils.colorInt2float(c.getBlue());293 return ColorHelper.int2float(c.getBlue()); 294 294 } 295 295 … … 301 301 */ 302 302 public static float alpha(Color c) { // NO_UCD (unused code) 303 return Utils.colorInt2float(c.getAlpha());303 return ColorHelper.int2float(c.getAlpha()); 304 304 } 305 305 -
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java
r13919 r16252 18 18 import org.openstreetmap.josm.spi.preferences.Config; 19 19 import org.openstreetmap.josm.tools.CheckParameterUtil; 20 import org.openstreetmap.josm.tools.ColorHelper; 20 21 import org.openstreetmap.josm.tools.HiDPISupport; 21 22 import org.openstreetmap.josm.tools.Utils; … … 96 97 97 98 fillImage.alpha = Utils.clamp(Config.getPref().getInt("mappaint.fill-image-alpha", 255), 0, 255); 98 Integer pAlpha = Utils.colorFloat2int(c.get(FILL_OPACITY, null, float.class));99 Integer pAlpha = ColorHelper.float2int(c.get(FILL_OPACITY, null, float.class)); 99 100 if (pAlpha != null) { 100 101 fillImage.alpha = pAlpha; … … 103 104 color = c.get(FILL_COLOR, null, Color.class); 104 105 if (color != null) { 105 float defaultOpacity = Utils.colorInt2float(DEFAULT_FILL_ALPHA.get());106 float defaultOpacity = ColorHelper.int2float(DEFAULT_FILL_ALPHA.get()); 106 107 float opacity = c.get(FILL_OPACITY, defaultOpacity, Float.class); 107 color = Utils.alphaMultiply(color, opacity);108 color = ColorHelper.alphaMultiply(color, opacity); 108 109 } 109 110 } … … 159 160 @Override 160 161 public String toString() { 161 return "AreaElemStyle{" + super.toString() + "color=" + Utils.toString(color) +162 return "AreaElemStyle{" + super.toString() + "color=" + ColorHelper.color2html(color) + 162 163 " fillImage=[" + fillImage + "] extent=[" + extent + "] extentThreshold=[" + extentThreshold + "]}"; 163 164 } -
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java
r14095 r16252 20 20 import org.openstreetmap.josm.gui.mappaint.MultiCascade; 21 21 import org.openstreetmap.josm.gui.mappaint.mapcss.Instruction.RelativeFloat; 22 import org.openstreetmap.josm.tools.ColorHelper; 22 23 import org.openstreetmap.josm.tools.Logging; 23 import org.openstreetmap.josm.tools.Utils;24 24 25 25 /** … … 235 235 public String toString() { 236 236 return "LineElemStyle{" + super.toString() + "width=" + line.getLineWidth() + 237 " realWidth=" + realWidth + " color=" + Utils.toString(color) +237 " realWidth=" + realWidth + " color=" + ColorHelper.color2html(color) + 238 238 " dashed=" + Arrays.toString(line.getDashArray()) + 239 239 (line.getDashPhase() == 0 ? "" : " dashesOffses=" + line.getDashPhase()) + 240 " dashedColor=" + Utils.toString(dashesBackground) +240 " dashedColor=" + ColorHelper.color2html(dashesBackground) + 241 241 " linejoin=" + linejoinToString(line.getLineJoin()) + 242 242 " linecap=" + linecapToString(line.getEndCap()) + … … 334 334 } 335 335 336 Integer pAlpha = Utils.colorFloat2int(c.get(type.prefix + OPACITY, null, Float.class));336 Integer pAlpha = ColorHelper.float2int(c.get(type.prefix + OPACITY, null, Float.class)); 337 337 if (pAlpha != null) { 338 338 alpha = pAlpha; … … 363 363 Color dashesBackground = c.get(type.prefix + DASHES_BACKGROUND_COLOR, null, Color.class); 364 364 if (dashesBackground != null) { 365 pAlpha = Utils.colorFloat2int(c.get(type.prefix + DASHES_BACKGROUND_OPACITY, null, Float.class));365 pAlpha = ColorHelper.float2int(c.get(type.prefix + DASHES_BACKGROUND_OPACITY, null, Float.class)); 366 366 if (pAlpha != null) { 367 367 alpha = pAlpha; -
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java
r16186 r16252 23 23 import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement.BoxProviderResult; 24 24 import org.openstreetmap.josm.gui.util.GuiHelper; 25 import org.openstreetmap.josm.tools.ColorHelper; 25 26 import org.openstreetmap.josm.tools.ImageProvider; 26 27 import org.openstreetmap.josm.tools.ImageResource; 27 28 import org.openstreetmap.josm.tools.Logging; 28 import org.openstreetmap.josm.tools.Utils;29 29 30 30 /** … … 240 240 */ 241 241 public float getAlphaFloat() { 242 return Utils.colorInt2float(alpha);242 return ColorHelper.int2float(alpha); 243 243 } 244 244 -
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java
r14193 r16252 24 24 import org.openstreetmap.josm.spi.preferences.Config; 25 25 import org.openstreetmap.josm.tools.CheckParameterUtil; 26 import org.openstreetmap.josm.tools.ColorHelper; 26 27 import org.openstreetmap.josm.tools.Logging; 27 28 import org.openstreetmap.josm.tools.RotationAngle; … … 168 169 169 170 mapImage.alpha = Utils.clamp(Config.getPref().getInt("mappaint.icon-image-alpha", 255), 0, 255); 170 Integer pAlpha = Utils.colorFloat2int(c.get(keys[ICON_OPACITY_IDX], null, float.class));171 Integer pAlpha = ColorHelper.float2int(c.get(keys[ICON_OPACITY_IDX], null, float.class)); 171 172 if (pAlpha != null) { 172 173 mapImage.alpha = pAlpha; … … 213 214 Stroke stroke = null; 214 215 if (strokeColor != null && strokeWidth != null) { 215 Integer strokeAlpha = Utils.colorFloat2int(c.get("symbol-stroke-opacity", null, Float.class));216 Integer strokeAlpha = ColorHelper.float2int(c.get("symbol-stroke-opacity", null, Float.class)); 216 217 if (strokeAlpha != null) { 217 218 strokeColor = new Color(strokeColor.getRed(), strokeColor.getGreen(), … … 227 228 228 229 if (fillColor != null) { 229 Integer fillAlpha = Utils.colorFloat2int(c.get("symbol-fill-opacity", null, Float.class));230 Integer fillAlpha = ColorHelper.float2int(c.get("symbol-fill-opacity", null, Float.class)); 230 231 if (fillAlpha != null) { 231 232 fillColor = new Color(fillColor.getRed(), fillColor.getGreen(), -
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java
r13662 r16252 18 18 import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy.TagLookupCompositionStrategy; 19 19 import org.openstreetmap.josm.tools.CheckParameterUtil; 20 import org.openstreetmap.josm.tools. Utils;20 import org.openstreetmap.josm.tools.ColorHelper; 21 21 22 22 /** … … 140 140 Color color = c.get(TEXT_COLOR, defaultTextColor, Color.class); 141 141 float alpha = c.get(TEXT_OPACITY, 1f, Float.class); 142 color = Utils.alphaMultiply(color, alpha);142 color = ColorHelper.alphaMultiply(color, alpha); 143 143 144 144 Float haloRadius = c.get(TEXT_HALO_RADIUS, null, Float.class); … … 148 148 Color haloColor = null; 149 149 if (haloRadius != null) { 150 haloColor = c.get(TEXT_HALO_COLOR, Utils.complement(color), Color.class);150 haloColor = c.get(TEXT_HALO_COLOR, ColorHelper.complement(color), Color.class); 151 151 float haloAlphaFactor = c.get(TEXT_HALO_OPACITY, 1f, Float.class); 152 haloColor = Utils.alphaMultiply(haloColor, haloAlphaFactor);152 haloColor = ColorHelper.alphaMultiply(haloColor, haloAlphaFactor); 153 153 } 154 154 … … 199 199 sb.append("labelCompositionStrategy=").append(labelCompositionStrategy) 200 200 .append(" font=").append(font) 201 .append(" color=").append( Utils.toString(color));201 .append(" color=").append(ColorHelper.color2html(color)); 202 202 if (haloRadius != null) { 203 203 sb.append(" haloRadius=").append(haloRadius)
Note:
See TracChangeset
for help on using the changeset viewer.