Commit 10679113 authored by Locatelli's avatar Locatelli

Update for ploty2 changes

parent d0117974
...@@ -76,8 +76,8 @@ public class PlotyInstance { ...@@ -76,8 +76,8 @@ public class PlotyInstance {
public void plot(String plotkey, List<String> key, List<String> legend_key, List<String> color, public void plot(String plotkey, List<String> key, List<String> legend_key, List<String> color,
List<Integer> datax_id, List<Integer> datay_id, List<Integer> dataz_id, List<Boolean> errorBars, List<Integer> datax_id, List<Integer> datay_id, List<Integer> dataz_id, List<Boolean> errorBars,
String title, String xAxisTitle, String yAxisTitle, Property titleProperty, Property xAxisTitleProperty, String windowTitle, String plotTitle, String xAxisTitle, String yAxisTitle, Property titleProperty, Property xAxisTitleProperty,
Property yAxisTitleProperty, Property numorProperty, List<Integer> dataState_id, List<Integer> xSlice_id, Property yAxisTitleProperty, List<Integer> dataState_id, List<Integer> xSlice_id,
List<Integer> ySlice_id, List<Integer> zSlice_id, List<Integer> wSlice_id, List<Integer> maxXSlice_id, List<Integer> ySlice_id, List<Integer> zSlice_id, List<Integer> wSlice_id, List<Integer> maxXSlice_id,
List<Integer> maxYSlice_id, List<Integer> maxZSlice_id, List<Integer> maxWSlice_id, List<Integer> xPhysicalSize_id, List<Integer> yPhysicalSize_id, List<Integer> optimizationResultFound_id , List<Integer> maxYSlice_id, List<Integer> maxZSlice_id, List<Integer> maxWSlice_id, List<Integer> xPhysicalSize_id, List<Integer> yPhysicalSize_id, List<Integer> optimizationResultFound_id ,
List<Integer> optimizationResultValue_id , List<String> optimizationColor, List<Integer> optimizationFitFound_id , List<Integer> optimizationFitArray_id, List<Integer> optimizationResultValue_id , List<String> optimizationColor, List<Integer> optimizationFitFound_id , List<Integer> optimizationFitArray_id,
...@@ -97,10 +97,6 @@ public class PlotyInstance { ...@@ -97,10 +97,6 @@ public class PlotyInstance {
if (yAxisTitleProperty != null) { if (yAxisTitleProperty != null) {
yaxistitleid = yAxisTitleProperty.getPropertyID(); yaxistitleid = yAxisTitleProperty.getPropertyID();
} }
int numorid = 0;
if (numorProperty != null) {
numorid = numorProperty.getPropertyID();
}
Message messageFirst = DataPlotMessages.Message.newBuilder(). Message messageFirst = DataPlotMessages.Message.newBuilder().
...@@ -133,13 +129,13 @@ public class PlotyInstance { ...@@ -133,13 +129,13 @@ public class PlotyInstance {
addAllOptimizationFitFoundId(optimizationFitFound_id). addAllOptimizationFitFoundId(optimizationFitFound_id).
addAllOptimizationFitYId(optimizationFitArray_id). addAllOptimizationFitYId(optimizationFitArray_id).
addAllOptimizationFitColor(optimizationFitColor). addAllOptimizationFitColor(optimizationFitColor).
setTitle(title). setWindowTitle(windowTitle).
setPlotTitle(plotTitle).
setXaxisTitle(yAxisTitle). setXaxisTitle(yAxisTitle).
setYaxisTitle(yAxisTitle). setYaxisTitle(yAxisTitle).
setTitleId(titleid). setTitleId(titleid).
setXaxisTitleId(xaxistitleid). setXaxisTitleId(xaxistitleid).
setYaxisTitleId(yaxistitleid). setYaxisTitleId(yaxistitleid).
setNumorId(numorid).
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