fda/ch.psi.fda.xscan
0
0
Fork 0
mirror of https://git.psi.ch/fda/ch.psi.fda.xscan.git synced 2026-05-11 17:05:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Several bug fixes and small improvements

Browse Source
This commit is contained in:
gobbo_a
2014-08-28 14:25:35 +02:00
parent 5d7764b65e
commit 44b094e88f
3 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ch.psi.fda.xscan/pom.xml
+1 -1
View File
@@ -23,7 +23,7 @@
<dependency>
<groupId>ch.psi</groupId>
<artifactId>ch.psi.fda.core</artifactId>
<version>2.3.0</version>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>ch.psi</groupId>
ch.psi.fda.xscan/src/main/java/ch/psi/fda/aq/XScanDescriptorProvider.java
+3
View File
@@ -119,6 +119,7 @@ public class XScanDescriptorProvider implements DescriptorProvider {
// TODO Need to actually check if minX of
lineplot.setMinX(new Double(lp.getOffset()));
lineplot.setMaxX(new Double(lp.getOffset()+lp.getSize()));
lineplot.setMaxSeries(lp.getMaxSeries());
lineplot.getData().add(new YSeries(idY));
}
vd.getPlots().add(lineplot);
@@ -199,6 +200,7 @@ public class XScanDescriptorProvider implements DescriptorProvider {
matrixplot.setMinY(minY);
matrixplot.setMaxY(maxY);
matrixplot.setnY(nY);
matrixplot.setType(mp.getType());
matrixplot.getData().add(new XYZSeries(idX, idY, idZ));
vd.getPlots().add(matrixplot);
@@ -279,6 +281,7 @@ public class XScanDescriptorProvider implements DescriptorProvider {
matrixplot.setMinY(minY);
matrixplot.setMaxY(maxY);
matrixplot.setnY(nY);
matrixplot.setType(mp.getType());
matrixplot.getData().add(new YZSeries(idY, idZ));
vd.getPlots().add(matrixplot);
ch.psi.fda.xscan/src/main/resources/model-v1.xsd
+19
View File
@@ -20,6 +20,16 @@
<xsd:attribute name="x" type="xsd:IDREF" use="required"></xsd:attribute>
<xsd:attribute name="y" type="xsd:IDREF" use="required"></xsd:attribute>
<xsd:attribute name="z" type="xsd:IDREF" use="required"></xsd:attribute>
<xsd:attribute name="type" default="2D"
use="optional">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:enumeration value="2D"></xsd:enumeration>
<xsd:enumeration value="3D"></xsd:enumeration>
</xsd:restriction>
</xsd:simpleType>
</xsd:attribute>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
@@ -502,6 +512,15 @@
<xsd:attribute name="z" type="xsd:IDREF" use="required"></xsd:attribute>
<xsd:attribute name="offset" type="xsd:int" use="optional" default="0"></xsd:attribute>
<xsd:attribute name="size" type="xsd:int" use="optional" default="0"></xsd:attribute>
<xsd:attribute name="type" default="2D"
use="optional">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:enumeration value="2D"></xsd:enumeration>
<xsd:enumeration value="3D"></xsd:enumeration>
</xsd:restriction>
</xsd:simpleType>
</xsd:attribute>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>