Mercurial > dive4elements > river
diff flys-artifacts/ChangeLog @ 2318:0b8c04c7f762
Avoid that annotations like the ones used for hyks prevent manual point text annotation rendering.
flys-artifacts/trunk@3999 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Thu, 09 Feb 2012 13:45:26 +0000 |
| parents | 9b5541dcc01f |
| children | bf134f4c0be1 |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Thu Feb 09 13:28:57 2012 +0000 +++ b/flys-artifacts/ChangeLog Thu Feb 09 13:45:26 2012 +0000 @@ -1,3 +1,15 @@ +2012-02-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + Fix flys/issue490. Allow CollisionFree..Annotations to collide with + non-collision-free annotations. + + * src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotationEntity.java: + New, to take advantage of cheap instanceof operator. + + * src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java: + Only avoid collisions with members of same family (i.e. allow + collision with annotations of other types). + 2012-02-09 Ingo Weinzierl <ingo@intevation.de> * doc/conf/themes.xml: Added themes for historical discharge curves and