Commit 4cbadb80 authored by Locatelli's avatar Locatelli

get controller name when not property plot data

parent 53918a8d
......@@ -105,19 +105,27 @@ public class PlotyManager {
int indice = 1;
for (PlotData plot : plotDatas) {
PropertyPlotData pplot = (PropertyPlotData) plot;
controllerName = pplot.dataPlot.getName();
key.add(pplot.getKey());
legend_key.add(pplot.getPlotLegend() + "-" + Integer.toString(indice));
color.add(String.format("%02X", (0xFF & pplot.getRed())) + String.format("%02X", (0xFF & pplot.getGreen() ))
+ String.format("%02X", (0xFF & pplot.getBlue())));
if (pplot.getDataXProperty() != null) {
datax_prop_name.add(pplot.getDataXProperty().getName());
if (!pplot.isAPlotDataController()) {
controllerName = pplot.getDataXProperty().getControllerName();
}
}
if (pplot.getDataYProperty() != null) {
datay_prop_name.add(pplot.getDataYProperty().getName());
if (!pplot.isAPlotDataController()) {
controllerName = pplot.getDataYProperty().getControllerName();
}
}
if (pplot.getDataZProperty() != null) {
dataz_prop_name.add(pplot.getDataZProperty().getName());
if (!pplot.isAPlotDataController()) {
controllerName = pplot.getDataZProperty().getControllerName();
}
}
error_bars.add(pplot.getUseErrorBar());
......@@ -136,6 +144,7 @@ public class PlotyManager {
}
if (pplot.isAPlotDataController()) {
controllerName = pplot.dataPlot.getName();
int plotDataNumber = Integer.valueOf(pplot.getKey().substring(pplot.getKey().length() - 1));
dataState_prop_name.add(ControllerAndPropertyConstants.dataStatePropertyName + "." + plotDataNumber);
xSlice_prop_name.add(ControllerAndPropertyConstants.detectorXPositionPropertyName + "." + plotDataNumber);
......@@ -171,12 +180,12 @@ public class PlotyManager {
roiCommandAdd_prop_name = ControllerAndPropertyConstants.roiAddCommandName;
roiCommandRaz_prop_name = ControllerAndPropertyConstants.roiRazCommandName;
}
if (PropertyManager.getInstance().getProperty(pplot.dataPlot, ControllerAndPropertyConstants.useGridPropertyName) != null) {
use_grid_prop_name = ControllerAndPropertyConstants.useGridPropertyName;
}
if (PropertyManager.getInstance().getProperty(pplot.dataPlot, ControllerAndPropertyConstants.useGridPropertyName) != null) {
use_log_prop_name = ControllerAndPropertyConstants.useLogPropertyName;
if (PropertyManager.getInstance().getProperty(pplot.dataPlot, ControllerAndPropertyConstants.useGridPropertyName) != null) {
use_grid_prop_name = ControllerAndPropertyConstants.useGridPropertyName;
}
if (PropertyManager.getInstance().getProperty(pplot.dataPlot, ControllerAndPropertyConstants.useGridPropertyName) != null) {
use_log_prop_name = ControllerAndPropertyConstants.useLogPropertyName;
}
}
++indice;
}
......
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