Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/FacetTypes.java @ 8280:e8283197d889
Added new fraction to sq relation.
* New diagram with "Geschiebetransport gesamt(Sohlhöhenrelevant)"
* Added the new fraction to overview diagram.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Wed, 17 Sep 2014 09:01:27 +0200 |
| parents | 4d99606a844e |
| children | 9ab967eb2c51 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FacetTypes.java Tue Sep 16 14:57:55 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FacetTypes.java Wed Sep 17 09:01:27 2014 +0200 @@ -65,24 +65,28 @@ || type.equals(SQ_D_CURVE) || type.equals(SQ_E_CURVE) || type.equals(SQ_F_CURVE) + || type.equals(SQ_G_CURVE) || type.equals(SQ_A_OUTLIER_CURVE) || type.equals(SQ_B_OUTLIER_CURVE) || type.equals(SQ_C_OUTLIER_CURVE) || type.equals(SQ_D_OUTLIER_CURVE) || type.equals(SQ_E_OUTLIER_CURVE) || type.equals(SQ_F_OUTLIER_CURVE) + || type.equals(SQ_G_OUTLIER_CURVE) || type.equals(SQ_A_CURVE_OV) || type.equals(SQ_B_CURVE_OV) || type.equals(SQ_C_CURVE_OV) || type.equals(SQ_D_CURVE_OV) || type.equals(SQ_E_CURVE_OV) || type.equals(SQ_F_CURVE_OV) + || type.equals(SQ_G_CURVE_OV) || type.equals(SQ_A_OUTLIER_CURVE_OV) || type.equals(SQ_B_OUTLIER_CURVE_OV) || type.equals(SQ_C_OUTLIER_CURVE_OV) || type.equals(SQ_D_OUTLIER_CURVE_OV) || type.equals(SQ_E_OUTLIER_CURVE_OV) || type.equals(SQ_F_OUTLIER_CURVE_OV) + || type.equals(SQ_G_OUTLIER_CURVE_OV) ) { return true; @@ -97,24 +101,28 @@ || type.equals(SQ_D_MEASUREMENT) || type.equals(SQ_E_MEASUREMENT) || type.equals(SQ_F_MEASUREMENT) + || type.equals(SQ_G_MEASUREMENT) || type.equals(SQ_A_OUTLIER_MEASUREMENT) || type.equals(SQ_B_OUTLIER_MEASUREMENT) || type.equals(SQ_C_OUTLIER_MEASUREMENT) || type.equals(SQ_D_OUTLIER_MEASUREMENT) || type.equals(SQ_E_OUTLIER_MEASUREMENT) || type.equals(SQ_F_OUTLIER_MEASUREMENT) + || type.equals(SQ_G_OUTLIER_MEASUREMENT) || type.equals(SQ_A_MEASUREMENT_OV) || type.equals(SQ_B_MEASUREMENT_OV) || type.equals(SQ_C_MEASUREMENT_OV) || type.equals(SQ_D_MEASUREMENT_OV) || type.equals(SQ_E_MEASUREMENT_OV) || type.equals(SQ_F_MEASUREMENT_OV) + || type.equals(SQ_G_MEASUREMENT_OV) || type.equals(SQ_A_OUTLIER_MEASUREMENT_OV) || type.equals(SQ_B_OUTLIER_MEASUREMENT_OV) || type.equals(SQ_C_OUTLIER_MEASUREMENT_OV) || type.equals(SQ_D_OUTLIER_MEASUREMENT_OV) || type.equals(SQ_E_OUTLIER_MEASUREMENT_OV) || type.equals(SQ_F_OUTLIER_MEASUREMENT_OV) + || type.equals(SQ_G_OUTLIER_MEASUREMENT_OV) ) { return true; @@ -129,12 +137,14 @@ || type.equals(SQ_D_OUTLIER) || type.equals(SQ_E_OUTLIER) || type.equals(SQ_F_OUTLIER) + || type.equals(SQ_G_OUTLIER) || type.equals(SQ_A_OUTLIER_OV) || type.equals(SQ_B_OUTLIER_OV) || type.equals(SQ_C_OUTLIER_OV) || type.equals(SQ_D_OUTLIER_OV) || type.equals(SQ_E_OUTLIER_OV) - || type.equals(SQ_F_OUTLIER_OV)) + || type.equals(SQ_F_OUTLIER_OV) + || type.equals(SQ_G_OUTLIER_OV)) { return true; } @@ -372,6 +382,12 @@ String SQ_F_OUTLIER_CURVE = "sq_f_outlier_curve"; String SQ_F_OUTLIER_MEASUREMENT = "sq_f_outlier_measurement"; + String SQ_G_CURVE = "sq_g_curve"; + String SQ_G_MEASUREMENT = "sq_g_measurement"; + String SQ_G_OUTLIER = "sq_g_outlier"; + String SQ_G_OUTLIER_CURVE = "sq_g_outlier_curve"; + String SQ_G_OUTLIER_MEASUREMENT = "sq_g_outlier_measurement"; + String SQ_A_CURVE_OV = "sq_a_curve_overview"; String SQ_A_MEASUREMENT_OV = "sq_a_measurement_overview"; String SQ_A_OUTLIER_OV = "sq_a_outlier_overview"; @@ -408,6 +424,12 @@ String SQ_F_OUTLIER_CURVE_OV = "sq_f_outlier_curve_overview"; String SQ_F_OUTLIER_MEASUREMENT_OV = "sq_f_outlier_measurement_overview"; + String SQ_G_CURVE_OV = "sq_g_curve_overview"; + String SQ_G_MEASUREMENT_OV = "sq_g_measurement_overview"; + String SQ_G_OUTLIER_OV = "sq_g_outlier_overview"; + String SQ_G_OUTLIER_CURVE_OV = "sq_g_outlier_curve_overview"; + String SQ_G_OUTLIER_MEASUREMENT_OV = "sq_g_outlier_measurement_overview"; + String RELATIVE_POINT = "relativepoint"; String FIX_ANALYSIS_EVENTS_DWT = "fix_analysis_events_dwt";