diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.ui/bin/de/dc/javafx/xcore/workbench/chart/ui/ChartFXEmfDetailedTreeView.class b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.ui/bin/de/dc/javafx/xcore/workbench/chart/ui/ChartFXEmfDetailedTreeView.class index 6f136f19..108248f9 100644 Binary files a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.ui/bin/de/dc/javafx/xcore/workbench/chart/ui/ChartFXEmfDetailedTreeView.class and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.ui/bin/de/dc/javafx/xcore/workbench/chart/ui/ChartFXEmfDetailedTreeView.class differ diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.ui/bin/de/dc/javafx/xcore/workbench/chart/ui/renderer/ChartFXRenderer.class b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.ui/bin/de/dc/javafx/xcore/workbench/chart/ui/renderer/ChartFXRenderer.class index 87240e90..3319f9b4 100644 Binary files a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.ui/bin/de/dc/javafx/xcore/workbench/chart/ui/renderer/ChartFXRenderer.class and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.ui/bin/de/dc/javafx/xcore/workbench/chart/ui/renderer/ChartFXRenderer.class differ diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.ui/src/de/dc/javafx/xcore/workbench/chart/ui/ChartFXEmfDetailedTreeView.java b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.ui/src/de/dc/javafx/xcore/workbench/chart/ui/ChartFXEmfDetailedTreeView.java index 582da944..40b5cb1c 100644 --- a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.ui/src/de/dc/javafx/xcore/workbench/chart/ui/ChartFXEmfDetailedTreeView.java +++ b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.ui/src/de/dc/javafx/xcore/workbench/chart/ui/ChartFXEmfDetailedTreeView.java @@ -15,6 +15,8 @@ import de.dc.javafx.xcore.workbench.chart.ChartProject; import de.dc.javafx.xcore.workbench.chart.SeriesFX; import de.dc.javafx.xcore.workbench.chart.XYValueFX; +import de.dc.javafx.xcore.workbench.chart.XYZSeriesFX; +import de.dc.javafx.xcore.workbench.chart.XYZValueFX; import de.dc.javafx.xcore.workbench.chart.ui.view.ChartFXPreview; import de.dc.javafx.xcore.workbench.di.DIPlatform; import de.dc.javafx.xcore.workbench.emf.ui.EmfDetailedTreeView; @@ -56,6 +58,16 @@ private void generateDummyValues() { value.setValue(random.nextDouble()); values.add(value); } + }else if (selection.getValue() instanceof XYZSeriesFX) { + series = (XYZSeriesFX) selection.getValue(); + for (int i = 0; i < 50; i++) { + XYZValueFX value = ChartFactory.eINSTANCE.createXYZValueFX(); + value.setX(i+5); + value.setY(random.nextDouble()); + value.setZ(random.nextDouble()); + values.add(value); + } + } if (series!=null) { diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.ui/src/de/dc/javafx/xcore/workbench/chart/ui/renderer/ChartFXRenderer.java b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.ui/src/de/dc/javafx/xcore/workbench/chart/ui/renderer/ChartFXRenderer.java index 527355b4..23440e4c 100644 --- a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.ui/src/de/dc/javafx/xcore/workbench/chart/ui/renderer/ChartFXRenderer.java +++ b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.ui/src/de/dc/javafx/xcore/workbench/chart/ui/renderer/ChartFXRenderer.java @@ -73,7 +73,7 @@ public class ChartFXRenderer extends ChartSwitch { public Node caseScatterChart3dFX(ScatterChart3dFX object) { XYZSeriesCollection dataset = new XYZSeriesCollection<>(); for (XYZSeriesFX seriesFX : object.getSeries()) { - String name = seriesFX.getName(); + String name = seriesFX.getName()==null? "Test "+object.getSeries().indexOf(seriesFX) : seriesFX.getName(); XYZSeries series = new XYZSeries<>(name); for (XYZValueFX valueFX : seriesFX.getValues()) { series.add(valueFX.getX(), valueFX.getY(), valueFX.getZ());