Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/states/extreme/ExtremeCompute.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 | 5e38e2924c07 |
| children |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/extreme/ExtremeCompute.java Fri Aug 17 14:29:05 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/extreme/ExtremeCompute.java Fri Aug 17 15:31:02 2018 +0200 @@ -80,7 +80,7 @@ } ExtremeResult eres = (ExtremeResult) res.getData(); - WQKms [] wqkms = (WQKms []) eres.getWQKms(); + WQKms [] wqkms = eres.getWQKms(); if (wqkms == null) { log.error("No computation result!"); @@ -93,11 +93,9 @@ String qname = name.replace("W(","Q="); qname = qname.substring(0,qname.length()-1); - Facet w = new WaterlevelFacet( - i, LONGITUDINAL_W, name, ComputeType.ADVANCE, id, hash); - Facet q = new WaterlevelFacet( - i, LONGITUDINAL_Q, qname, ComputeType.ADVANCE, id, hash); - Facet csFacet = new CrossSectionWaterLineFacet(i, name); + Facet w = new WaterlevelFacet( i, LONGITUDINAL_W, name, ComputeType.ADVANCE, id, hash ); + Facet q = new WaterlevelFacet( i, LONGITUDINAL_Q, qname, ComputeType.ADVANCE, id, hash ); + Facet csFacet = new CrossSectionWaterLineFacet( i, name, ComputeType.ADVANCE, hash, getID(), Integer.valueOf(i) ); facets.add(w); facets.add(q); @@ -105,18 +103,12 @@ } - facets.add( - new DataFacet(CSV, "CSV data", ComputeType.ADVANCE, hash, id)); - facets.add( - new DataFacet(PDF, "PDF data", ComputeType.ADVANCE, hash, id)); - facets.add( - new DataFacet(WST, "WST data", ComputeType.ADVANCE, hash, id)); + facets.add(new DataFacet(CSV, "CSV data", ComputeType.ADVANCE, hash, id)); + facets.add(new DataFacet(PDF, "PDF data", ComputeType.ADVANCE, hash, id)); + facets.add(new DataFacet(WST, "WST data", ComputeType.ADVANCE, hash, id)); - facets.add(new ExtremeCurveFacet(Resources.getMsg(context.getMeta(), - "extreme_wq_curve", "extreme_wq_curve"))); - facets.add(new ExtremeCurveFacet(Resources.getMsg(context.getMeta(), - "extreme_wq_base_curve", "extreme_wq_base_curve"), - true)); + facets.add(new ExtremeCurveFacet(Resources.getMsg(context.getMeta(), "extreme_wq_curve", "extreme_wq_curve"))); + facets.add(new ExtremeCurveFacet(Resources.getMsg(context.getMeta(), "extreme_wq_base_curve", "extreme_wq_base_curve"), true)); return res; }