Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/themes/ThemeDocument.java @ 9325:094ed9d1f2ad
Fixed: change of point style of interpolated data did not change in WQ chart of fixanalysis
Fixed: change of point style of interpolated data did not change in dWt chart of fixanalysis; also had duplicate legend entries
author | gernotbelger |
---|---|
date | Fri, 27 Jul 2018 14:33:41 +0200 |
parents | d9c89651bd67 |
children | ef5754ba5573 |
comparison
equal
deleted
inserted
replaced
9324:058701d91552 | 9325:094ed9d1f2ad |
---|---|
54 | 54 |
55 public final static String AREA_SHOW_BORDER = "showborder"; | 55 public final static String AREA_SHOW_BORDER = "showborder"; |
56 | 56 |
57 public final static String SHOW_POINTS = "showpoints"; | 57 public final static String SHOW_POINTS = "showpoints"; |
58 | 58 |
59 public final static String SHOW_POINTS_OUTLINE = "showpointsoutline"; | |
60 | |
59 public final static String SHOW_LINE = "showlines"; | 61 public final static String SHOW_LINE = "showlines"; |
60 | 62 |
61 public final static String SHOW_VERTICAL_LINE = "showverticalline"; | 63 public final static String SHOW_VERTICAL_LINE = "showverticalline"; |
62 | 64 |
63 public final static String SHOW_HORIZONTAL_LINE = "showhorizontalline"; | 65 public final static String SHOW_HORIZONTAL_LINE = "showhorizontalline"; |
119 public final static String WSPLGEN_NUMCLASSES = "numclasses"; | 121 public final static String WSPLGEN_NUMCLASSES = "numclasses"; |
120 | 122 |
121 public final static String BANDWIDTH = "bandwidth"; | 123 public final static String BANDWIDTH = "bandwidth"; |
122 | 124 |
123 public final static String SHOWEXTRAMARK = "showextramark"; | 125 public final static String SHOWEXTRAMARK = "showextramark"; |
124 | |
125 public final static String USE_FILL_PAINT = "usefillpaint"; | |
126 | 126 |
127 /* boolean parameter if the range of this theme should be considered when auto-zooming. Only works for area-series at the moment */ | 127 /* boolean parameter if the range of this theme should be considered when auto-zooming. Only works for area-series at the moment */ |
128 private static final String CALCULATE_RANGE = "calculateRange"; | 128 private static final String CALCULATE_RANGE = "calculateRange"; |
129 | 129 |
130 private Map<String, String> values; | 130 private Map<String, String> values; |
359 return parseColor(color); | 359 return parseColor(color); |
360 } | 360 } |
361 | 361 |
362 public boolean parseShowPoints() { | 362 public boolean parseShowPoints() { |
363 String show = getValue(SHOW_POINTS); | 363 String show = getValue(SHOW_POINTS); |
364 return parseBoolean(show, false); | |
365 } | |
366 | |
367 public boolean parseShowPointsOutline() { | |
368 String show = getValue(SHOW_POINTS_OUTLINE); | |
364 return parseBoolean(show, false); | 369 return parseBoolean(show, false); |
365 } | 370 } |
366 | 371 |
367 public boolean parseShowLine() { | 372 public boolean parseShowLine() { |
368 String show = getValue(SHOW_LINE); | 373 String show = getValue(SHOW_LINE); |
480 } | 485 } |
481 | 486 |
482 public boolean parseShowExtraMark() { | 487 public boolean parseShowExtraMark() { |
483 String show = getValue(SHOWEXTRAMARK); | 488 String show = getValue(SHOWEXTRAMARK); |
484 return parseBoolean(show, false); | 489 return parseBoolean(show, false); |
485 } | |
486 | |
487 public Boolean parseUseFillPaint() { | |
488 String use = getValue(USE_FILL_PAINT); | |
489 return use != null | |
490 ? parseBoolean(use, false) | |
491 : null; | |
492 } | 490 } |
493 | 491 |
494 public int parseFontSize() { | 492 public int parseFontSize() { |
495 String size = getValue(TEXT_SIZE); | 493 String size = getValue(TEXT_SIZE); |
496 if (size == null) { | 494 if (size == null) { |