# HG changeset patch # User mschaefer # Date 1519667917 -3600 # Node ID 87aa705e1e991a2c538cb0f9ce036a2cccda9c0d # Parent 924cd99433378d42128cd3a34c265ac679ef881a# Parent 86395ab8ebc381d8128f4a6c6324c3c14c8922f5 Merge diff -r 86395ab8ebc3 -r 87aa705e1e99 artifacts/doc/conf/themes/default.xml --- 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 @@ - + diff -r 86395ab8ebc3 -r 87aa705e1e99 artifacts/doc/conf/themes/second.xml --- 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 @@ - + diff -r 86395ab8ebc3 -r 87aa705e1e99 artifacts/src/main/java/org/dive4elements/river/jfree/AreaFillPattern.java --- 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); diff -r 86395ab8ebc3 -r 87aa705e1e99 artifacts/src/main/java/org/dive4elements/river/jfree/StyledAreaSeriesCollection.java --- 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); diff -r 86395ab8ebc3 -r 87aa705e1e99 artifacts/src/main/resources/images/areapatterns/paternCross.png Binary file artifacts/src/main/resources/images/areapatterns/paternCross.png has changed diff -r 86395ab8ebc3 -r 87aa705e1e99 artifacts/src/main/resources/images/areapatterns/pattern1.png Binary file artifacts/src/main/resources/images/areapatterns/pattern1.png has changed diff -r 86395ab8ebc3 -r 87aa705e1e99 artifacts/src/main/resources/images/areapatterns/patternDagonalLeft.png Binary file artifacts/src/main/resources/images/areapatterns/patternDagonalLeft.png has changed diff -r 86395ab8ebc3 -r 87aa705e1e99 artifacts/src/main/resources/images/areapatterns/patternDiagonalRight.png Binary file artifacts/src/main/resources/images/areapatterns/patternDiagonalRight.png has changed diff -r 86395ab8ebc3 -r 87aa705e1e99 artifacts/src/main/resources/images/areapatterns/patternPoints.png Binary file artifacts/src/main/resources/images/areapatterns/patternPoints.png has changed diff -r 86395ab8ebc3 -r 87aa705e1e99 backend/pom.xml --- 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 @@ + diff -r 86395ab8ebc3 -r 87aa705e1e99 gwt-client/src/main/java/org/dive4elements/river/client/client/ui/StyleEditorWindow.java --- 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]; diff -r 86395ab8ebc3 -r 87aa705e1e99 gwt-client/src/main/webapp/images/areapattern-paternCross.png Binary file gwt-client/src/main/webapp/images/areapattern-paternCross.png has changed diff -r 86395ab8ebc3 -r 87aa705e1e99 gwt-client/src/main/webapp/images/areapattern-pattern1.png Binary file gwt-client/src/main/webapp/images/areapattern-pattern1.png has changed diff -r 86395ab8ebc3 -r 87aa705e1e99 gwt-client/src/main/webapp/images/areapattern-patternDagonalLeft.png Binary file gwt-client/src/main/webapp/images/areapattern-patternDagonalLeft.png has changed diff -r 86395ab8ebc3 -r 87aa705e1e99 gwt-client/src/main/webapp/images/areapattern-patternDiagonalRight.png Binary file gwt-client/src/main/webapp/images/areapattern-patternDiagonalRight.png has changed diff -r 86395ab8ebc3 -r 87aa705e1e99 gwt-client/src/main/webapp/images/areapattern-patternFill.png Binary file gwt-client/src/main/webapp/images/areapattern-patternFill.png has changed diff -r 86395ab8ebc3 -r 87aa705e1e99 gwt-client/src/main/webapp/images/areapattern-patternPoints.png Binary file gwt-client/src/main/webapp/images/areapattern-patternPoints.png has changed diff -r 86395ab8ebc3 -r 87aa705e1e99 gwt-client/src/main/webapp/images/areapattern-x.png Binary file gwt-client/src/main/webapp/images/areapattern-x.png has changed