Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/exports/sq/SQRelationExporter.java @ 8630:5210e1dd303e
(issue1753) Fix number format for S
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Thu, 26 Mar 2015 12:11:49 +0100 |
| parents | d9f038b8e2ce |
| children | b30068e92757 |
comparison
equal
deleted
inserted
replaced
| 8629:97365575da6f | 8630:5210e1dd303e |
|---|---|
| 256 | 256 |
| 257 NumberFormat sqAFormatter = Formatter.getSQRelationA(context); | 257 NumberFormat sqAFormatter = Formatter.getSQRelationA(context); |
| 258 NumberFormat sqBFormatter = Formatter.getSQRelationB(context); | 258 NumberFormat sqBFormatter = Formatter.getSQRelationB(context); |
| 259 NumberFormat fThreeFormatter = Formatter.getFormatter(context, 3, 3); | 259 NumberFormat fThreeFormatter = Formatter.getFormatter(context, 3, 3); |
| 260 NumberFormat fTwoFormatter = Formatter.getFormatter(context, 2, 2); | 260 NumberFormat fTwoFormatter = Formatter.getFormatter(context, 2, 2); |
| 261 NumberFormat fZeroThreeFormatter = Formatter.getFormatter(context, 0, 3); | |
| 262 NumberFormat fZeroFormatter = Formatter.getFormatter(context, 0, 0); | 261 NumberFormat fZeroFormatter = Formatter.getFormatter(context, 0, 0); |
| 263 DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, | 262 DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, |
| 264 Resources.getLocale(context.getMeta())); | 263 Resources.getLocale(context.getMeta())); |
| 265 | 264 |
| 266 for (int i = 0; i < SQResult.NUMBER_FRACTIONS; ++i) { | 265 for (int i = 0; i < SQResult.NUMBER_FRACTIONS; ++i) { |
| 301 r2, // 6 | 300 r2, // 6 |
| 302 t, // 7 | 301 t, // 7 |
| 303 o, // 8 | 302 o, // 8 |
| 304 c_duan, // 9 | 303 c_duan, // 9 |
| 305 c_ferguson, // 10 | 304 c_ferguson, // 10 |
| 306 fZeroThreeFormatter.format(sq.getS()), | 305 fThreeFormatter.format(sq.getS()), |
| 307 fZeroFormatter.format(sq.getQ()), | 306 fZeroFormatter.format(sq.getQ()), |
| 308 df.format(sq.getDate()) | 307 df.format(sq.getDate()) |
| 309 }); | 308 }); |
| 310 } | 309 } |
| 311 } else { | 310 } else { |
| 344 } | 343 } |
| 345 | 344 |
| 346 protected SQMeasurementsJRDataSource createMeasurementJRData() { | 345 protected SQMeasurementsJRDataSource createMeasurementJRData() { |
| 347 SQMeasurementsJRDataSource source = new SQMeasurementsJRDataSource(); | 346 SQMeasurementsJRDataSource source = new SQMeasurementsJRDataSource(); |
| 348 NumberFormat fZeroFormatter = Formatter.getFormatter(context, 0, 0); | 347 NumberFormat fZeroFormatter = Formatter.getFormatter(context, 0, 0); |
| 349 NumberFormat fZeroThreeFormatter = Formatter.getFormatter(context, 0, 3); | 348 NumberFormat fThreeFormatter = Formatter.getFormatter(context, 3, 3); |
| 350 DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, | 349 DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, |
| 351 Resources.getLocale(context.getMeta())); | 350 Resources.getLocale(context.getMeta())); |
| 352 | 351 |
| 353 for (SQResult [] results: data) { | 352 for (SQResult [] results: data) { |
| 354 for (SQResult result: results) { | 353 for (SQResult result: results) { |
| 356 String name = result.getFractionName(i); | 355 String name = result.getFractionName(i); |
| 357 SQFractionResult fraction = result.getFraction(i); | 356 SQFractionResult fraction = result.getFraction(i); |
| 358 for (SQ sq: fraction.getMeasurements()) { | 357 for (SQ sq: fraction.getMeasurements()) { |
| 359 source.addData(new String[] { | 358 source.addData(new String[] { |
| 360 name, | 359 name, |
| 361 fZeroThreeFormatter.format(sq.getS()), | 360 fThreeFormatter.format(sq.getS()), |
| 362 fZeroFormatter.format(sq.getQ()), | 361 fZeroFormatter.format(sq.getQ()), |
| 363 df.format(sq.getDate()), | 362 df.format(sq.getDate()), |
| 364 null | 363 null |
| 365 }); | 364 }); |
| 366 } | 365 } |
| 367 for (int j = 0; j < fraction.numIterations(); j++) { | 366 for (int j = 0; j < fraction.numIterations(); j++) { |
| 368 for (SQ sq: fraction.getOutliers(j)) { | 367 for (SQ sq: fraction.getOutliers(j)) { |
| 369 source.addData(new String[] { | 368 source.addData(new String[] { |
| 370 name, | 369 name, |
| 371 fZeroThreeFormatter.format(sq.getS()), | 370 fThreeFormatter.format(sq.getS()), |
| 372 fZeroFormatter.format(sq.getQ()), | 371 fZeroFormatter.format(sq.getQ()), |
| 373 df.format(sq.getDate()), | 372 df.format(sq.getDate()), |
| 374 Integer.toString(j + 1) | 373 Integer.toString(j + 1) |
| 375 }); | 374 }); |
| 376 } | 375 } |