Mercurial > dive4elements > river
annotate artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/BedQualityState.java @ 8585:e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
This should make it easier to reuse those for interpolation facets.
author | Andre Heinecke <andre.heinecke@intevation.de> |
---|---|
date | Tue, 17 Mar 2015 16:37:17 +0100 |
parents | b0d7b0d79d6e |
children | 07c9ac22f611 |
rev | line source |
---|---|
5863
4897a58c8746
River artifacts: Added new copyright headers.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5838
diff
changeset
|
1 /* Copyright (C) 2011, 2012, 2013 by Bundesanstalt für Gewässerkunde |
4897a58c8746
River artifacts: Added new copyright headers.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5838
diff
changeset
|
2 * Software engineering by Intevation GmbH |
4897a58c8746
River artifacts: Added new copyright headers.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5838
diff
changeset
|
3 * |
5994
af13ceeba52a
Removed trailing whitespace.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5867
diff
changeset
|
4 * This file is Free Software under the GNU AGPL (>=v3) |
5863
4897a58c8746
River artifacts: Added new copyright headers.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5838
diff
changeset
|
5 * and comes with ABSOLUTELY NO WARRANTY! Check out the |
5994
af13ceeba52a
Removed trailing whitespace.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5867
diff
changeset
|
6 * documentation coming with Dive4Elements River for details. |
5863
4897a58c8746
River artifacts: Added new copyright headers.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5838
diff
changeset
|
7 */ |
4897a58c8746
River artifacts: Added new copyright headers.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5838
diff
changeset
|
8 |
5831
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4825
diff
changeset
|
9 package org.dive4elements.river.artifacts.states.minfo; |
3629
f3717e625b0a
MINFO: Added states and config for bed quality calculation.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
10 |
3749
3dcc4feff243
Created the initial structure for MINFO bed quality chart generation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3629
diff
changeset
|
11 import java.util.ArrayList; |
3767
b4ad8dafe584
Created i18n descriptions for facets in bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3766
diff
changeset
|
12 import java.util.Date; |
3749
3dcc4feff243
Created the initial structure for MINFO bed quality chart generation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3629
diff
changeset
|
13 import java.util.List; |
3dcc4feff243
Created the initial structure for MINFO bed quality chart generation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3629
diff
changeset
|
14 |
3dcc4feff243
Created the initial structure for MINFO bed quality chart generation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3629
diff
changeset
|
15 import org.apache.log4j.Logger; |
3dcc4feff243
Created the initial structure for MINFO bed quality chart generation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3629
diff
changeset
|
16 |
5831
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4825
diff
changeset
|
17 import org.dive4elements.artifactdatabase.state.Facet; |
6262
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
18 import org.dive4elements.artifactdatabase.state.FacetActivity; |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
19 import org.dive4elements.artifacts.Artifact; |
5831
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4825
diff
changeset
|
20 import org.dive4elements.artifacts.CallContext; |
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4825
diff
changeset
|
21 import org.dive4elements.artifacts.CallMeta; |
5867
59ff03ff48f1
River artifacts: Renamed FLYSArtifact(Collection) to D4EArtifact(Collection).
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5863
diff
changeset
|
22 import org.dive4elements.river.artifacts.D4EArtifact; |
5831
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4825
diff
changeset
|
23 import org.dive4elements.river.artifacts.access.BedQualityAccess; |
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4825
diff
changeset
|
24 import org.dive4elements.river.artifacts.model.CalculationResult; |
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4825
diff
changeset
|
25 import org.dive4elements.river.artifacts.model.DataFacet; |
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4825
diff
changeset
|
26 import org.dive4elements.river.artifacts.model.DateRange; |
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4825
diff
changeset
|
27 import org.dive4elements.river.artifacts.model.FacetTypes; |
7987
98ca61cb58fb
Split bed quality facets and updated processors and state.
Raimund Renkert <rrenkert@intevation.de>
parents:
7254
diff
changeset
|
28 import org.dive4elements.river.artifacts.model.minfo.BedDensityTopFacet; |
98ca61cb58fb
Split bed quality facets and updated processors and state.
Raimund Renkert <rrenkert@intevation.de>
parents:
7254
diff
changeset
|
29 import org.dive4elements.river.artifacts.model.minfo.BedDensitySubFacet; |
98ca61cb58fb
Split bed quality facets and updated processors and state.
Raimund Renkert <rrenkert@intevation.de>
parents:
7254
diff
changeset
|
30 import org.dive4elements.river.artifacts.model.minfo.BedDiameterTopFacet; |
6252
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
31 import org.dive4elements.river.artifacts.model.minfo.BedDiameterDataFacet; |
5831
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4825
diff
changeset
|
32 import org.dive4elements.river.artifacts.model.minfo.BedDiameterResult; |
7987
98ca61cb58fb
Split bed quality facets and updated processors and state.
Raimund Renkert <rrenkert@intevation.de>
parents:
7254
diff
changeset
|
33 import org.dive4elements.river.artifacts.model.minfo.BedDiameterSubFacet; |
5831
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4825
diff
changeset
|
34 import org.dive4elements.river.artifacts.model.minfo.BedParametersResult; |
7987
98ca61cb58fb
Split bed quality facets and updated processors and state.
Raimund Renkert <rrenkert@intevation.de>
parents:
7254
diff
changeset
|
35 import org.dive4elements.river.artifacts.model.minfo.BedPorositySubFacet; |
98ca61cb58fb
Split bed quality facets and updated processors and state.
Raimund Renkert <rrenkert@intevation.de>
parents:
7254
diff
changeset
|
36 import org.dive4elements.river.artifacts.model.minfo.BedPorosityTopFacet; |
5831
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4825
diff
changeset
|
37 import org.dive4elements.river.artifacts.model.minfo.BedQualityCalculation; |
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4825
diff
changeset
|
38 import org.dive4elements.river.artifacts.model.minfo.BedQualityDiameterResult; |
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4825
diff
changeset
|
39 import org.dive4elements.river.artifacts.model.minfo.BedQualityResult; |
6262
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
40 import org.dive4elements.river.artifacts.model.minfo.BedloadDiameterDataFacet; |
5831
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4825
diff
changeset
|
41 import org.dive4elements.river.artifacts.model.minfo.BedloadDiameterFacet; |
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4825
diff
changeset
|
42 import org.dive4elements.river.artifacts.model.minfo.BedloadDiameterResult; |
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4825
diff
changeset
|
43 import org.dive4elements.river.artifacts.resources.Resources; |
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4825
diff
changeset
|
44 import org.dive4elements.river.artifacts.states.DefaultState; |
3629
f3717e625b0a
MINFO: Added states and config for bed quality calculation.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
45 |
3750
e560a9a10eb1
Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
3749
diff
changeset
|
46 |
3757
e8a90a5ce624
Added facets and chart generator for bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3750
diff
changeset
|
47 public class BedQualityState extends DefaultState implements FacetTypes { |
e8a90a5ce624
Added facets and chart generator for bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3750
diff
changeset
|
48 |
e8a90a5ce624
Added facets and chart generator for bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3750
diff
changeset
|
49 private static final long serialVersionUID = 1L; |
e8a90a5ce624
Added facets and chart generator for bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3750
diff
changeset
|
50 |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
7987
diff
changeset
|
51 private static final Logger log = Logger |
3757
e8a90a5ce624
Added facets and chart generator for bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3750
diff
changeset
|
52 .getLogger(BedQualityState.class); |
3750
e560a9a10eb1
Removed trailing whitespace.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
3749
diff
changeset
|
53 |
3767
b4ad8dafe584
Created i18n descriptions for facets in bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3766
diff
changeset
|
54 public static final String I18N_TOPLAYER = "bedquality.toplayer"; |
b4ad8dafe584
Created i18n descriptions for facets in bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3766
diff
changeset
|
55 public static final String I18N_SUBLAYER = "bedquality.sublayer"; |
b4ad8dafe584
Created i18n descriptions for facets in bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3766
diff
changeset
|
56 |
8585
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
57 /* Calculated layers */ |
3767
b4ad8dafe584
Created i18n descriptions for facets in bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3766
diff
changeset
|
58 public static final String I18N_FACET_BED_POROSITY_TOPLAYER = "facet.bedquality.bed.porosity.toplayer"; |
b4ad8dafe584
Created i18n descriptions for facets in bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3766
diff
changeset
|
59 public static final String I18N_FACET_BED_POROSITY_SUBLAYER = "facet.bedquality.bed.porosity.sublayer"; |
b4ad8dafe584
Created i18n descriptions for facets in bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3766
diff
changeset
|
60 public static final String I18N_FACET_BED_DENSITY_TOPLAYER = "facet.bedquality.bed.density.toplayer"; |
b4ad8dafe584
Created i18n descriptions for facets in bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3766
diff
changeset
|
61 public static final String I18N_FACET_BED_DENSITY_SUBLAYER = "facet.bedquality.bed.density.sublayer"; |
b4ad8dafe584
Created i18n descriptions for facets in bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3766
diff
changeset
|
62 public static final String I18N_FACET_BED_DIAMETER_TOPLAYER = "facet.bedquality.bed.diameter.toplayer"; |
b4ad8dafe584
Created i18n descriptions for facets in bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3766
diff
changeset
|
63 public static final String I18N_FACET_BED_DIAMETER_SUBLAYER = "facet.bedquality.bed.diameter.sublayer"; |
8585
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
64 public static final String I18N_FACET_BEDLOAD_DIAMETER = "facet.bedquality.bedload.diameter"; |
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
65 |
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
66 /* Data Layers */ |
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
67 public static final String I18N_FACET_BEDLOAD_DIAMETER_DATA = "facet.bedquality.bedload.diameter.data"; |
6252
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
68 public static final String I18N_FACET_BED_DIAMETER_DATA_TOPLAYER = "facet.bedquality.bed.diameter.data.toplayer"; |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
69 public static final String I18N_FACET_BED_DIAMETER_DATA_SUBLAYER = "facet.bedquality.bed.diameter.data.sublayer"; |
3767
b4ad8dafe584
Created i18n descriptions for facets in bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3766
diff
changeset
|
70 |
6262
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
71 static { |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
72 // Active/deactivate facets. |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
73 FacetActivity.Registry.getInstance().register( |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
74 "minfo", |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
75 new FacetActivity() { |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
76 @Override |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
77 public Boolean isInitialActive( |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
78 Artifact artifact, |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
79 Facet facet, |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
80 String output |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
81 ) { |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
82 String name = facet.getName(); |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
83 if (name.equals(BED_QUALITY_SEDIMENT_DENSITY_TOPLAYER) || |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
84 name.equals(BED_QUALITY_SEDIMENT_DENSITY_SUBLAYER) || |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
85 name.equals(BED_DIAMETER_DATA_TOP) || |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
86 name.equals(BED_DIAMETER_DATA_SUB) || |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
87 name.equals(BEDLOAD_DIAMETER_DATA)){ |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
88 return Boolean.FALSE; |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
89 } |
8274
b0d7b0d79d6e
Set facet activity for bed quality.
"Tom Gottfried <tom@intevation.de>"
parents:
8202
diff
changeset
|
90 if (name.equals(BED_QUALITY_POROSITY_TOPLAYER) || |
b0d7b0d79d6e
Set facet activity for bed quality.
"Tom Gottfried <tom@intevation.de>"
parents:
8202
diff
changeset
|
91 name.equals(BED_QUALITY_POROSITY_SUBLAYER) || |
b0d7b0d79d6e
Set facet activity for bed quality.
"Tom Gottfried <tom@intevation.de>"
parents:
8202
diff
changeset
|
92 name.equals(BED_QUALITY_BED_DIAMETER_TOPLAYER) || |
b0d7b0d79d6e
Set facet activity for bed quality.
"Tom Gottfried <tom@intevation.de>"
parents:
8202
diff
changeset
|
93 name.equals(BED_QUALITY_BED_DIAMETER_SUBLAYER) || |
b0d7b0d79d6e
Set facet activity for bed quality.
"Tom Gottfried <tom@intevation.de>"
parents:
8202
diff
changeset
|
94 name.equals(BED_QUALITY_BEDLOAD_DIAMETER)) { |
b0d7b0d79d6e
Set facet activity for bed quality.
"Tom Gottfried <tom@intevation.de>"
parents:
8202
diff
changeset
|
95 return Boolean.TRUE; |
6262
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
96 } |
8274
b0d7b0d79d6e
Set facet activity for bed quality.
"Tom Gottfried <tom@intevation.de>"
parents:
8202
diff
changeset
|
97 return null; |
6262
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
98 } |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
99 }); |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
100 } |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
101 |
3749
3dcc4feff243
Created the initial structure for MINFO bed quality chart generation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3629
diff
changeset
|
102 @Override |
5867
59ff03ff48f1
River artifacts: Renamed FLYSArtifact(Collection) to D4EArtifact(Collection).
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5863
diff
changeset
|
103 public Object computeAdvance(D4EArtifact artifact, String hash, |
3757
e8a90a5ce624
Added facets and chart generator for bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3750
diff
changeset
|
104 CallContext context, List<Facet> facets, Object old) { |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
7987
diff
changeset
|
105 log.debug("BedQualityState.computeAdvance"); |
3629
f3717e625b0a
MINFO: Added states and config for bed quality calculation.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
106 |
3749
3dcc4feff243
Created the initial structure for MINFO bed quality chart generation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3629
diff
changeset
|
107 List<Facet> newFacets = new ArrayList<Facet>(); |
3dcc4feff243
Created the initial structure for MINFO bed quality chart generation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3629
diff
changeset
|
108 |
4825
f8217f1fef2e
ExtremeAccess, RangeAccess and callers: Refactored, moved getStep to RangeAccess.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
3785
diff
changeset
|
109 BedQualityAccess access = new BedQualityAccess(artifact, context); |
3749
3dcc4feff243
Created the initial structure for MINFO bed quality chart generation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3629
diff
changeset
|
110 |
3757
e8a90a5ce624
Added facets and chart generator for bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3750
diff
changeset
|
111 CalculationResult res = old instanceof CalculationResult ? (CalculationResult) old |
3749
3dcc4feff243
Created the initial structure for MINFO bed quality chart generation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3629
diff
changeset
|
112 : new BedQualityCalculation().calculate(access); |
3dcc4feff243
Created the initial structure for MINFO bed quality chart generation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3629
diff
changeset
|
113 |
3dcc4feff243
Created the initial structure for MINFO bed quality chart generation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3629
diff
changeset
|
114 if (facets == null || res == null) { |
3dcc4feff243
Created the initial structure for MINFO bed quality chart generation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3629
diff
changeset
|
115 return res; |
3dcc4feff243
Created the initial structure for MINFO bed quality chart generation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3629
diff
changeset
|
116 } |
3dcc4feff243
Created the initial structure for MINFO bed quality chart generation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3629
diff
changeset
|
117 |
3762
0c978a80726a
Splitted up facets for porosity and density into two facets: a toplayer and a sublayer facet for each. BedQualityState will now create facets based on the calculation result.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3761
diff
changeset
|
118 BedQualityResult[] results = (BedQualityResult[]) res.getData(); |
3757
e8a90a5ce624
Added facets and chart generator for bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3750
diff
changeset
|
119 |
3762
0c978a80726a
Splitted up facets for porosity and density into two facets: a toplayer and a sublayer facet for each. BedQualityState will now create facets based on the calculation result.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3761
diff
changeset
|
120 if (results == null || results.length == 0) { |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
7987
diff
changeset
|
121 log.warn("Calculation computed no results!"); |
3762
0c978a80726a
Splitted up facets for porosity and density into two facets: a toplayer and a sublayer facet for each. BedQualityState will now create facets based on the calculation result.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3761
diff
changeset
|
122 return res; |
0c978a80726a
Splitted up facets for porosity and density into two facets: a toplayer and a sublayer facet for each. BedQualityState will now create facets based on the calculation result.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3761
diff
changeset
|
123 } |
3757
e8a90a5ce624
Added facets and chart generator for bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3750
diff
changeset
|
124 |
3767
b4ad8dafe584
Created i18n descriptions for facets in bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3766
diff
changeset
|
125 generateFacets(context, newFacets, results, getID(), hash); |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
7987
diff
changeset
|
126 log.debug("Created " + newFacets.size() + " new Facets."); |
6252
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
127 generateDataFacets(context, newFacets, access, getID(), hash); |
3749
3dcc4feff243
Created the initial structure for MINFO bed quality chart generation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3629
diff
changeset
|
128 facets.addAll(newFacets); |
3dcc4feff243
Created the initial structure for MINFO bed quality chart generation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3629
diff
changeset
|
129 |
3dcc4feff243
Created the initial structure for MINFO bed quality chart generation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3629
diff
changeset
|
130 return res; |
3dcc4feff243
Created the initial structure for MINFO bed quality chart generation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3629
diff
changeset
|
131 } |
3762
0c978a80726a
Splitted up facets for porosity and density into two facets: a toplayer and a sublayer facet for each. BedQualityState will now create facets based on the calculation result.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3761
diff
changeset
|
132 |
6252
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
133 private void generateDataFacets( |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
134 CallContext context, |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
135 List<Facet> newFacets, |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
136 BedQualityAccess access, |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
137 String stateId, |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
138 String hash) { |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
139 List<String> diameters = access.getBedDiameter(); |
6262
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
140 List<String> loadDiameters = access.getBedloadDiameter(); |
6252
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
141 List<DateRange> ranges = access.getDateRanges(); |
7254
fe32a7f9655e
Reduce usage of careless 'for (int i = 0; i < x.size(); i++)' pattern.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6262
diff
changeset
|
142 for (int i = 0, R = ranges.size(); i < R; i++) { |
6252
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
143 DateRange range = ranges.get(i); |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
144 for (String diameter: diameters) { |
6262
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
145 int ndxTop = generateIndex(diameter); |
7254
fe32a7f9655e
Reduce usage of careless 'for (int i = 0; i < x.size(); i++)' pattern.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
6262
diff
changeset
|
146 int ndxSub = ndxTop; // TODO: Is this correct? |
6262
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
147 ndxTop += 1; |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
148 ndxTop = ndxTop << 3; |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
149 ndxSub = ndxSub << 3; |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
150 ndxTop += i; |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
151 ndxSub += i; |
6252
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
152 String toplayer = |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
153 Resources.getMsg( |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
154 context.getMeta(), I18N_TOPLAYER, I18N_TOPLAYER); |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
155 String sublayer = |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
156 Resources.getMsg( |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
157 context.getMeta(), I18N_SUBLAYER, I18N_SUBLAYER); |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
158 //toplayer |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
159 newFacets.add(new BedDiameterDataFacet( |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
160 ndxTop, |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
161 BED_DIAMETER_DATA_TOP, |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
162 Resources.getMsg( |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
163 context.getMeta(), |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
164 I18N_FACET_BED_DIAMETER_DATA_TOPLAYER, |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
165 I18N_FACET_BED_DIAMETER_DATA_TOPLAYER, |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
166 new Object[] { diameter.toUpperCase(), |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
167 range.getFrom(), range.getTo(), toplayer}), |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
168 ComputeType.ADVANCE, |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
169 stateId, |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
170 hash)); |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
171 //sublayer |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
172 newFacets.add(new BedDiameterDataFacet( |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
173 ndxSub, |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
174 BED_DIAMETER_DATA_SUB, |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
175 Resources.getMsg( |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
176 context.getMeta(), |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
177 I18N_FACET_BED_DIAMETER_DATA_TOPLAYER, |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
178 I18N_FACET_BED_DIAMETER_DATA_TOPLAYER, |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
179 new Object[] { diameter.toUpperCase(), |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
180 range.getFrom(), range.getTo(), sublayer}), |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
181 ComputeType.ADVANCE, |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
182 stateId, |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
183 hash)); |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
184 } |
6262
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
185 for (String loadDiameter: loadDiameters) { |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
186 int ndx = generateIndex(loadDiameter); |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
187 ndx = ndx << 3; |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
188 ndx += i; |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
189 newFacets.add(new BedloadDiameterDataFacet( |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
190 ndx, |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
191 BEDLOAD_DIAMETER_DATA, |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
192 Resources.getMsg( |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
193 context.getMeta(), |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
194 I18N_FACET_BEDLOAD_DIAMETER_DATA, |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
195 I18N_FACET_BEDLOAD_DIAMETER_DATA, |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
196 new Object[] { loadDiameter.toUpperCase(), |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
197 range.getFrom(), range.getTo()}), |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
198 ComputeType.ADVANCE, |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
199 stateId, |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
200 hash)); |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
201 } |
6252
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
202 } |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
203 } |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
204 |
6262
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
205 private int generateIndex(String diameter) { |
6252
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
206 int d = 0; |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
207 if(diameter.equals("d10")) { |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
208 d = 1; |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
209 } |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
210 else if (diameter.equals("d16")) { |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
211 d = 2; |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
212 } |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
213 else if (diameter.equals("d20")) { |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
214 d = 3; |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
215 } |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
216 else if (diameter.equals("d25")) { |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
217 d = 4; |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
218 } |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
219 else if (diameter.equals("d30")) { |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
220 d = 5; |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
221 } |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
222 else if (diameter.equals("d40")) { |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
223 d = 6; |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
224 } |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
225 else if (diameter.equals("d50")) { |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
226 d = 7; |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
227 } |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
228 else if (diameter.equals("d60")) { |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
229 d = 8; |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
230 } |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
231 else if (diameter.equals("d70")) { |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
232 d = 9; |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
233 } |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
234 else if (diameter.equals("d75")) { |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
235 d = 10; |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
236 } |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
237 else if (diameter.equals("d80")) { |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
238 d = 11; |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
239 } |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
240 else if (diameter.equals("d84")) { |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
241 d = 12; |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
242 } |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
243 else if (diameter.equals("d90")) { |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
244 d = 13; |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
245 } |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
246 else if (diameter.equals("dmin")) { |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
247 d = 14; |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
248 } |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
249 else if (diameter.equals("dmax")) { |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
250 d = 15; |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
251 } |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
252 else if (diameter.equals("dm")) { |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
253 d = 16; |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
254 } |
6262
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
255 int ndx = d << 1; |
6252
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
256 return ndx; |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
257 } |
38d6ce2c7164
Generate facets for bed diameter measurements and draw them into the generated chart.
Raimund Renkert <rrenkert@intevation.de>
parents:
5994
diff
changeset
|
258 |
3767
b4ad8dafe584
Created i18n descriptions for facets in bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3766
diff
changeset
|
259 protected void generateFacets(CallContext context, List<Facet> newFacets, |
3762
0c978a80726a
Splitted up facets for porosity and density into two facets: a toplayer and a sublayer facet for each. BedQualityState will now create facets based on the calculation result.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3761
diff
changeset
|
260 BedQualityResult[] results, String stateId, String hash) { |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
7987
diff
changeset
|
261 log.debug("BedQualityState.generateFacets"); |
3762
0c978a80726a
Splitted up facets for porosity and density into two facets: a toplayer and a sublayer facet for each. BedQualityState will now create facets based on the calculation result.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3761
diff
changeset
|
262 |
3767
b4ad8dafe584
Created i18n descriptions for facets in bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3766
diff
changeset
|
263 CallMeta meta = context.getMeta(); |
b4ad8dafe584
Created i18n descriptions for facets in bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3766
diff
changeset
|
264 |
3785
a5f65e8983be
Merged revisions 5501-5502,5504-5508,5511-5513,5516-5519 via svnmerge from
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3784
diff
changeset
|
265 newFacets.add(new DataFacet(CSV, "CSV data", ComputeType.ADVANCE, hash, id)); |
3762
0c978a80726a
Splitted up facets for porosity and density into two facets: a toplayer and a sublayer facet for each. BedQualityState will now create facets based on the calculation result.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3761
diff
changeset
|
266 for (int idx = 0; idx < results.length; idx++) { |
0c978a80726a
Splitted up facets for porosity and density into two facets: a toplayer and a sublayer facet for each. BedQualityState will now create facets based on the calculation result.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3761
diff
changeset
|
267 BedQualityResult result = results[idx]; |
3784
9f9d5ada96ca
Merged revisions 5498-5499 via svnmerge from
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3772
diff
changeset
|
268 DateRange range = result.getDateRange(); |
9f9d5ada96ca
Merged revisions 5498-5499 via svnmerge from
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3772
diff
changeset
|
269 BedDiameterResult[] bedDiameter = result.getBedResults(); |
9f9d5ada96ca
Merged revisions 5498-5499 via svnmerge from
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3772
diff
changeset
|
270 for (int j = 0; j < bedDiameter.length; j++) { |
7987
98ca61cb58fb
Split bed quality facets and updated processors and state.
Raimund Renkert <rrenkert@intevation.de>
parents:
7254
diff
changeset
|
271 newFacets.add(new BedDiameterTopFacet((idx << 8) + j, |
3784
9f9d5ada96ca
Merged revisions 5498-5499 via svnmerge from
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3772
diff
changeset
|
272 BED_QUALITY_BED_DIAMETER_TOPLAYER, |
8585
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
273 getLayerDescription( |
3784
9f9d5ada96ca
Merged revisions 5498-5499 via svnmerge from
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3772
diff
changeset
|
274 meta, |
9f9d5ada96ca
Merged revisions 5498-5499 via svnmerge from
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3772
diff
changeset
|
275 bedDiameter[j], |
8585
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
276 range, |
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
277 I18N_FACET_BED_DIAMETER_TOPLAYER, |
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
278 true), |
3762
0c978a80726a
Splitted up facets for porosity and density into two facets: a toplayer and a sublayer facet for each. BedQualityState will now create facets based on the calculation result.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3761
diff
changeset
|
279 ComputeType.ADVANCE, stateId, hash)); |
0c978a80726a
Splitted up facets for porosity and density into two facets: a toplayer and a sublayer facet for each. BedQualityState will now create facets based on the calculation result.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3761
diff
changeset
|
280 |
7987
98ca61cb58fb
Split bed quality facets and updated processors and state.
Raimund Renkert <rrenkert@intevation.de>
parents:
7254
diff
changeset
|
281 newFacets.add(new BedDiameterSubFacet((idx << 8) +j, |
3784
9f9d5ada96ca
Merged revisions 5498-5499 via svnmerge from
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3772
diff
changeset
|
282 BED_QUALITY_BED_DIAMETER_SUBLAYER, |
8585
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
283 getLayerDescription( |
3784
9f9d5ada96ca
Merged revisions 5498-5499 via svnmerge from
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3772
diff
changeset
|
284 meta, |
9f9d5ada96ca
Merged revisions 5498-5499 via svnmerge from
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3772
diff
changeset
|
285 bedDiameter[j], |
8585
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
286 range, |
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
287 I18N_FACET_BED_DIAMETER_SUBLAYER, |
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
288 false), |
3766
d29cebf371ba
Use data of bed quality facets to fill the chart.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3762
diff
changeset
|
289 ComputeType.ADVANCE, stateId, hash)); |
3784
9f9d5ada96ca
Merged revisions 5498-5499 via svnmerge from
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3772
diff
changeset
|
290 } |
9f9d5ada96ca
Merged revisions 5498-5499 via svnmerge from
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3772
diff
changeset
|
291 BedloadDiameterResult[] bedloadDiameter = result.getBedloadResults(); |
9f9d5ada96ca
Merged revisions 5498-5499 via svnmerge from
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3772
diff
changeset
|
292 for (int j = 0; j < bedloadDiameter.length; j++) { |
9f9d5ada96ca
Merged revisions 5498-5499 via svnmerge from
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3772
diff
changeset
|
293 newFacets.add(new BedloadDiameterFacet( |
9f9d5ada96ca
Merged revisions 5498-5499 via svnmerge from
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3772
diff
changeset
|
294 (idx << 8) + j, |
9f9d5ada96ca
Merged revisions 5498-5499 via svnmerge from
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3772
diff
changeset
|
295 BED_QUALITY_BEDLOAD_DIAMETER, |
9f9d5ada96ca
Merged revisions 5498-5499 via svnmerge from
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3772
diff
changeset
|
296 createDiameterDescription( |
9f9d5ada96ca
Merged revisions 5498-5499 via svnmerge from
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3772
diff
changeset
|
297 meta, bedloadDiameter[j]), |
9f9d5ada96ca
Merged revisions 5498-5499 via svnmerge from
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3772
diff
changeset
|
298 ComputeType.ADVANCE, |
9f9d5ada96ca
Merged revisions 5498-5499 via svnmerge from
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3772
diff
changeset
|
299 stateId, |
9f9d5ada96ca
Merged revisions 5498-5499 via svnmerge from
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3772
diff
changeset
|
300 hash)); |
3767
b4ad8dafe584
Created i18n descriptions for facets in bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3766
diff
changeset
|
301 |
3784
9f9d5ada96ca
Merged revisions 5498-5499 via svnmerge from
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3772
diff
changeset
|
302 } |
6262
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
303 if (bedDiameter.length > 0) { |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
304 BedParametersResult[] bedParameters = result.getParameters(); |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
305 for (int j = 0; j < bedParameters.length; j++) { |
7987
98ca61cb58fb
Split bed quality facets and updated processors and state.
Raimund Renkert <rrenkert@intevation.de>
parents:
7254
diff
changeset
|
306 newFacets.add(new BedPorosityTopFacet((idx << 8) + j, |
6262
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
307 BED_QUALITY_POROSITY_TOPLAYER, |
8585
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
308 getLayerDescription( |
6262
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
309 meta, |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
310 bedParameters[j], |
8585
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
311 range, |
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
312 I18N_FACET_BED_POROSITY_TOPLAYER, |
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
313 true), |
6262
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
314 ComputeType.ADVANCE, stateId, hash)); |
3767
b4ad8dafe584
Created i18n descriptions for facets in bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3766
diff
changeset
|
315 |
7987
98ca61cb58fb
Split bed quality facets and updated processors and state.
Raimund Renkert <rrenkert@intevation.de>
parents:
7254
diff
changeset
|
316 newFacets.add(new BedPorositySubFacet((idx << 8) + j, |
6262
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
317 BED_QUALITY_POROSITY_SUBLAYER, |
8585
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
318 getLayerDescription( |
6262
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
319 meta, |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
320 bedParameters[j], |
8585
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
321 range, |
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
322 I18N_FACET_BED_POROSITY_SUBLAYER, |
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
323 false), |
6262
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
324 ComputeType.ADVANCE, stateId, hash)); |
3784
9f9d5ada96ca
Merged revisions 5498-5499 via svnmerge from
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3772
diff
changeset
|
325 |
7987
98ca61cb58fb
Split bed quality facets and updated processors and state.
Raimund Renkert <rrenkert@intevation.de>
parents:
7254
diff
changeset
|
326 newFacets.add(new BedDensityTopFacet((idx << 8) + j, |
6262
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
327 BED_QUALITY_SEDIMENT_DENSITY_TOPLAYER, |
8585
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
328 getLayerDescription( |
6262
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
329 meta, |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
330 bedParameters[j], |
8585
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
331 range, |
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
332 I18N_FACET_BED_DENSITY_TOPLAYER, |
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
333 true), |
6262
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
334 ComputeType.ADVANCE, stateId, hash)); |
3784
9f9d5ada96ca
Merged revisions 5498-5499 via svnmerge from
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3772
diff
changeset
|
335 |
7987
98ca61cb58fb
Split bed quality facets and updated processors and state.
Raimund Renkert <rrenkert@intevation.de>
parents:
7254
diff
changeset
|
336 newFacets.add(new BedDensitySubFacet((idx << 8) + j, |
6262
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
337 BED_QUALITY_SEDIMENT_DENSITY_SUBLAYER, |
8585
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
338 getLayerDescription( |
6262
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
339 meta, |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
340 bedParameters[j], |
8585
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
341 range, |
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
342 I18N_FACET_BED_DENSITY_SUBLAYER, |
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
343 false), |
6262
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
344 ComputeType.ADVANCE, stateId, hash)); |
ea6225010871
Set facet activity, have the correct facet order and added new facet to bed quality.
Raimund Renkert <rrenkert@intevation.de>
parents:
6252
diff
changeset
|
345 } |
3762
0c978a80726a
Splitted up facets for porosity and density into two facets: a toplayer and a sublayer facet for each. BedQualityState will now create facets based on the calculation result.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3761
diff
changeset
|
346 } |
0c978a80726a
Splitted up facets for porosity and density into two facets: a toplayer and a sublayer facet for each. BedQualityState will now create facets based on the calculation result.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3761
diff
changeset
|
347 } |
0c978a80726a
Splitted up facets for porosity and density into two facets: a toplayer and a sublayer facet for each. BedQualityState will now create facets based on the calculation result.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3761
diff
changeset
|
348 } |
3767
b4ad8dafe584
Created i18n descriptions for facets in bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3766
diff
changeset
|
349 |
8585
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
350 protected String getLayerDescription(CallMeta meta, |
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
351 Object result, DateRange range, String i18n, boolean topLayer) { |
3767
b4ad8dafe584
Created i18n descriptions for facets in bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3766
diff
changeset
|
352 Date from = range != null ? range.getFrom() : new Date(); |
b4ad8dafe584
Created i18n descriptions for facets in bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3766
diff
changeset
|
353 Date to = range != null ? range.getTo() : new Date(); |
3772
5a8f8fd5310c
The usual wipe after for ill configured Eclipses.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
3767
diff
changeset
|
354 |
8585
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
355 String layer; |
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
356 /* Maybe just a check if i18n ends with .sublayer? */ |
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
357 if (topLayer) { |
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
358 layer = Resources.getMsg(meta, I18N_TOPLAYER, I18N_TOPLAYER); |
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
359 } else { |
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
360 layer = Resources.getMsg(meta, I18N_SUBLAYER, I18N_SUBLAYER); |
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
361 } |
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
362 if (result instanceof BedDiameterResult) { |
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
363 return Resources.getMsg(meta, i18n, i18n, new Object[] { ((BedDiameterResult)result).getType(), |
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
364 from, to, layer }); |
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
365 } else { |
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
366 return Resources.getMsg(meta, i18n, i18n, new Object[] { from, to, layer }); |
e9343e4c9ae0
Reduce duplicated functions to obtain layer descritpions for bedquality
Andre Heinecke <andre.heinecke@intevation.de>
parents:
8274
diff
changeset
|
367 } |
3767
b4ad8dafe584
Created i18n descriptions for facets in bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3766
diff
changeset
|
368 } |
b4ad8dafe584
Created i18n descriptions for facets in bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3766
diff
changeset
|
369 |
b4ad8dafe584
Created i18n descriptions for facets in bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3766
diff
changeset
|
370 protected String createDiameterDescription(CallMeta meta, |
3784
9f9d5ada96ca
Merged revisions 5498-5499 via svnmerge from
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3772
diff
changeset
|
371 BedQualityDiameterResult result) { |
3767
b4ad8dafe584
Created i18n descriptions for facets in bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3766
diff
changeset
|
372 return Resources.getMsg(meta, I18N_FACET_BEDLOAD_DIAMETER, |
b4ad8dafe584
Created i18n descriptions for facets in bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3766
diff
changeset
|
373 I18N_FACET_BEDLOAD_DIAMETER, new Object[] { result.getType() }); |
b4ad8dafe584
Created i18n descriptions for facets in bed quality calculation.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
3766
diff
changeset
|
374 } |
3629
f3717e625b0a
MINFO: Added states and config for bed quality calculation.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
375 } |
3761
066e2b4d69ca
Fix missing import
Christian Lins <christian.lins@intevation.de>
parents:
3757
diff
changeset
|
376 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : |