diff --git a/ch.psi.fda.core/pom.xml b/ch.psi.fda.core/pom.xml index 3760ed7..5234610 100644 --- a/ch.psi.fda.core/pom.xml +++ b/ch.psi.fda.core/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ch.psi ch.psi.fda.core - 2.3.0 + 2.3.1 diff --git a/ch.psi.fda.core/src/main/java/ch/psi/fda/vdescriptor/LinePlot.java b/ch.psi.fda.core/src/main/java/ch/psi/fda/vdescriptor/LinePlot.java index 213234c..adaca5d 100644 --- a/ch.psi.fda.core/src/main/java/ch/psi/fda/vdescriptor/LinePlot.java +++ b/ch.psi.fda.core/src/main/java/ch/psi/fda/vdescriptor/LinePlot.java @@ -13,6 +13,7 @@ public class LinePlot extends Plot { private Double minX; private Double maxX; + private Integer maxSeries; public LinePlot(){ } @@ -42,4 +43,11 @@ public class LinePlot extends Plot { public void setMaxX(Double maxX) { this.maxX = maxX; } + @XmlAttribute + public Integer getMaxSeries() { + return maxSeries; + } + public void setMaxSeries(Integer maxSeries) { + this.maxSeries = maxSeries; + } } diff --git a/ch.psi.fda.core/src/main/java/ch/psi/fda/vdescriptor/MatrixPlot.java b/ch.psi.fda.core/src/main/java/ch/psi/fda/vdescriptor/MatrixPlot.java index 078f8d6..c7ac61e 100644 --- a/ch.psi.fda.core/src/main/java/ch/psi/fda/vdescriptor/MatrixPlot.java +++ b/ch.psi.fda.core/src/main/java/ch/psi/fda/vdescriptor/MatrixPlot.java @@ -18,6 +18,8 @@ public class MatrixPlot extends Plot { private Double minY; private Double maxY; private Integer nY; + + private String type; public MatrixPlot(){ } @@ -75,4 +77,11 @@ public class MatrixPlot extends Plot { public void setnY(Integer nY) { this.nY = nY; } + @XmlAttribute + public String getType() { + return type; + } + public void setType(String type) { + this.type = type; + } }