Commit 53918a8d authored by Locatelli's avatar Locatelli

Pass property names to ploty2 instead of ids

parent 7a069909
* Pass property names to ploty2 instead of ids
4.0.8 22/04/2020
-----
* Merge ploty2 branch
......
......@@ -47,38 +47,48 @@ public abstract class PlotLauncherExternImageButton extends PlotLauncher impleme
yAxisTitleProperty, numorProperty);
this.height = height;
this.width = height;
String key = "";
String controllerName = "";
String legendName = "";
// String key = "";
// String controllerName = "";
// String legendName = "";
// Iterator<PlotData> it = plotDatas.iterator();
// while (it.hasNext()) {
// key = "";
// PropertyPlotData pdata = ((PropertyPlotData) it.next());
// if (pdata != null) {
// if (pdata.getDataPlotController() != null) {
// controllerName = pdata.getDataPlotController().getName();
// }
// if (titleProperty != null) {
// legendName = titleProperty.getValue();
// if (legendName.contains("-")) {
// legendName = legendName.substring(0, legendName.indexOf("-") - 1);
// }
// }
// }
// key = key + "," + pdata.getKey();
// break;
// }
// if (key.length() > 0) {
// key = key.substring(1);
// }
// if (controllerName.isEmpty() == false) {
// key = controllerName + "#" + key;
// }
// if ((legendName.isEmpty() == false) && (!controllerName.contains("ScanSpy"))) {
// key = key + "#" + legendName;
// }
// imageKey = key + ".png";
String controllerType = "";
Iterator<PlotData> it = plotDatas.iterator();
while (it.hasNext()) {
key = "";
PropertyPlotData pdata = ((PropertyPlotData) it.next());
if (pdata != null) {
if (pdata.getDataPlotController() != null) {
controllerName = pdata.getDataPlotController().getName();
}
if (titleProperty != null) {
legendName = titleProperty.getValue();
if (legendName.contains("-")) {
legendName = legendName.substring(0, legendName.indexOf("-") - 1);
}
controllerType = pdata.getDataPlotController().getType();
}
}
key = key + "," + pdata.getKey();
break;
}
if (key.length() > 0) {
key = key.substring(1);
}
if (controllerName.isEmpty() == false) {
key = controllerName + "#" + key;
}
if ((legendName.isEmpty() == false) && (!controllerName.contains("ScanSpy"))) {
key = key + "#" + legendName;
}
imageKey = key + ".png";
imageKey = controllerType + ".png";
if (ConfigManager.getInstance().getPlotyVersion() == 2) {
PlotyInstance.getInstance().addSpyPlotChangeListener(this);
}
......
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