Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/BedQualityState.java @ 8592:36faef4f8acb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(issue1755) Add interpolated facets and update themes accordingly
author Andre Heinecke <andre.heinecke@intevation.de>
date Thu, 19 Mar 2015 13:36:38 +0100
parents 07c9ac22f611
children dbec49147f54
comparison
equal deleted inserted replaced
8591:9fa5c66073e7 8592:36faef4f8acb
24 import org.dive4elements.river.artifacts.model.CalculationResult; 24 import org.dive4elements.river.artifacts.model.CalculationResult;
25 import org.dive4elements.river.artifacts.model.DataFacet; 25 import org.dive4elements.river.artifacts.model.DataFacet;
26 import org.dive4elements.river.artifacts.model.DateRange; 26 import org.dive4elements.river.artifacts.model.DateRange;
27 import org.dive4elements.river.artifacts.model.FacetTypes; 27 import org.dive4elements.river.artifacts.model.FacetTypes;
28 import org.dive4elements.river.artifacts.model.minfo.BedQualityDataFacet; 28 import org.dive4elements.river.artifacts.model.minfo.BedQualityDataFacet;
29 import org.dive4elements.river.artifacts.model.minfo.BedQualityInterpolFacet;
29 import org.dive4elements.river.artifacts.model.minfo.BedDiameterDataFacet; 30 import org.dive4elements.river.artifacts.model.minfo.BedDiameterDataFacet;
30 import org.dive4elements.river.artifacts.model.minfo.BedloadDiameterDataFacet; 31 import org.dive4elements.river.artifacts.model.minfo.BedloadDiameterDataFacet;
31 import org.dive4elements.river.artifacts.model.minfo.BedQualityCalculation; 32 import org.dive4elements.river.artifacts.model.minfo.BedQualityCalculation;
32 import org.dive4elements.river.artifacts.model.minfo.BedQualityResult; 33 import org.dive4elements.river.artifacts.model.minfo.BedQualityResult;
33 import org.dive4elements.river.artifacts.model.minfo.BedQualityResultValue; 34 import org.dive4elements.river.artifacts.model.minfo.BedQualityResultValue;
66 public Boolean isInitialActive( 67 public Boolean isInitialActive(
67 Artifact artifact, 68 Artifact artifact,
68 Facet facet, 69 Facet facet,
69 String output 70 String output
70 ) { 71 ) {
71 String name = facet.getName(); 72 String name = facet.getName().replace(".interpol","");
72 if (name.equals(BED_QUALITY_SEDIMENT_DENSITY_TOPLAYER) || 73 if (name.equals(BED_QUALITY_SEDIMENT_DENSITY_TOPLAYER) ||
73 name.equals(BED_QUALITY_SEDIMENT_DENSITY_SUBLAYER) || 74 name.equals(BED_QUALITY_SEDIMENT_DENSITY_SUBLAYER) ||
74 name.equals(BED_DIAMETER_DATA_TOP) || 75 name.equals(BED_DIAMETER_DATA_TOP) ||
75 name.equals(BED_DIAMETER_DATA_SUB) || 76 name.equals(BED_DIAMETER_DATA_SUB) ||
76 name.equals(BEDLOAD_DIAMETER_DATA)){ 77 name.equals(BEDLOAD_DIAMETER_DATA)){
268 newFacets.add(new BedQualityDataFacet((idx << 8) + i++, 269 newFacets.add(new BedQualityDataFacet((idx << 8) + i++,
269 getFacetName(value), 270 getFacetName(value),
270 getFacetDescription(meta, range, value), 271 getFacetDescription(meta, range, value),
271 ComputeType.ADVANCE, 272 ComputeType.ADVANCE,
272 stateId, hash, value.getName(), value.getType())); 273 stateId, hash, value.getName(), value.getType()));
274 newFacets.add(new BedQualityInterpolFacet((idx << 8) + i++,
275 getFacetName(value) + ".interpol",
276 getFacetInterpolDescription(meta, range, value),
277 ComputeType.ADVANCE,
278 stateId, hash, value.getName(), value.getType()));
273 } 279 }
274 } 280 }
275 } 281 }
282
283 protected String getFacetInterpolDescription(CallMeta meta,
284 DateRange range,
285 BedQualityResultValue value) {
286 String part1 = getFacetDescription(meta, range, value);
287 /* We could add a step description here */
288 return part1 + " " + Resources.getMsg(meta,
289 I18N_INTERPOL_SUFFIX,
290 I18N_INTERPOL_SUFFIX,
291 new Object[] {});
292 }
293
276 294
277 protected String getFacetDescription(CallMeta meta, 295 protected String getFacetDescription(CallMeta meta,
278 DateRange range, 296 DateRange range,
279 BedQualityResultValue value) { 297 BedQualityResultValue value) {
280 Date from = range != null ? range.getFrom() : new Date(); 298 Date from = range != null ? range.getFrom() : new Date();
http://dive4elements.wald.intevation.org