Mercurial > dive4elements > river
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 9367:8aa1605e58f1 | 9368:6f7e92c16050 |
|---|---|
| 78 final List<SalixLineCalculationResult> resultList = results.getResults(); | 78 final List<SalixLineCalculationResult> resultList = results.getResults(); |
| 79 | 79 |
| 80 int facetIndex = 0; | 80 int facetIndex = 0; |
| 81 | 81 |
| 82 if (!resultList.isEmpty()) { | 82 if (!resultList.isEmpty()) { |
| 83 facets.add(SalixLineProcessor.createSalixLineFacet(context, hash, this.id, facetIndex++, 0)); | 83 facets.add(SalixLineProcessor.createSalixLineFilteredFacet(context, hash, this.id, facetIndex++, 0)); |
| 84 facets.add(SalixLineProcessor.createSalixMnwMwFacet(context, hash, this.id, facetIndex++, 0)); | 84 facets.add(SalixLineProcessor.createSalixLineRawFacet(context, hash, this.id, facetIndex++, 0)); |
| 85 facets.add(SalixLineProcessor.createSalixMnwMwFilteredFacet(context, hash, this.id, facetIndex++, 0)); | |
| 86 facets.add(SalixLineProcessor.createSalixMnwMwRawFacet(context, hash, this.id, facetIndex++, 0)); | |
| 87 facets.add(SalixLineProcessor.createSalixRankFacet(context, hash, this.id, facetIndex++, 0)); | |
| 85 | 88 |
| 86 final SalixLineCalculationResult result = resultList.get(0); | 89 final SalixLineCalculationResult result = resultList.get(0); |
| 87 | 90 |
| 88 for (int i = 0; i <= result.getScenarioCount() - 1; i++) { | 91 for (int i = 0; i <= result.getScenarioCount() - 1; i++) { |
| 89 final String sublabel = Resources.getMsg(context.getMeta(), "uinfo_salix_scenario_deltaw", "uinfo_salix_scenario_deltaw", | 92 final String sublabel = Resources.getMsg(context.getMeta(), "uinfo_salix_scenario_deltaw", "uinfo_salix_scenario_deltaw", |
| 90 result.getScenarioLabel(i)); | 93 result.getScenarioLabel(i)); |
| 91 // REMARK: using data index as facetIndex, as we know there is only one result of this type. Else we should just | 94 // REMARK: using data index as facetIndex, as we know there is only one result of this type. Else we should just |
| 92 // increment | 95 // increment |
| 93 facets.add(SalixLineProcessor.createSalixScenarioFacet(context, hash, this.id, i, 0, facetIndex++, sublabel)); | 96 facets.add(SalixLineProcessor.createSalixScenarioFilteredFacet(context, hash, this.id, i, 0, facetIndex++, sublabel)); |
| 97 facets.add(SalixLineProcessor.createSalixScenarioRawFacet(context, hash, this.id, i, 0, facetIndex++, sublabel)); | |
| 94 } | 98 } |
| 95 | 99 |
| 96 final Facet csv = new DataFacet(FacetTypes.CSV, "CSV data", ComputeType.ADVANCE, hash, this.id); | 100 final Facet csv = new DataFacet(FacetTypes.CSV, "CSV data", ComputeType.ADVANCE, hash, this.id); |
| 97 final Facet pdf = new DataFacet(FacetTypes.PDF, "PDF data", ComputeType.ADVANCE, hash, this.id); | 101 final Facet pdf = new DataFacet(FacetTypes.PDF, "PDF data", ComputeType.ADVANCE, hash, this.id); |
| 98 | 102 |