Pass property names to ploty2 instead of ids

ChangeLog

+* Pass property names to ploty2 instead of ids
+
 4.0.7 23/04/2020
 -----
 * Merge ploty2 branch

src/main/java/fr/ill/ics/nscclient/ploty/PlotyInstance.java

@@ -186,35 +186,35 @@ public class PlotyInstance {
 		plotRequester.send(messageFirst.toByteArray());
 	}
 
-	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,
+	public void plot(String controllerName, String plotkey, List<String> key, List<String> legend_key, List<String> color,
+			List<String> datax_prop_name, List<String> datay_prop_name, List<String> dataz_prop_name, List<Boolean> errorBars,
 			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, List<String> optimizationFitColor, Integer use_grid_id,
-			Integer use_log_id, Integer color_map_id, Integer min_color_limit_id, Integer max_color_limit_id, Integer nbRois_id, List<Integer> roiX0_parentId,
-			List<Integer> roiY0_parentId, List<Integer> roiX1_parentId, List<Integer> roiY1_parentId,
-			List<Integer> roiSum_parentId, Integer roiSelectedPlot_id, Integer roiSelectedRoi_id,
-			Integer roiSelectedX0_id, Integer roiSelectedY0_id, Integer roiSelectedX1_id, Integer roiSelectedY1_id,
-			Integer roiCommandAdd_id, Integer roiCommandRaz_id, Integer countActivated_id) {
+			Property xAxisTitleProperty, Property yAxisTitleProperty, List<String> dataState_prop_name,
+			List<String> xSlice_prop_name, List<String> ySlice_prop_name, List<String> zSlice_prop_name, List<String> wSlice_prop_name,
+			List<String> maxXSlice_prop_name, List<String> maxYSlice_prop_name, List<String> maxZSlice_prop_name,
+			List<String> maxWSlice_prop_name, List<String> xPhysicalSize_prop_name, List<String> yPhysicalSize_prop_name,
+			List<String> optimizationResultFound_prop_name, List<String> optimizationResultValue_prop_name,
+			List<String> optimizationColor, List<String> optimizationFitFound_prop_name,
+			List<String> optimizationFitArray_prop_name, List<String> optimizationFitColor, String use_grid_prop_name,
+			String use_log_prop_name, String color_map_prop_name, String min_color_limit_prop_name, String max_color_limit_prop_name, String nbRois_prop_name, List<String> roiX0_parentPropName,
+			List<String> roiY0_parentPropName, List<String> roiX1_parentPropName, List<String> roiY1_parentPropName,
+			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 roiCommandAdd_prop_name, String roiCommandRaz_prop_name, String countActivated_prop_name) {
 		
 		if (initOk == false) return;
 		
-		int titleid = 0;
+		String title_prop_name = "";
 		if (titleProperty != null) {
-			titleid = titleProperty.getPropertyID();
+			title_prop_name = titleProperty.getName();
 		}
-		int xaxistitleid = 0;
+		String xaxistitle_prop_name = "";
 		if (xAxisTitleProperty != null) {
-			xaxistitleid = xAxisTitleProperty.getPropertyID();
+			xaxistitle_prop_name = xAxisTitleProperty.getName();
 		}
-		int yaxistitleid = 0;
+		String yaxistitle_prop_name = "";
 		if (yAxisTitleProperty != null) {
-			yaxistitleid = yAxisTitleProperty.getPropertyID();
+			yaxistitle_prop_name = yAxisTitleProperty.getName();
 		}
 		
 		
@@ -223,58 +223,59 @@ public class PlotyInstance {
 				build();
 
 		PlotPropertyDataMessage messageSecond = DataPlotMessages.PlotPropertyDataMessage.newBuilder().
+				setControllerName(controllerName).
 				setPlotkey(plotkey).
 				addAllKeys(key).
 				addAllLegendKeys(legend_key).
 				addAllColors(color).
-				addAllDataxIds(datax_id).
-				addAllDatayIds(datay_id).
-				addAllDatazIds(dataz_id).
-				addAllPlottypeId(dataState_id).
-				addAllXId(xSlice_id).
-				addAllYId(ySlice_id).
-				addAllChannelId(zSlice_id).
-				addAllSliceId(wSlice_id).
-				addAllMaxXId(maxXSlice_id).
-				addAllMaxYId(maxYSlice_id).
-				addAllMaxChannelId(maxZSlice_id).
-				addAllMaxSliceId(maxWSlice_id).
-				addAllXphysicalSizeId(xPhysicalSize_id).
-				addAllYphysicalSizeId(yPhysicalSize_id).
+				addAllDataxPropName(datax_prop_name).
+				addAllDatayPropName(datay_prop_name).
+				addAllDatazPropName(dataz_prop_name).
+				addAllPlottypePropName(dataState_prop_name).
+				addAllXPropName(xSlice_prop_name).
+				addAllYPropName(ySlice_prop_name).
+				addAllChannelPropName(zSlice_prop_name).
+				addAllSlicePropName(wSlice_prop_name).
+				addAllMaxXPropName(maxXSlice_prop_name).
+				addAllMaxYPropName(maxYSlice_prop_name).
+				addAllMaxChannelPropName(maxZSlice_prop_name).
+				addAllMaxSlicePropName(maxWSlice_prop_name).
+				addAllXphysicalSizePropName(xPhysicalSize_prop_name).
+				addAllYphysicalSizePropName(yPhysicalSize_prop_name).
 				addAllErrorBars(errorBars).
-				addAllOptimizationResultFoundId(optimizationResultFound_id).
-				addAllOptimizationResultXId(optimizationResultValue_id).
+				addAllOptimizationResultFoundPropName(optimizationResultFound_prop_name).
+				addAllOptimizationResultXPropName(optimizationResultValue_prop_name).
 				addAllOptimizationResultColor(optimizationColor).
-				addAllOptimizationFitFoundId(optimizationFitFound_id).
-				addAllOptimizationFitYId(optimizationFitArray_id).
+				addAllOptimizationFitFoundPropName(optimizationFitFound_prop_name).
+				addAllOptimizationFitYPropName(optimizationFitArray_prop_name).
 				addAllOptimizationFitColor(optimizationFitColor).
-				setUseGridId(use_grid_id).
-				setUseLogId(use_log_id).
-				setColorMapId(color_map_id).
-				setMinColorLimitId(min_color_limit_id).
-				setMaxColorLimitId(max_color_limit_id).
+				setUseGridPropName(use_grid_prop_name).
+				setUseLogPropName(use_log_prop_name).
+				setColorMapPropName(color_map_prop_name).
+				setMinColorLimitPropName(min_color_limit_prop_name).
+				setMaxColorLimitPropName(max_color_limit_prop_name).
 				setWindowTitle(windowTitle).
 				setPlotTitle(plotTitle).
 				setXaxisTitle(yAxisTitle).
 				setYaxisTitle(yAxisTitle).
-				setTitleId(titleid).
-				setXaxisTitleId(xaxistitleid).
-				setYaxisTitleId(yaxistitleid).
-				setNbRoisId(nbRois_id).
-				addAllX0ParentId(roiX0_parentId).
-				addAllY0ParentId(roiY0_parentId).
-				addAllX1ParentId(roiX1_parentId).
-				addAllY1ParentId(roiY1_parentId).
-				addAllSumParentId(roiSum_parentId).
-				setSelectedPlotId(roiSelectedPlot_id).
-				setSelectedRoiId(roiSelectedRoi_id).
-				setSelectedX0Id(roiSelectedX0_id).
-				setSelectedY0Id(roiSelectedY0_id).
-				setSelectedX1Id(roiSelectedX1_id).
-				setSelectedY1Id(roiSelectedY1_id).
-				setCommandRoiAddId(roiCommandAdd_id).
-				setCommandRoiRazId(roiCommandRaz_id).
-				setCountActivatedId(countActivated_id).
+				setTitlePropName(title_prop_name).
+				setXaxisTitlePropName(xaxistitle_prop_name).
+				setYaxisTitlePropName(yaxistitle_prop_name).
+				setNbRoisPropName(nbRois_prop_name).
+				addAllX0ParentPropName(roiX0_parentPropName).
+				addAllY0ParentPropName(roiY0_parentPropName).
+				addAllX1ParentPropName(roiX1_parentPropName).
+				addAllY1ParentPropName(roiY1_parentPropName).
+				addAllSumParentPropName(roiSum_parentPropName).
+				setSelectedPlotPropName(roiSelectedPlot_prop_name).
+				setSelectedRoiPropName(roiSelectedRoi_prop_name).
+				setSelectedX0PropName(roiSelectedX0_prop_name).
+				setSelectedY0PropName(roiSelectedY0_prop_name).
+				setSelectedX1PropName(roiSelectedX1_prop_name).
+				setSelectedY1PropName(roiSelectedY1_prop_name).
+				setCommandRoiAddPropName(roiCommandAdd_prop_name).
+				setCommandRoiRazPropName(roiCommandRaz_prop_name).
+				setCountActivatedPropName(countActivated_prop_name).
 				build();
 		
 		plotRequester.sendTwoParts(messageFirst.toByteArray(), messageSecond.toByteArray());