Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/exports/process/SQRelationProcessor.java @ 9556:9b8e8fc1f408
Use facetName in all processors as themeType for legend aggregation.
author | gernotbelger |
---|---|
date | Tue, 23 Oct 2018 16:26:58 +0200 |
parents | 1cc7653ca84f |
children |
comparison
equal
deleted
inserted
replaced
9555:ef5754ba5573 | 9556:9b8e8fc1f408 |
---|---|
63 | 63 |
64 if (FacetTypes.IS.SQ_CURVE(facetName)) { | 64 if (FacetTypes.IS.SQ_CURVE(facetName)) { |
65 SQFunction func = (SQFunction) data; | 65 SQFunction func = (SQFunction) data; |
66 | 66 |
67 series = JFreeUtil.sampleFunction2DPositive( | 67 series = JFreeUtil.sampleFunction2DPositive( |
68 bundle.getFacetName(), | |
68 func.getFunction(), | 69 func.getFunction(), |
69 theme, | 70 theme, |
70 desc, | 71 desc, |
71 500, | 72 500, |
72 Math.max(func.getMinQ(), 0.01), | 73 Math.max(func.getMinQ(), 0.01), |
74 | 75 |
75 } else if (FacetTypes.IS.SQ_MEASUREMENT(facetName) || | 76 } else if (FacetTypes.IS.SQ_MEASUREMENT(facetName) || |
76 FacetTypes.IS.SQ_OUTLIER(facetName)) { | 77 FacetTypes.IS.SQ_OUTLIER(facetName)) { |
77 | 78 |
78 SQ[] sqs = (SQ[]) data; | 79 SQ[] sqs = (SQ[]) data; |
79 series = new StyledXYSeries(desc, theme); | 80 series = new StyledXYSeries(bundle.getFacetName(), desc, theme); |
80 List<XYTextAnnotation> xy = new ArrayList<XYTextAnnotation>(); | 81 List<XYTextAnnotation> xy = new ArrayList<XYTextAnnotation>(); |
81 | 82 |
82 DateFormat dateFormat = DateFormat.getDateInstance( | 83 DateFormat dateFormat = DateFormat.getDateInstance( |
83 DateFormat.SHORT, | 84 DateFormat.SHORT, |
84 Resources.getLocale(context.getMeta())); | 85 Resources.getLocale(context.getMeta())); |