Browse Source

Merge pull request #3200 in DESIGN/design from release/10.0 to bugfix/10.0

* commit 'ebf31c3cd643bc3b8648ed454a65e0d09079e7a0':
  CHART-17661 多层饼图面板
bugfix/10.0
superman 4 years ago
parent
commit
9bc7f8a13c
  1. 19
      designer-chart/src/main/java/com/fr/van/chart/designer/PlotFactory.java
  2. 4
      designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugePlotLabelPane.java

19
designer-chart/src/main/java/com/fr/van/chart/designer/PlotFactory.java

@ -166,6 +166,12 @@ public class PlotFactory {
tooltipContentMap.put(VanChartStructurePlot.class, VanChartStructureTooltipContentPane.class); tooltipContentMap.put(VanChartStructurePlot.class, VanChartStructureTooltipContentPane.class);
} }
private static Map<Class<? extends Plot>, Class<? extends VanChartPlotLabelPane>> labelMap = new HashMap<>();
static {
labelMap.put(PiePlot4VanChart.class, VanChartPiePlotLabelPane.class);
labelMap.put(VanChartGaugePlot.class, VanChartGaugePlotLabelPane.class);
}
/** /**
* 监控刷新 自动数据点提示Map * 监控刷新 自动数据点提示Map
@ -208,10 +214,15 @@ public class PlotFactory {
} }
public static VanChartPlotLabelPane createPlotLabelPane(Plot plot, VanChartStylePane stylePane, boolean inCondition) { public static VanChartPlotLabelPane createPlotLabelPane(Plot plot, VanChartStylePane stylePane, boolean inCondition) {
if (plot instanceof VanChartGaugePlot) { Class<? extends Plot> key = plot.getClass();
return new VanChartGaugePlotLabelPane(plot, stylePane); if (labelMap.containsKey(key)) {
} else if (plot instanceof PiePlot4VanChart) { try {
return new VanChartPiePlotLabelPane(plot, stylePane, inCondition); Class<? extends VanChartPlotLabelPane> cl = labelMap.get(key);
Constructor<? extends VanChartPlotLabelPane> constructor = cl.getConstructor(Plot.class, VanChartStylePane.class, boolean.class);
return constructor.newInstance(plot, stylePane, inCondition);
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
} }
return new VanChartPlotLabelPane(plot, stylePane, inCondition); return new VanChartPlotLabelPane(plot, stylePane, inCondition);
} }

4
designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugePlotLabelPane.java

@ -25,8 +25,8 @@ public class VanChartGaugePlotLabelPane extends VanChartPlotLabelPane {
private VanChartPlotLabelDetailPane gaugeValueLabelPane; private VanChartPlotLabelDetailPane gaugeValueLabelPane;
public VanChartGaugePlotLabelPane(Plot plot, VanChartStylePane parent) { public VanChartGaugePlotLabelPane(Plot plot, VanChartStylePane parent, boolean inCondition) {
super(plot, parent); super(plot, parent, inCondition);
} }
protected void createLabelPane() { protected void createLabelPane() {

Loading…
Cancel
Save