Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/QWI.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 | af13ceeba52a |
children |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/QWI.java Thu Aug 16 15:47:10 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/QWI.java Thu Aug 16 16:27:53 2018 +0200 @@ -8,70 +8,49 @@ package org.dive4elements.river.artifacts.model.fixings; -import org.dive4elements.river.artifacts.model.QW; - +import java.io.Serializable; import java.util.Date; -public class QWI -extends QW -{ - protected String description; - protected Date date; - protected boolean interpolated; - protected int index; +public class QWI implements Serializable { + + private static final long serialVersionUID = 1L; + + private Date date; + + private double q; + + private double w; + + private boolean interpolated; public QWI() { } - public QWI(double q, double w) { - super(q, w); + public QWI(final double q, final double w) { + this.q = q; + this.w = w; } - public QWI( - double q, - double w, - String description, - Date date, - boolean interpolated, - int index - ) { - super(q, w); - this.description = description; - this.date = date; + public QWI(final double q, final double w, final Date date, final boolean interpolated) { + this.q = q; + this.w = w; + this.date = date; this.interpolated = interpolated; - this.index = index; } public Date getDate() { - return date; + return this.date; } - public void setDate(Date date) { - this.date = date; + public double getQ() { + return this.q; } - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; + public double getW() { + return this.w; } public boolean getInterpolated() { - return interpolated; - } - - public void setInterpolated(boolean interpolated) { - this.interpolated = interpolated; + return this.interpolated; } - - public int getIndex() { - return index; - } - - public void setIndex(int index) { - this.index = index; - } -} -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : +} \ No newline at end of file