Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/FacetTypes.java @ 8280:e8283197d889

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
8276:7e54b27f4780 8280:e8283197d889
63 || type.equals(SQ_B_CURVE) 63 || type.equals(SQ_B_CURVE)
64 || type.equals(SQ_C_CURVE) 64 || type.equals(SQ_C_CURVE)
65 || type.equals(SQ_D_CURVE) 65 || type.equals(SQ_D_CURVE)
66 || type.equals(SQ_E_CURVE) 66 || type.equals(SQ_E_CURVE)
67 || type.equals(SQ_F_CURVE) 67 || type.equals(SQ_F_CURVE)
68 || type.equals(SQ_G_CURVE)
68 || type.equals(SQ_A_OUTLIER_CURVE) 69 || type.equals(SQ_A_OUTLIER_CURVE)
69 || type.equals(SQ_B_OUTLIER_CURVE) 70 || type.equals(SQ_B_OUTLIER_CURVE)
70 || type.equals(SQ_C_OUTLIER_CURVE) 71 || type.equals(SQ_C_OUTLIER_CURVE)
71 || type.equals(SQ_D_OUTLIER_CURVE) 72 || type.equals(SQ_D_OUTLIER_CURVE)
72 || type.equals(SQ_E_OUTLIER_CURVE) 73 || type.equals(SQ_E_OUTLIER_CURVE)
73 || type.equals(SQ_F_OUTLIER_CURVE) 74 || type.equals(SQ_F_OUTLIER_CURVE)
75 || type.equals(SQ_G_OUTLIER_CURVE)
74 || type.equals(SQ_A_CURVE_OV) 76 || type.equals(SQ_A_CURVE_OV)
75 || type.equals(SQ_B_CURVE_OV) 77 || type.equals(SQ_B_CURVE_OV)
76 || type.equals(SQ_C_CURVE_OV) 78 || type.equals(SQ_C_CURVE_OV)
77 || type.equals(SQ_D_CURVE_OV) 79 || type.equals(SQ_D_CURVE_OV)
78 || type.equals(SQ_E_CURVE_OV) 80 || type.equals(SQ_E_CURVE_OV)
79 || type.equals(SQ_F_CURVE_OV) 81 || type.equals(SQ_F_CURVE_OV)
82 || type.equals(SQ_G_CURVE_OV)
80 || type.equals(SQ_A_OUTLIER_CURVE_OV) 83 || type.equals(SQ_A_OUTLIER_CURVE_OV)
81 || type.equals(SQ_B_OUTLIER_CURVE_OV) 84 || type.equals(SQ_B_OUTLIER_CURVE_OV)
82 || type.equals(SQ_C_OUTLIER_CURVE_OV) 85 || type.equals(SQ_C_OUTLIER_CURVE_OV)
83 || type.equals(SQ_D_OUTLIER_CURVE_OV) 86 || type.equals(SQ_D_OUTLIER_CURVE_OV)
84 || type.equals(SQ_E_OUTLIER_CURVE_OV) 87 || type.equals(SQ_E_OUTLIER_CURVE_OV)
85 || type.equals(SQ_F_OUTLIER_CURVE_OV) 88 || type.equals(SQ_F_OUTLIER_CURVE_OV)
89 || type.equals(SQ_G_OUTLIER_CURVE_OV)
86 ) 90 )
87 { 91 {
88 return true; 92 return true;
89 } 93 }
90 94
95 || type.equals(SQ_B_MEASUREMENT) 99 || type.equals(SQ_B_MEASUREMENT)
96 || type.equals(SQ_C_MEASUREMENT) 100 || type.equals(SQ_C_MEASUREMENT)
97 || type.equals(SQ_D_MEASUREMENT) 101 || type.equals(SQ_D_MEASUREMENT)
98 || type.equals(SQ_E_MEASUREMENT) 102 || type.equals(SQ_E_MEASUREMENT)
99 || type.equals(SQ_F_MEASUREMENT) 103 || type.equals(SQ_F_MEASUREMENT)
104 || type.equals(SQ_G_MEASUREMENT)
100 || type.equals(SQ_A_OUTLIER_MEASUREMENT) 105 || type.equals(SQ_A_OUTLIER_MEASUREMENT)
101 || type.equals(SQ_B_OUTLIER_MEASUREMENT) 106 || type.equals(SQ_B_OUTLIER_MEASUREMENT)
102 || type.equals(SQ_C_OUTLIER_MEASUREMENT) 107 || type.equals(SQ_C_OUTLIER_MEASUREMENT)
103 || type.equals(SQ_D_OUTLIER_MEASUREMENT) 108 || type.equals(SQ_D_OUTLIER_MEASUREMENT)
104 || type.equals(SQ_E_OUTLIER_MEASUREMENT) 109 || type.equals(SQ_E_OUTLIER_MEASUREMENT)
105 || type.equals(SQ_F_OUTLIER_MEASUREMENT) 110 || type.equals(SQ_F_OUTLIER_MEASUREMENT)
111 || type.equals(SQ_G_OUTLIER_MEASUREMENT)
106 || type.equals(SQ_A_MEASUREMENT_OV) 112 || type.equals(SQ_A_MEASUREMENT_OV)
107 || type.equals(SQ_B_MEASUREMENT_OV) 113 || type.equals(SQ_B_MEASUREMENT_OV)
108 || type.equals(SQ_C_MEASUREMENT_OV) 114 || type.equals(SQ_C_MEASUREMENT_OV)
109 || type.equals(SQ_D_MEASUREMENT_OV) 115 || type.equals(SQ_D_MEASUREMENT_OV)
110 || type.equals(SQ_E_MEASUREMENT_OV) 116 || type.equals(SQ_E_MEASUREMENT_OV)
111 || type.equals(SQ_F_MEASUREMENT_OV) 117 || type.equals(SQ_F_MEASUREMENT_OV)
118 || type.equals(SQ_G_MEASUREMENT_OV)
112 || type.equals(SQ_A_OUTLIER_MEASUREMENT_OV) 119 || type.equals(SQ_A_OUTLIER_MEASUREMENT_OV)
113 || type.equals(SQ_B_OUTLIER_MEASUREMENT_OV) 120 || type.equals(SQ_B_OUTLIER_MEASUREMENT_OV)
114 || type.equals(SQ_C_OUTLIER_MEASUREMENT_OV) 121 || type.equals(SQ_C_OUTLIER_MEASUREMENT_OV)
115 || type.equals(SQ_D_OUTLIER_MEASUREMENT_OV) 122 || type.equals(SQ_D_OUTLIER_MEASUREMENT_OV)
116 || type.equals(SQ_E_OUTLIER_MEASUREMENT_OV) 123 || type.equals(SQ_E_OUTLIER_MEASUREMENT_OV)
117 || type.equals(SQ_F_OUTLIER_MEASUREMENT_OV) 124 || type.equals(SQ_F_OUTLIER_MEASUREMENT_OV)
125 || type.equals(SQ_G_OUTLIER_MEASUREMENT_OV)
118 ) 126 )
119 { 127 {
120 return true; 128 return true;
121 } 129 }
122 130
127 || type.equals(SQ_B_OUTLIER) 135 || type.equals(SQ_B_OUTLIER)
128 || type.equals(SQ_C_OUTLIER) 136 || type.equals(SQ_C_OUTLIER)
129 || type.equals(SQ_D_OUTLIER) 137 || type.equals(SQ_D_OUTLIER)
130 || type.equals(SQ_E_OUTLIER) 138 || type.equals(SQ_E_OUTLIER)
131 || type.equals(SQ_F_OUTLIER) 139 || type.equals(SQ_F_OUTLIER)
140 || type.equals(SQ_G_OUTLIER)
132 || type.equals(SQ_A_OUTLIER_OV) 141 || type.equals(SQ_A_OUTLIER_OV)
133 || type.equals(SQ_B_OUTLIER_OV) 142 || type.equals(SQ_B_OUTLIER_OV)
134 || type.equals(SQ_C_OUTLIER_OV) 143 || type.equals(SQ_C_OUTLIER_OV)
135 || type.equals(SQ_D_OUTLIER_OV) 144 || type.equals(SQ_D_OUTLIER_OV)
136 || type.equals(SQ_E_OUTLIER_OV) 145 || type.equals(SQ_E_OUTLIER_OV)
137 || type.equals(SQ_F_OUTLIER_OV)) 146 || type.equals(SQ_F_OUTLIER_OV)
147 || type.equals(SQ_G_OUTLIER_OV))
138 { 148 {
139 return true; 149 return true;
140 } 150 }
141 151
142 return false; 152 return false;
370 String SQ_F_MEASUREMENT = "sq_f_measurement"; 380 String SQ_F_MEASUREMENT = "sq_f_measurement";
371 String SQ_F_OUTLIER = "sq_f_outlier"; 381 String SQ_F_OUTLIER = "sq_f_outlier";
372 String SQ_F_OUTLIER_CURVE = "sq_f_outlier_curve"; 382 String SQ_F_OUTLIER_CURVE = "sq_f_outlier_curve";
373 String SQ_F_OUTLIER_MEASUREMENT = "sq_f_outlier_measurement"; 383 String SQ_F_OUTLIER_MEASUREMENT = "sq_f_outlier_measurement";
374 384
385 String SQ_G_CURVE = "sq_g_curve";
386 String SQ_G_MEASUREMENT = "sq_g_measurement";
387 String SQ_G_OUTLIER = "sq_g_outlier";
388 String SQ_G_OUTLIER_CURVE = "sq_g_outlier_curve";
389 String SQ_G_OUTLIER_MEASUREMENT = "sq_g_outlier_measurement";
390
375 String SQ_A_CURVE_OV = "sq_a_curve_overview"; 391 String SQ_A_CURVE_OV = "sq_a_curve_overview";
376 String SQ_A_MEASUREMENT_OV = "sq_a_measurement_overview"; 392 String SQ_A_MEASUREMENT_OV = "sq_a_measurement_overview";
377 String SQ_A_OUTLIER_OV = "sq_a_outlier_overview"; 393 String SQ_A_OUTLIER_OV = "sq_a_outlier_overview";
378 String SQ_A_OUTLIER_CURVE_OV = "sq_a_outlier_curve_overview"; 394 String SQ_A_OUTLIER_CURVE_OV = "sq_a_outlier_curve_overview";
379 String SQ_A_OUTLIER_MEASUREMENT_OV = "sq_a_outlier_measurement_overview"; 395 String SQ_A_OUTLIER_MEASUREMENT_OV = "sq_a_outlier_measurement_overview";
406 String SQ_F_MEASUREMENT_OV = "sq_f_measurement_overview"; 422 String SQ_F_MEASUREMENT_OV = "sq_f_measurement_overview";
407 String SQ_F_OUTLIER_OV = "sq_f_outlier_overview"; 423 String SQ_F_OUTLIER_OV = "sq_f_outlier_overview";
408 String SQ_F_OUTLIER_CURVE_OV = "sq_f_outlier_curve_overview"; 424 String SQ_F_OUTLIER_CURVE_OV = "sq_f_outlier_curve_overview";
409 String SQ_F_OUTLIER_MEASUREMENT_OV = "sq_f_outlier_measurement_overview"; 425 String SQ_F_OUTLIER_MEASUREMENT_OV = "sq_f_outlier_measurement_overview";
410 426
427 String SQ_G_CURVE_OV = "sq_g_curve_overview";
428 String SQ_G_MEASUREMENT_OV = "sq_g_measurement_overview";
429 String SQ_G_OUTLIER_OV = "sq_g_outlier_overview";
430 String SQ_G_OUTLIER_CURVE_OV = "sq_g_outlier_curve_overview";
431 String SQ_G_OUTLIER_MEASUREMENT_OV = "sq_g_outlier_measurement_overview";
432
411 String RELATIVE_POINT = "relativepoint"; 433 String RELATIVE_POINT = "relativepoint";
412 434
413 String FIX_ANALYSIS_EVENTS_DWT = "fix_analysis_events_dwt"; 435 String FIX_ANALYSIS_EVENTS_DWT = "fix_analysis_events_dwt";
414 String FIX_ANALYSIS_EVENTS_LS = "fix_analysis_events_ls"; 436 String FIX_ANALYSIS_EVENTS_LS = "fix_analysis_events_ls";
415 String FIX_ANALYSIS_EVENTS_WQ = "fix_analysis_events_wq"; 437 String FIX_ANALYSIS_EVENTS_WQ = "fix_analysis_events_wq";
http://dive4elements.wald.intevation.org