Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedParametersResult.java @ 3785:a5f65e8983be
Merged revisions 5501-5502,5504-5508,5511-5513,5516-5519 via svnmerge from
file:///home/clients/bsh/bsh-generischer-viewer/Material/SVN/flys-artifacts/trunk
........
r5501 | felix | 2012-09-18 11:49:45 +0200 (Di, 18 Sep 2012) | 1 line
fix issue865 - missing showarea theme prop.
........
r5502 | clins | 2012-09-18 12:18:30 +0200 (Di, 18 Sep 2012) | 1 line
Add robustness checks to prevent NPEs
........
r5504 | felix | 2012-09-18 14:03:15 +0200 (Di, 18 Sep 2012) | 1 line
i18n for area label (fix issue487).
........
r5505 | clins | 2012-09-18 16:19:59 +0200 (Di, 18 Sep 2012) | 1 line
Update themes to show point descriptions
........
r5506 | rrenkert | 2012-09-18 17:00:30 +0200 (Di, 18 Sep 2012) | 3 lines
Removed incorrect characteristic diameter.
........
r5507 | rrenkert | 2012-09-18 17:03:20 +0200 (Di, 18 Sep 2012) | 3 lines
Fixed some stupid bugs in bed quality data factory and calculation.
........
r5508 | teichmann | 2012-09-18 17:45:49 +0200 (Di, 18 Sep 2012) | 1 line
The usual whitespace and import cleanups.
........
r5511 | teichmann | 2012-09-18 18:24:51 +0200 (Di, 18 Sep 2012) | 1 line
Use generics aware Collections.emptyList().
........
r5512 | teichmann | 2012-09-18 20:36:52 +0200 (Di, 18 Sep 2012) | 1 line
Some more little steps towards "Auslagerung extremer Wasserspiegellagen".
........
r5513 | clins | 2012-09-18 23:38:19 +0200 (Di, 18 Sep 2012) | 1 line
A and B facets of fix analyis are now deactivated by default
........
r5516 | bricks | 2012-09-19 10:45:51 +0200 (Mi, 19 Sep 2012) | 2 lines
Add the gauge station to the GaugeOverviewInfoService xml response
........
r5517 | rrenkert | 2012-09-19 10:50:23 +0200 (Mi, 19 Sep 2012) | 3 lines
Added CSV export to bed quality calculation.
........
r5518 | bricks | 2012-09-19 11:04:04 +0200 (Mi, 19 Sep 2012) | 2 lines
Fix date in changelog entry
........
r5519 | teichmann | 2012-09-19 11:17:14 +0200 (Mi, 19 Sep 2012) | 1 line
Removed trailing whitespace.
........
flys-artifacts/tags/2.9.1@5531 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Wed, 19 Sep 2012 14:58:31 +0000 |
parents | 9f9d5ada96ca |
children |
comparison
equal
deleted
inserted
replaced
3784:9f9d5ada96ca | 3785:a5f65e8983be |
---|---|
46 | 46 |
47 public double getLoadDensitySub(int ndx) { | 47 public double getLoadDensitySub(int ndx) { |
48 return loadDensitySub.get(ndx); | 48 return loadDensitySub.get(ndx); |
49 } | 49 } |
50 | 50 |
51 public double getPorosityCap(double km) { | |
52 if (kms.indexOf(km) >= 0) { | |
53 return porosityCap.get(kms.indexOf(km)); | |
54 } | |
55 return Double.NaN; | |
56 } | |
57 | |
58 public double getPorositySub(double km) { | |
59 if (kms.indexOf(km) >= 0) { | |
60 return porositySub.get(kms.indexOf(km)); | |
61 } | |
62 return Double.NaN; | |
63 } | |
64 | |
65 public double getLoadDensityCap(double km) { | |
66 if (kms.indexOf(km) >= 0) { | |
67 return loadDensityCap.get(kms.indexOf(km)); | |
68 } | |
69 return Double.NaN; | |
70 } | |
71 | |
72 public double getLoadDensitySub(double km) { | |
73 if (kms.indexOf(km) >= 0) { | |
74 return loadDensitySub.get(kms.indexOf(km)); | |
75 } | |
76 return Double.NaN; | |
77 } | |
78 | |
51 public double[][] getPorosityCapData() { | 79 public double[][] getPorosityCapData() { |
52 return new double[][] { | 80 return new double[][] { |
53 kms.toNativeArray(), | 81 kms.toNativeArray(), |
54 porosityCap.toNativeArray() | 82 porosityCap.toNativeArray() |
55 }; | 83 }; |