Commit 10679113 authored by Locatelli's avatar Locatelli

Update for ploty2 changes

parent d0117974
......@@ -76,8 +76,8 @@ public class PlotyInstance {
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,
String title, String xAxisTitle, String yAxisTitle, Property titleProperty, Property xAxisTitleProperty,
Property yAxisTitleProperty, Property numorProperty, List<Integer> dataState_id, List<Integer> xSlice_id,
String windowTitle, String plotTitle, String xAxisTitle, String yAxisTitle, Property titleProperty, Property xAxisTitleProperty,
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> 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,
......@@ -97,10 +97,6 @@ public class PlotyInstance {
if (yAxisTitleProperty != null) {
yaxistitleid = yAxisTitleProperty.getPropertyID();
}
int numorid = 0;
if (numorProperty != null) {
numorid = numorProperty.getPropertyID();
}
Message messageFirst = DataPlotMessages.Message.newBuilder().
......@@ -133,13 +129,13 @@ public class PlotyInstance {
addAllOptimizationFitFoundId(optimizationFitFound_id).
addAllOptimizationFitYId(optimizationFitArray_id).
addAllOptimizationFitColor(optimizationFitColor).
setTitle(title).
setWindowTitle(windowTitle).
setPlotTitle(plotTitle).
setXaxisTitle(yAxisTitle).
setYaxisTitle(yAxisTitle).
setTitleId(titleid).
setXaxisTitleId(xaxistitleid).
setYaxisTitleId(yaxistitleid).
setNumorId(numorid).
build();
plotRequester.sendTwoParts(messageFirst.toByteArray(), messageSecond.toByteArray());
......
......@@ -442,27 +442,32 @@ public final class DataPlotMessages {
int getYaxisTitleId();
/**
* <code>required int32 numor_id = 4;</code>
* <code>required string windowTitle = 4;</code>
*/
boolean hasNumorId();
boolean hasWindowTitle();
/**
* <code>required int32 numor_id = 4;</code>
* <code>required string windowTitle = 4;</code>
*/
int getNumorId();
java.lang.String getWindowTitle();
/**
* <code>required string windowTitle = 4;</code>
*/
com.google.protobuf.ByteString
getWindowTitleBytes();
/**
* <code>required string title = 5;</code>
* <code>required string plotTitle = 5;</code>
*/
boolean hasTitle();
boolean hasPlotTitle();
/**
* <code>required string title = 5;</code>
* <code>required string plotTitle = 5;</code>
*/
java.lang.String getTitle();
java.lang.String getPlotTitle();
/**
* <code>required string title = 5;</code>
* <code>required string plotTitle = 5;</code>
*/
com.google.protobuf.ByteString
getTitleBytes();
getPlotTitleBytes();
/**
* <code>required string xaxis_title = 6;</code>
......@@ -861,7 +866,8 @@ public final class DataPlotMessages {
// @@protoc_insertion_point(message_implements:proto.PlotPropertyDataMessage)
PlotPropertyDataMessageOrBuilder {
private PlotPropertyDataMessage() {
title_ = "";
windowTitle_ = "";
plotTitle_ = "";
xaxisTitle_ = "";
yaxisTitle_ = "";
plotkey_ = "";
......@@ -978,84 +984,106 @@ public final class DataPlotMessages {
yaxisTitleId_ = 0;
}
public static final int NUMOR_ID_FIELD_NUMBER = 4;
private int numorId_;
public static final int WINDOWTITLE_FIELD_NUMBER = 4;
private java.lang.String windowTitle_;
/**
* <code>required int32 numor_id = 4;</code>
* <code>required string windowTitle = 4;</code>
*/
public boolean hasNumorId() {
public boolean hasWindowTitle() {
return ((bitField0_ & 0x00000008) == 0x00000008);
}
/**
* <code>required int32 numor_id = 4;</code>
* <code>required string windowTitle = 4;</code>
*/
public int getNumorId() {
return numorId_;
public java.lang.String getWindowTitle() {
return windowTitle_;
}
/**
* <code>required int32 numor_id = 4;</code>
* <code>required string windowTitle = 4;</code>
*/
private void setNumorId(int value) {
bitField0_ |= 0x00000008;
numorId_ = value;
public com.google.protobuf.ByteString
getWindowTitleBytes() {
return com.google.protobuf.ByteString.copyFromUtf8(windowTitle_);
}
/**
* <code>required int32 numor_id = 4;</code>
* <code>required string windowTitle = 4;</code>
*/
private void clearNumorId() {
private void setWindowTitle(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
bitField0_ |= 0x00000008;
windowTitle_ = value;
}
/**
* <code>required string windowTitle = 4;</code>
*/
private void clearWindowTitle() {
bitField0_ = (bitField0_ & ~0x00000008);
numorId_ = 0;
windowTitle_ = getDefaultInstance().getWindowTitle();
}
/**
* <code>required string windowTitle = 4;</code>
*/
private void setWindowTitleBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
bitField0_ |= 0x00000008;
windowTitle_ = value.toStringUtf8();
}
public static final int TITLE_FIELD_NUMBER = 5;
private java.lang.String title_;
public static final int PLOTTITLE_FIELD_NUMBER = 5;
private java.lang.String plotTitle_;
/**
* <code>required string title = 5;</code>
* <code>required string plotTitle = 5;</code>
*/
public boolean hasTitle() {
public boolean hasPlotTitle() {
return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
* <code>required string title = 5;</code>
* <code>required string plotTitle = 5;</code>
*/
public java.lang.String getTitle() {
return title_;
public java.lang.String getPlotTitle() {
return plotTitle_;
}
/**
* <code>required string title = 5;</code>
* <code>required string plotTitle = 5;</code>
*/
public com.google.protobuf.ByteString
getTitleBytes() {
return com.google.protobuf.ByteString.copyFromUtf8(title_);
getPlotTitleBytes() {
return com.google.protobuf.ByteString.copyFromUtf8(plotTitle_);
}
/**
* <code>required string title = 5;</code>
* <code>required string plotTitle = 5;</code>
*/
private void setTitle(
private void setPlotTitle(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
bitField0_ |= 0x00000010;
title_ = value;
plotTitle_ = value;
}
/**
* <code>required string title = 5;</code>
* <code>required string plotTitle = 5;</code>
*/
private void clearTitle() {
private void clearPlotTitle() {
bitField0_ = (bitField0_ & ~0x00000010);
title_ = getDefaultInstance().getTitle();
plotTitle_ = getDefaultInstance().getPlotTitle();
}
/**
* <code>required string title = 5;</code>
* <code>required string plotTitle = 5;</code>
*/
private void setTitleBytes(
private void setPlotTitleBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
bitField0_ |= 0x00000010;
title_ = value.toStringUtf8();
plotTitle_ = value.toStringUtf8();
}
public static final int XAXIS_TITLE_FIELD_NUMBER = 6;
......@@ -2740,10 +2768,10 @@ public final class DataPlotMessages {
output.writeInt32(3, yaxisTitleId_);
}
if (((bitField0_ & 0x00000008) == 0x00000008)) {
output.writeInt32(4, numorId_);
output.writeString(4, getWindowTitle());
}
if (((bitField0_ & 0x00000010) == 0x00000010)) {
output.writeString(5, getTitle());
output.writeString(5, getPlotTitle());
}
if (((bitField0_ & 0x00000020) == 0x00000020)) {
output.writeString(6, getXaxisTitle());
......@@ -2848,11 +2876,11 @@ public final class DataPlotMessages {
}
if (((bitField0_ & 0x00000008) == 0x00000008)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(4, numorId_);
.computeStringSize(4, getWindowTitle());
}
if (((bitField0_ & 0x00000010) == 0x00000010)) {
size += com.google.protobuf.CodedOutputStream
.computeStringSize(5, getTitle());
.computeStringSize(5, getPlotTitle());
}
if (((bitField0_ & 0x00000020) == 0x00000020)) {
size += com.google.protobuf.CodedOutputStream
......@@ -3258,77 +3286,94 @@ public final class DataPlotMessages {
}
/**
* <code>required int32 numor_id = 4;</code>
* <code>required string windowTitle = 4;</code>
*/
public boolean hasWindowTitle() {
return instance.hasWindowTitle();
}
/**
* <code>required string windowTitle = 4;</code>
*/
public boolean hasNumorId() {
return instance.hasNumorId();
public java.lang.String getWindowTitle() {
return instance.getWindowTitle();
}
/**
* <code>required int32 numor_id = 4;</code>
* <code>required string windowTitle = 4;</code>
*/
public int getNumorId() {
return instance.getNumorId();
public com.google.protobuf.ByteString
getWindowTitleBytes() {
return instance.getWindowTitleBytes();
}
/**
* <code>required int32 numor_id = 4;</code>
* <code>required string windowTitle = 4;</code>
*/
public Builder setNumorId(int value) {
public Builder setWindowTitle(
java.lang.String value) {
copyOnWrite();
instance.setNumorId(value);
instance.setWindowTitle(value);
return this;
}
/**
* <code>required int32 numor_id = 4;</code>
* <code>required string windowTitle = 4;</code>
*/
public Builder clearNumorId() {
public Builder clearWindowTitle() {
copyOnWrite();
instance.clearNumorId();
instance.clearWindowTitle();
return this;
}
/**
* <code>required string windowTitle = 4;</code>
*/
public Builder setWindowTitleBytes(
com.google.protobuf.ByteString value) {
copyOnWrite();
instance.setWindowTitleBytes(value);
return this;
}
/**
* <code>required string title = 5;</code>
* <code>required string plotTitle = 5;</code>
*/
public boolean hasTitle() {
return instance.hasTitle();
public boolean hasPlotTitle() {
return instance.hasPlotTitle();
}
/**
* <code>required string title = 5;</code>
* <code>required string plotTitle = 5;</code>
*/
public java.lang.String getTitle() {
return instance.getTitle();
public java.lang.String getPlotTitle() {
return instance.getPlotTitle();
}
/**
* <code>required string title = 5;</code>
* <code>required string plotTitle = 5;</code>
*/
public com.google.protobuf.ByteString
getTitleBytes() {
return instance.getTitleBytes();
getPlotTitleBytes() {
return instance.getPlotTitleBytes();
}
/**
* <code>required string title = 5;</code>
* <code>required string plotTitle = 5;</code>
*/
public Builder setTitle(
public Builder setPlotTitle(
java.lang.String value) {
copyOnWrite();
instance.setTitle(value);
instance.setPlotTitle(value);
return this;
}
/**
* <code>required string title = 5;</code>
* <code>required string plotTitle = 5;</code>
*/
public Builder clearTitle() {
public Builder clearPlotTitle() {
copyOnWrite();
instance.clearTitle();
instance.clearPlotTitle();
return this;
}
/**
* <code>required string title = 5;</code>
* <code>required string plotTitle = 5;</code>
*/
public Builder setTitleBytes(
public Builder setPlotTitleBytes(
com.google.protobuf.ByteString value) {
copyOnWrite();
instance.setTitleBytes(value);
instance.setPlotTitleBytes(value);
return this;
}
......@@ -4909,13 +4954,13 @@ public final class DataPlotMessages {
}
return null;
}
if (!hasNumorId()) {
if (!hasWindowTitle()) {
if (shouldMemoize) {
memoizedIsInitialized = 0;
}
return null;
}
if (!hasTitle()) {
if (!hasPlotTitle()) {
if (shouldMemoize) {
memoizedIsInitialized = 0;
}
......@@ -4985,12 +5030,12 @@ public final class DataPlotMessages {
yaxisTitleId_ = visitor.visitInt(
hasYaxisTitleId(), yaxisTitleId_,
other.hasYaxisTitleId(), other.yaxisTitleId_);
numorId_ = visitor.visitInt(
hasNumorId(), numorId_,
other.hasNumorId(), other.numorId_);
title_ = visitor.visitString(
hasTitle(), title_,
other.hasTitle(), other.title_);
windowTitle_ = visitor.visitString(
hasWindowTitle(), windowTitle_,
other.hasWindowTitle(), other.windowTitle_);
plotTitle_ = visitor.visitString(
hasPlotTitle(), plotTitle_,
other.hasPlotTitle(), other.plotTitle_);
xaxisTitle_ = visitor.visitString(
hasXaxisTitle(), xaxisTitle_,
other.hasXaxisTitle(), other.xaxisTitle_);
......@@ -5064,15 +5109,16 @@ public final class DataPlotMessages {
yaxisTitleId_ = input.readInt32();
break;
}
case 32: {
case 34: {
String s = input.readString();
bitField0_ |= 0x00000008;
numorId_ = input.readInt32();
windowTitle_ = s;
break;
}
case 42: {
String s = input.readString();
bitField0_ |= 0x00000010;
title_ = s;
plotTitle_ = s;
break;
}
case 50: {
......
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