comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java @ 1679:69929c471646

Improved the creation/rendering of annotations (km favorites, mainvalues). flys-artifacts/trunk@2896 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Wed, 05 Oct 2011 14:23:53 +0000
parents dd9dfe1e48fa
children 59622ba800c8
comparison
equal deleted inserted replaced
1678:03fbf1b30e72 1679:69929c471646
1 package de.intevation.flys.artifacts.model; 1 package de.intevation.flys.artifacts.model;
2 2
3 import java.util.ArrayList;
3 import java.util.List; 4 import java.util.List;
4 5
5 import org.apache.log4j.Logger; 6 import org.apache.log4j.Logger;
7
8 import org.jfree.chart.annotations.XYTextAnnotation;
6 9
7 import de.intevation.artifacts.Artifact; 10 import de.intevation.artifacts.Artifact;
8 import de.intevation.artifacts.CallContext; 11 import de.intevation.artifacts.CallContext;
9 12
10 import de.intevation.flys.artifacts.AnnotationArtifact; 13 import de.intevation.flys.artifacts.AnnotationArtifact;
11 import de.intevation.flys.jfree.FLYSAnnotation; 14 import de.intevation.flys.jfree.FLYSAnnotation;
15 import de.intevation.flys.jfree.StickyAxisAnnotation;
12 16
13 import de.intevation.flys.model.Annotation; 17 import de.intevation.flys.model.Annotation;
14 18
15 import de.intevation.artifactdatabase.state.DefaultFacet; 19 import de.intevation.artifactdatabase.state.DefaultFacet;
16 import de.intevation.artifactdatabase.state.Facet; 20 import de.intevation.artifactdatabase.state.Facet;
51 * @param context Ignored. 55 * @param context Ignored.
52 */ 56 */
53 @Override 57 @Override
54 public Object getData(Artifact artifact, CallContext context) { 58 public Object getData(Artifact artifact, CallContext context) {
55 AnnotationArtifact annotationArtifact = (AnnotationArtifact) artifact; 59 AnnotationArtifact annotationArtifact = (AnnotationArtifact) artifact;
56 List<Annotation> annotations = annotationArtifact.getAnnotations();
57 60
58 return new FLYSAnnotation(description, annotations); 61 List<Annotation> as = annotationArtifact.getAnnotations();
62 List<XYTextAnnotation> xy = new ArrayList<XYTextAnnotation>();
63
64 for (Annotation a: as) {
65 xy.add(new StickyAxisAnnotation(
66 a.getPosition().getValue(),
67 (float) a.getRange().getA().doubleValue(),
68 StickyAxisAnnotation.SimpleAxis.X_AXIS));
69 }
70
71 return new FLYSAnnotation(description, xy);
59 } 72 }
60 73
61 74
62 @Override 75 @Override
63 public Facet deepCopy() { 76 public Facet deepCopy() {

http://dive4elements.wald.intevation.org