Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixRealizingCompute.java @ 9425:3f49835a00c3
Extended CrossSectionFacet so it may fetch different data from within the artifact result.
Also allows to have acces to the potentially already computed artifact result via its normal computation cache.
| author | gernotbelger |
|---|---|
| date | Fri, 17 Aug 2018 15:31:02 +0200 |
| parents | 9744ce3c3853 |
| children | 7d7aa54afe0c |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixRealizingCompute.java Fri Aug 17 14:29:05 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixRealizingCompute.java Fri Aug 17 15:31:02 2018 +0200 @@ -80,7 +80,7 @@ facets.add(new ReportFacet()); } - final String id = getID(); + final String stateId = getID(); final CallMeta meta = context.getMeta(); final FixRealizingResult fixRes = (FixRealizingResult) res.getData(); @@ -98,10 +98,10 @@ nameQ = "Q(" + nameW + ")"; } - facets.add(new FixWaterlevelFacet(i, FIX_WQ_LS, nameW, ComputeType.ADVANCE, hash, id)); - facets.add(new FixWaterlevelFacet(i, LONGITUDINAL_W, nameW, ComputeType.ADVANCE, hash, id)); - facets.add(new FixWaterlevelFacet(i, LONGITUDINAL_Q, nameQ, ComputeType.ADVANCE, hash, id)); - facets.add(new CrossSectionWaterLineFacet(i, nameW)); + facets.add(new FixWaterlevelFacet(i, FIX_WQ_LS, nameW, ComputeType.ADVANCE, hash, stateId)); + facets.add(new FixWaterlevelFacet(i, LONGITUDINAL_W, nameW, ComputeType.ADVANCE, hash, stateId)); + facets.add(new FixWaterlevelFacet(i, LONGITUDINAL_Q, nameQ, ComputeType.ADVANCE, hash, stateId)); + facets.add(new CrossSectionWaterLineFacet(i, nameW, ComputeType.ADVANCE, hash, stateId, Integer.valueOf(i))); // XXX: THIS CAN NOT HAPPEN! REMOVE IT! if (wqkms[i] instanceof WQCKms) { @@ -127,12 +127,12 @@ facets.add(new FixReferenceEventsFacet(facetIndex++, event.getColumnId(), FIX_EVENTS, facetDescription, stationRange)); } - facets.add(new DataFacet(CSV, "CSV data", ComputeType.ADVANCE, hash, id)); - facets.add(new DataFacet(WST, "WST data", ComputeType.ADVANCE, hash, id)); - facets.add(new DataFacet(PDF, "PDF data", ComputeType.ADVANCE, hash, id)); + facets.add(new DataFacet(CSV, "CSV data", ComputeType.ADVANCE, hash, stateId)); + facets.add(new DataFacet(WST, "WST data", ComputeType.ADVANCE, hash, stateId)); + facets.add(new DataFacet(PDF, "PDF data", ComputeType.ADVANCE, hash, stateId)); } - facets.add(new DataFacet(AT, "AT data", ComputeType.ADVANCE, hash, id)); + facets.add(new DataFacet(AT, "AT data", ComputeType.ADVANCE, hash, stateId)); if (fixRes != null) facets.add(new FixWQCurveFacet(0, Resources.getMsg(meta, I18N_WQ_CURVE, I18N_WQ_CURVE) + " (" + access.getFunction() + ")"));