Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineState.java @ 9368:6f7e92c16050
Fixed U-Info salix mw calculation, added filtered themes, own y axis, warning report
author | mschaefer |
---|---|
date | Thu, 02 Aug 2018 16:11:12 +0200 |
parents | 2aec052d4088 |
children | b6e595f1696f |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineState.java Thu Aug 02 16:08:51 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineState.java Thu Aug 02 16:11:12 2018 +0200 @@ -80,8 +80,11 @@ int facetIndex = 0; if (!resultList.isEmpty()) { - facets.add(SalixLineProcessor.createSalixLineFacet(context, hash, this.id, facetIndex++, 0)); - facets.add(SalixLineProcessor.createSalixMnwMwFacet(context, hash, this.id, facetIndex++, 0)); + facets.add(SalixLineProcessor.createSalixLineFilteredFacet(context, hash, this.id, facetIndex++, 0)); + facets.add(SalixLineProcessor.createSalixLineRawFacet(context, hash, this.id, facetIndex++, 0)); + facets.add(SalixLineProcessor.createSalixMnwMwFilteredFacet(context, hash, this.id, facetIndex++, 0)); + facets.add(SalixLineProcessor.createSalixMnwMwRawFacet(context, hash, this.id, facetIndex++, 0)); + facets.add(SalixLineProcessor.createSalixRankFacet(context, hash, this.id, facetIndex++, 0)); final SalixLineCalculationResult result = resultList.get(0); @@ -90,7 +93,8 @@ result.getScenarioLabel(i)); // REMARK: using data index as facetIndex, as we know there is only one result of this type. Else we should just // increment - facets.add(SalixLineProcessor.createSalixScenarioFacet(context, hash, this.id, i, 0, facetIndex++, sublabel)); + facets.add(SalixLineProcessor.createSalixScenarioFilteredFacet(context, hash, this.id, i, 0, facetIndex++, sublabel)); + facets.add(SalixLineProcessor.createSalixScenarioRawFacet(context, hash, this.id, i, 0, facetIndex++, sublabel)); } final Facet csv = new DataFacet(FacetTypes.CSV, "CSV data", ComputeType.ADVANCE, hash, this.id);