Commit cd3803ca authored by Locatelli's avatar Locatelli
Browse files

Add multiple y axis plot option

parent 0fd0acfc
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"> <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
...@@ -25,6 +26,7 @@ ...@@ -25,6 +26,7 @@
<attributes> <attributes>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>NomadCommandSystem</name> <name>nomad-command-system</name>
<comment></comment> <comment></comment>
<projects> <projects>
</projects> </projects>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>fr.ill.ics</groupId> <groupId>fr.ill.ics</groupId>
<artifactId>nomadcommandsystem</artifactId> <artifactId>nomadcommandsystem</artifactId>
<version>4.0.51</version> <version>4.0.53-SNAPSHOT</version>
<name>NomadCommandSystem</name> <name>NomadCommandSystem</name>
<description>Java bridge for the communication with the Nomad server</description> <description>Java bridge for the communication with the Nomad server</description>
<scm> <scm>
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<dependency> <dependency>
<groupId>fr.ill.ics</groupId> <groupId>fr.ill.ics</groupId>
<artifactId>nomadcommandsystem-messages</artifactId> <artifactId>nomadcommandsystem-messages</artifactId>
<version>0.0.28</version> <version>0.0.29</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>fr.ill.ics</groupId> <groupId>fr.ill.ics</groupId>
......
...@@ -215,7 +215,7 @@ public class PlotyInstance { ...@@ -215,7 +215,7 @@ public class PlotyInstance {
List<String> roiSum_parentPropName, String roiSelectedPlot_prop_name, String roiSelectedRoi_prop_name, List<String> roiSum_parentPropName, String roiSelectedPlot_prop_name, String roiSelectedRoi_prop_name,
String roiSelectedX0_prop_name, String roiSelectedY0_prop_name, String roiSelectedX1_prop_name, String roiSelectedY1_prop_name, String roiSelectedX0_prop_name, String roiSelectedY0_prop_name, String roiSelectedX1_prop_name, String roiSelectedY1_prop_name,
String roiCommandAdd_prop_name, String roiCommandValidate_prop_name, String roiCommandRaz_prop_name, String countActivated_prop_name, RemoteControlServerState remoteaccess, boolean tokenfree, boolean tokenownebyme, String roiCommandAdd_prop_name, String roiCommandValidate_prop_name, String roiCommandRaz_prop_name, String countActivated_prop_name, RemoteControlServerState remoteaccess, boolean tokenfree, boolean tokenownebyme,
boolean use_rgb) { boolean use_rgb, boolean multiple_y_axis) {
int remotecontrolstate = 0; int remotecontrolstate = 0;
if (remoteaccess == RemoteControlServerState.DISABLED) { if (remoteaccess == RemoteControlServerState.DISABLED) {
...@@ -309,6 +309,7 @@ public class PlotyInstance { ...@@ -309,6 +309,7 @@ public class PlotyInstance {
setCountActivatedPropName(countActivated_prop_name). setCountActivatedPropName(countActivated_prop_name).
setClientinfo(clientinfo). setClientinfo(clientinfo).
setUseRgb(use_rgb). setUseRgb(use_rgb).
setMultipleYAxis(multiple_y_axis).
build(); build();
plotRequester.sendTwoParts(messageFirst.toByteArray(), messageSecond.toByteArray()); plotRequester.sendTwoParts(messageFirst.toByteArray(), messageSecond.toByteArray());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment