Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixRealizingCalculationExtended.java @ 9415:9744ce3c3853
Rework of fixanalysis computation and dWt and WQ facets. Got rid of strange remapping and bitshifting code by explicitely saving the column information and using it in the facets.
The facets also put the valid station range into their xml-metadata
| author | gernotbelger |
|---|---|
| date | Thu, 16 Aug 2018 16:27:53 +0200 |
| parents | 7565d7dce850 |
| children |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixRealizingCalculationExtended.java Thu Aug 16 15:47:10 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixRealizingCalculationExtended.java Thu Aug 16 16:27:53 2018 +0200 @@ -16,8 +16,6 @@ import java.util.TreeSet; import org.dive4elements.river.artifacts.access.FixRealizingAccess; -import org.dive4elements.river.artifacts.model.FixingsOverview; -import org.dive4elements.river.artifacts.model.FixingsOverviewFactory; /** * REMARK: this inheritance is only needed, beause changing the orignal calculation will probably break the @@ -40,8 +38,8 @@ final Calendar cal = Calendar.getInstance(); - final List<Column> columns = getEventColumns(overview, cc); - for (final Column column : columns) { + final List<FixingColumnWithData> columns = getEventColumns(overview, cc); + for (final FixingColumnWithData column : columns) { final Date date = column.getDate(); cal.setTime(date);