Mercurial > dive4elements > river
changeset 8918:87aa705e1e99
Merge
| author | mschaefer |
|---|---|
| date | Mon, 26 Feb 2018 18:58:37 +0100 |
| parents | 924cd9943337 (diff) 86395ab8ebc3 (current diff) |
| children | 89f7d13746c0 |
| files | |
| diffstat | 18 files changed, 16 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/themes/default.xml Mon Feb 26 18:56:05 2018 +0100 +++ b/artifacts/doc/conf/themes/default.xml Mon Feb 26 18:58:37 2018 +0100 @@ -2905,7 +2905,7 @@ <field name="showarea" type="boolean" display="Flaeche anzeigen" default="true" /> <field name="areabgcolor" type="Color" default="245, 245, 220" display="Füllfarbe" /> - <field name="areabgpattern" type="areapattern" default="pattern1" display="Flächenfarbe" /> + <field name="areabgpattern" type="areapattern" default="patternFill" display="Flächentyp" /> <field name="areatransparency" type="int" default="10" /> <field name="showarealabel" type="boolean" display="Flächenbeschriftung anzeigen" default="false" hint="hidden"/>
--- a/artifacts/doc/conf/themes/second.xml Mon Feb 26 18:56:05 2018 +0100 +++ b/artifacts/doc/conf/themes/second.xml Mon Feb 26 18:58:37 2018 +0100 @@ -2894,7 +2894,7 @@ <field name="showarea" type="boolean" display="Flaeche anzeigen" default="true" /> <field name="areabgcolor" type="Color" default="245, 245, 220" display="Füllfarbe" /> - <field name="areabgpattern" type="areapattern" default="pattern1" display="Flächenfarbe" /> + <field name="areabgpattern" type="areapattern" default="patternFill" display="Flächentyp" /> <field name="areatransparency" type="int" default="10" /> <field name="showarealabel" type="boolean" display="Flächenbeschriftung anzeigen" default="false" hint="hidden"/>
--- a/artifacts/src/main/java/org/dive4elements/river/jfree/AreaFillPattern.java Mon Feb 26 18:56:05 2018 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/jfree/AreaFillPattern.java Mon Feb 26 18:58:37 2018 +0100 @@ -27,7 +27,11 @@ */ public enum AreaFillPattern { - pattern1("/images/areapatterns/pattern1.png"); + patternFill("/images/areapatterns/patternFill.png"), // + patternPoints("/images/areapatterns/patternPoints.png"), // + paternCross("/images/areapatterns/paternCross.png"), // + patternDagonalLeft("/images/areapatterns/patternDagonalLeft.png"), // + patternDiagonalRight("/images/areapatterns/patternDiagonalRight.png"); private static Logger log = Logger.getLogger(AreaFillPattern.class);
--- a/artifacts/src/main/java/org/dive4elements/river/jfree/StyledAreaSeriesCollection.java Mon Feb 26 18:56:05 2018 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/jfree/StyledAreaSeriesCollection.java Mon Feb 26 18:58:37 2018 +0100 @@ -132,7 +132,7 @@ final AreaFillPattern pattern = this.theme.parseAreaBackgroundPattern(); - if( pattern == null ) + if( pattern == null || pattern == AreaFillPattern.patternFill ) return alphaPaint; final BufferedImage image = pattern.getImage(alphaPaint);
--- a/backend/pom.xml Mon Feb 26 18:56:05 2018 +0100 +++ b/backend/pom.xml Mon Feb 26 18:58:37 2018 +0100 @@ -82,6 +82,7 @@ </descriptors> </configuration> </plugin> + <!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> @@ -104,6 +105,7 @@ </execution> </executions> </plugin> + --> </plugins> </build>
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/StyleEditorWindow.java Mon Feb 26 18:56:05 2018 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/StyleEditorWindow.java Mon Feb 26 18:58:37 2018 +0100 @@ -605,7 +605,12 @@ // FIXME: ugly, using knowledge of available patterns at this point, creating redundancy with AreaFillPattern enum. // But the whole code does it like that, so this is 'flys style' - final String[] patterns = new String[] {"pattern1", "x"}; + final String[] patterns = new String[] {"patternFill", // + "patternPoints", // + "paternCross", // + "patternDagonalLeft", // + "patternDiagonalRight"}; + for (int i = 0; i < patterns.length; i++) { final String pattern = patterns[i];