Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/states/SQRelation.java @ 8860:28df64078f27
Merge with 0862ea5d66baf60e7eee496d130a35157cc9ec12
| author | gernotbelger |
|---|---|
| date | Fri, 19 Jan 2018 11:23:42 +0100 |
| parents | 5e38e2924c07 |
| children | 0a5239a1e46e |
comparison
equal
deleted
inserted
replaced
| 8854:7bbfb24e6eec | 8860:28df64078f27 |
|---|---|
| 72 public static final String [][] FACET_NAMES = { | 72 public static final String [][] FACET_NAMES = { |
| 73 { SQ_A_CURVE, SQ_B_CURVE, SQ_C_CURVE, | 73 { SQ_A_CURVE, SQ_B_CURVE, SQ_C_CURVE, |
| 74 SQ_D_CURVE, SQ_E_CURVE, SQ_F_CURVE, SQ_G_CURVE | 74 SQ_D_CURVE, SQ_E_CURVE, SQ_F_CURVE, SQ_G_CURVE |
| 75 }, | 75 }, |
| 76 { SQ_A_MEASUREMENT, SQ_B_MEASUREMENT, SQ_C_MEASUREMENT, | 76 { SQ_A_MEASUREMENT, SQ_B_MEASUREMENT, SQ_C_MEASUREMENT, |
| 77 SQ_D_MEASUREMENT, SQ_E_MEASUREMENT, SQ_F_MEASUREMENT, SQ_G_MEASUREMENT | 77 SQ_D_MEASUREMENT, SQ_E_MEASUREMENT, SQ_F_MEASUREMENT, |
| 78 SQ_G_MEASUREMENT | |
| 78 }, | 79 }, |
| 79 { SQ_A_OUTLIER, SQ_B_OUTLIER, SQ_C_OUTLIER, | 80 { SQ_A_OUTLIER, SQ_B_OUTLIER, SQ_C_OUTLIER, |
| 80 SQ_D_OUTLIER, SQ_E_OUTLIER, SQ_F_OUTLIER, SQ_G_OUTLIER | 81 SQ_D_OUTLIER, SQ_E_OUTLIER, SQ_F_OUTLIER, SQ_G_OUTLIER |
| 81 }, | 82 }, |
| 82 { SQ_A_OUTLIER_CURVE, SQ_B_OUTLIER_CURVE, SQ_C_OUTLIER_CURVE, | 83 { SQ_A_OUTLIER_CURVE, SQ_B_OUTLIER_CURVE, SQ_C_OUTLIER_CURVE, |
| 339 stateId | 340 stateId |
| 340 )); | 341 )); |
| 341 container.add(new SQOutlierMeasurementFacet( | 342 container.add(new SQOutlierMeasurementFacet( |
| 342 index, | 343 index, |
| 343 i, | 344 i, |
| 344 getFractionOverviewFacetname(OUTLIER_MEASUREMENT_INDEX, i), | 345 getFractionOverviewFacetname( |
| 346 OUTLIER_MEASUREMENT_INDEX, i), | |
| 345 sqr[res].getFractionName(i) + " - " + | 347 sqr[res].getFractionName(i) + " - " + |
| 346 Resources.getMsg( | 348 Resources.getMsg( |
| 347 meta, | 349 meta, |
| 348 I18N_FACET_OUTLIER_MEASUREMENT, | 350 I18N_FACET_OUTLIER_MEASUREMENT, |
| 349 round | 351 round |