Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculation.java @ 9391:2da486c7c05f
salix historical sounding workflow changed
| author | gernotbelger |
|---|---|
| date | Thu, 09 Aug 2018 17:25:13 +0200 |
| parents | 2aec052d4088 |
| children | 439699ff9b2d |
comparison
equal
deleted
inserted
replaced
| 9390:f575ff573cbb | 9391:2da486c7c05f |
|---|---|
| 132 if (access.getScenario() == ScenarioType.REGIONAL) { | 132 if (access.getScenario() == ScenarioType.REGIONAL) { |
| 133 final int[] deltaws = access.getRegionalScenarioIntegers(); | 133 final int[] deltaws = access.getRegionalScenarioIntegers(); |
| 134 for (int i = 0; i <= deltaws.length - 1; i++) | 134 for (int i = 0; i <= deltaws.length - 1; i++) |
| 135 if (deltaws[i] != 0) | 135 if (deltaws[i] != 0) |
| 136 labels.add(Integer.toString(deltaws[i]) + " cm"); | 136 labels.add(Integer.toString(deltaws[i]) + " cm"); |
| 137 } | 137 } else if (access.getScenario() == ScenarioType.SUPRAREGIONAL) |
| 138 else if (access.getScenario() == ScenarioType.SUPRAREGIONAL) | |
| 139 labels.add(Resources.getMsg(this.context.getMeta(), "uinfo_salix_scenario_supraregional")); | 138 labels.add(Resources.getMsg(this.context.getMeta(), "uinfo_salix_scenario_supraregional")); |
| 140 else if (access.getScenario() == ScenarioType.HISTORICAL) | 139 else if (access.getScenario() == ScenarioType.HISTORICAL) |
| 141 labels.add(Resources.getMsg(this.context.getMeta(), "uinfo_salix_scenario_historical")); | 140 labels.add(Resources.getMsg(this.context.getMeta(), "uinfo_salix_scenario_historical")); |
| 142 return labels.toArray(new String[labels.size()]); | 141 return labels.toArray(new String[labels.size()]); |
| 143 } | 142 } |
| 178 sep = ", "; | 177 sep = ", "; |
| 179 } | 178 } |
| 180 return deltas; | 179 return deltas; |
| 181 } | 180 } |
| 182 if (access.getScenario() == ScenarioType.HISTORICAL) { | 181 if (access.getScenario() == ScenarioType.HISTORICAL) { |
| 183 if (access.getYear() != null) | 182 return String.valueOf(access.getYearEpoch()); |
| 184 return access.getYear().toString(); | |
| 185 else | |
| 186 return access.getEpoch().toString(); | |
| 187 } | 183 } |
| 188 if (access.getScenario() == ScenarioType.SUPRAREGIONAL) { | 184 if (access.getScenario() == ScenarioType.SUPRAREGIONAL) { |
| 189 String deltas = ""; | 185 String deltas = ""; |
| 190 String sep = ""; | 186 String sep = ""; |
| 191 final List<SalixZone> parts = SalixZone.parse(access.getSupraRegionalString()); | 187 final List<SalixZone> parts = SalixZone.parse(access.getSupraRegionalString()); |