Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/states/SQRelation.java @ 8407:f1f6e32156a6
Put date range into facet descriptions for curve and measurements.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Tue, 14 Oct 2014 15:22:11 +0200 |
| parents | d4c501d2c098 |
| children | 5e38e2924c07 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/SQRelation.java Tue Oct 14 12:41:37 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/SQRelation.java Tue Oct 14 15:22:11 2014 +0200 @@ -175,10 +175,11 @@ ) { log.debug("SQRelation.computeAdvance"); + SQRelationAccess sqAccess = new SQRelationAccess(artifact); + CalculationResult res = old instanceof CalculationResult ? (CalculationResult)old - : new SQRelationCalculation( - new SQRelationAccess(artifact)).calculate(); + : new SQRelationCalculation(sqAccess).calculate(); if (facets == null) { return res; @@ -189,7 +190,7 @@ return res; } - createFacets(context, facets, sqr, hash); + createFacets(context, facets, sqAccess, sqr, hash); Facet csv = new DataFacet( CSV, "CSV data", ComputeType.ADVANCE, hash, id); @@ -207,6 +208,7 @@ protected void createFacets( CallContext context, List<Facet> container, + SQRelationAccess access, SQResult[] sqr, String hash ) { @@ -231,7 +233,10 @@ Resources.getMsg( meta, I18N_FACET_CURVE, - I18N_FACET_CURVE + new Object[] { + access.getPeriod().getFrom(), + access.getPeriod().getTo() + } ), hash, stateId @@ -245,7 +250,10 @@ Resources.getMsg( meta, I18N_FACET_CURVE, - I18N_FACET_CURVE + new Object[] { + access.getPeriod().getFrom(), + access.getPeriod().getTo() + } ), hash, stateId @@ -273,7 +281,6 @@ Resources.getMsg( meta, I18N_FACET_OUTLIERS, - I18N_FACET_OUTLIERS, round ), hash, @@ -287,7 +294,6 @@ Resources.getMsg( meta, I18N_FACET_OUTLIERS, - I18N_FACET_OUTLIERS, round ), hash, @@ -301,7 +307,6 @@ Resources.getMsg( meta, I18N_FACET_OUTLIER_CURVE, - I18N_FACET_OUTLIER_CURVE, round ), hash, @@ -315,7 +320,6 @@ Resources.getMsg( meta, I18N_FACET_OUTLIER_CURVE, - I18N_FACET_OUTLIER_CURVE, round ), hash, @@ -329,7 +333,6 @@ Resources.getMsg( meta, I18N_FACET_OUTLIER_MEASUREMENT, - I18N_FACET_OUTLIER_MEASUREMENT, round ), hash, @@ -343,7 +346,6 @@ Resources.getMsg( meta, I18N_FACET_OUTLIER_MEASUREMENT, - I18N_FACET_OUTLIER_MEASUREMENT, round ), hash, @@ -358,7 +360,10 @@ Resources.getMsg( meta, I18N_FACET_MEASUREMENTS, - I18N_FACET_MEASUREMENTS + new Object[] { + access.getPeriod().getFrom(), + access.getPeriod().getTo() + } ), hash, stateId @@ -371,7 +376,10 @@ Resources.getMsg( meta, I18N_FACET_MEASUREMENTS, - I18N_FACET_MEASUREMENTS + new Object[] { + access.getPeriod().getFrom(), + access.getPeriod().getTo() + } ), hash, stateId