Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionState.java @ 9205:3dae6b78e1da
inundationDuration/floodDuration multiple columns+chartLines refactoring
| author | gernotbelger |
|---|---|
| date | Mon, 02 Jul 2018 19:01:09 +0200 |
| parents | 4f411c6ee3ae |
| children | 0fc9c82e744e |
comparison
equal
deleted
inserted
replaced
| 9204:4f411c6ee3ae | 9205:3dae6b78e1da |
|---|---|
| 76 // | 76 // |
| 77 final CollisionCalculationResults results = (CollisionCalculationResults) res.getData(); | 77 final CollisionCalculationResults results = (CollisionCalculationResults) res.getData(); |
| 78 | 78 |
| 79 /* add themes for chart, for each result */ | 79 /* add themes for chart, for each result */ |
| 80 final List<AbstractCalculationExportableResult> resultList = results.getResults(); | 80 final List<AbstractCalculationExportableResult> resultList = results.getResults(); |
| 81 int j = -1; | 81 int themeCount = 0; |
| 82 for (int index = 0; index < resultList.size(); index++) { | 82 for (int index = 0; index < resultList.size(); index++) { |
| 83 if (resultList.get(index) instanceof CollisionCalcOverviewResult) { | 83 if (resultList.get(index) instanceof CollisionCalcOverviewResult) { |
| 84 final CollisionCalcOverviewResult result = (CollisionCalcOverviewResult) resultList.get(index); | 84 final CollisionCalcOverviewResult result = (CollisionCalcOverviewResult) resultList.get(index); |
| 85 if (result.getSingleYears() == null) | 85 |
| 86 facets.add(CollisionCalcProcessor.createFacet(context, hash, this.id, result, index)); | 86 final int[] singleYears = result.getSingleYears(); |
| 87 | |
| 88 if (singleYears == null) | |
| 89 facets.add(CollisionCalcProcessor.createFacet(context, hash, this.id, result, index, -1, themeCount++)); | |
| 87 else { | 90 else { |
| 88 for (int i = 0; i <= result.getSingleYears().length - 1; i++) { | 91 for (final int singleYear : singleYears) |
| 89 j++; | 92 facets.add(CollisionCalcProcessor.createFacet(context, hash, this.id, result, index, singleYear, themeCount++)); |
| 90 facets.add(CollisionCalcProcessor.createFacet(context, hash, this.id, result, j)); | |
| 91 } | |
| 92 } | 93 } |
| 93 } | 94 } |
| 94 } | 95 } |
| 95 | 96 |
| 96 if (!resultList.isEmpty()) { | 97 if (!resultList.isEmpty()) { |