Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/states/WQSelect.java @ 8757:bd17bd07db69
Remove further indirection in WINFOArtifact.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Fri, 26 Jun 2015 14:31:08 +0200 |
| parents | 26dedebbe39f |
| children | 9483a5bf4219 |
comparison
equal
deleted
inserted
replaced
| 8756:26dedebbe39f | 8757:bd17bd07db69 |
|---|---|
| 29 import org.dive4elements.river.model.River; | 29 import org.dive4elements.river.model.River; |
| 30 import org.dive4elements.river.model.Wst; | 30 import org.dive4elements.river.model.Wst; |
| 31 | 31 |
| 32 import org.dive4elements.river.artifacts.D4EArtifact; | 32 import org.dive4elements.river.artifacts.D4EArtifact; |
| 33 import org.dive4elements.river.artifacts.WINFOArtifact; | 33 import org.dive4elements.river.artifacts.WINFOArtifact; |
| 34 | |
| 35 import org.dive4elements.river.artifacts.access.RangeAccess; | |
| 34 | 36 |
| 35 import org.dive4elements.river.artifacts.model.WstFactory; | 37 import org.dive4elements.river.artifacts.model.WstFactory; |
| 36 import org.dive4elements.river.artifacts.model.WstValueTable; | 38 import org.dive4elements.river.artifacts.model.WstValueTable; |
| 37 import org.dive4elements.river.artifacts.model.WstValueTableFactory; | 39 import org.dive4elements.river.artifacts.model.WstValueTableFactory; |
| 38 import org.dive4elements.river.artifacts.resources.Resources; | 40 import org.dive4elements.river.artifacts.resources.Resources; |
| 428 RiverUtils.getRiver(winfo)); | 430 RiverUtils.getRiver(winfo)); |
| 429 | 431 |
| 430 double[] minmaxW = null; | 432 double[] minmaxW = null; |
| 431 if(valueTable != null) { | 433 if(valueTable != null) { |
| 432 double[] km = null; | 434 double[] km = null; |
| 433 if(winfo.isRange()) { | 435 if(new RangeAccess(winfo).isRange()) { |
| 434 km = winfo.getFromToStep(); | 436 km = winfo.getFromToStep(); |
| 435 // Use the start km to determine the min max values. | 437 // Use the start km to determine the min max values. |
| 436 minmaxW = valueTable.getMinMaxW(km[0]); | 438 minmaxW = valueTable.getMinMaxW(km[0]); |
| 437 } | 439 } |
| 438 else { | 440 else { |
| 491 RiverUtils.getRiver(winfo)); | 493 RiverUtils.getRiver(winfo)); |
| 492 | 494 |
| 493 double[] minmaxQ = null; | 495 double[] minmaxQ = null; |
| 494 if(valueTable != null) { | 496 if(valueTable != null) { |
| 495 double[] km = null; | 497 double[] km = null; |
| 496 if(winfo.isRange()) { | 498 if(new RangeAccess(winfo).isRange()) { |
| 497 km = winfo.getFromToStep(); | 499 km = winfo.getFromToStep(); |
| 498 minmaxQ = valueTable.getMinMaxQ(km[0], km[1], km[2]); | 500 minmaxQ = valueTable.getMinMaxQ(km[0], km[1], km[2]); |
| 499 } | 501 } |
| 500 else { | 502 else { |
| 501 km = winfo.getKms(); | 503 km = winfo.getKms(); |