fda/ch.psi.fda.core
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates in EDescriptor and VDescriptor

Browse Source
This commit is contained in:
ebner
2014-04-22 08:59:28 +02:00
parent 7359b3628a
commit 350524a23a
5 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ch.psi.fda.core/pom.xml
View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ch.psi</groupId>
<artifactId>ch.psi.fda.core</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>0.0.2</version>
<dependencies>
<dependency>

5
ch.psi.fda.core/src/main/java/ch/psi/fda/edescriptor/EDescriptor.java
View File

@@ -1,8 +1,13 @@
package ch.psi.fda.edescriptor;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
/**
* Execution container descriptor
*/
@XmlRootElement
@XmlTransient
public interface EDescriptor {
}

12
ch.psi.fda.core/src/main/java/ch/psi/fda/vdescriptor/MatrixPlot.java
View File

@@ -13,11 +13,11 @@ public class MatrixPlot extends Plot {
private List<Series> data = new ArrayList<>();
private Double minX;
private Double maxX;
private Double nX;
private Integer nX;
private Double minY;
private Double maxY;
private Double nY;
private Integer nY;
public MatrixPlot(){
}
@@ -48,10 +48,10 @@ public class MatrixPlot extends Plot {
this.maxX = maxX;
}
@XmlAttribute
public Double getnX() {
public Integer getnX() {
return nX;
}
public void setnX(Double nX) {
public void setnX(Integer nX) {
this.nX = nX;
}
@XmlAttribute
@@ -69,10 +69,10 @@ public class MatrixPlot extends Plot {
this.maxY = maxY;
}
@XmlAttribute
public Double getnY() {
public Integer getnY() {
return nY;
}
public void setnY(Double nY) {
public void setnY(Integer nY) {
this.nY = nY;
}
}

3
ch.psi.fda.core/src/main/java/ch/psi/fda/vdescriptor/VDescriptor.java
View File

@@ -1,5 +1,6 @@
package ch.psi.fda.vdescriptor;
import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlElement;
@@ -10,7 +11,7 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name="vdescriptor")
public class VDescriptor {
private List<Plot> plots;
private List<Plot> plots = new ArrayList<>();
@XmlElementWrapper
@XmlElements({

5
ch.psi.fda.core/src/main/java/ch/psi/fda/vdescriptor/XYZSeries.java
View File

@@ -13,11 +13,6 @@ public class XYZSeries extends Series {
public XYZSeries(){
}
public XYZSeries(String x, String y){
this.x = x;
this.y = y;
}
public XYZSeries(String x, String y, String z){
this.x = x;
this.y = y;