From 9a994bf5525225c1fbde586cd5c4db5b44e58973 Mon Sep 17 00:00:00 2001 From: zheng Date: Wed, 18 Sep 2019 16:29:38 +0800 Subject: [PATCH] =?UTF-8?q?CHART-10358=20=E7=AE=B1=E5=9E=8B=E5=9B=BE=20?= =?UTF-8?q?=E6=99=B6=E5=9C=86=E5=9B=BE=20check?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/mainframe/chart/ChartEditPane.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartEditPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartEditPane.java index 6d6f73ea2..5ecfa1071 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartEditPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartEditPane.java @@ -1,6 +1,7 @@ package com.fr.design.mainframe.chart; +import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.ChartCollection; import com.fr.chartx.attr.ChartProvider; import com.fr.design.ChartTypeInterfaceManager; @@ -130,6 +131,10 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4 } }; + @Deprecated + public void reLayout(Chart currentChart) { + } + /** * 重新构造面板 * @param currentChart 图表 @@ -225,8 +230,14 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4 return; } - if (checkNeedsReLayout(collection.getSelectedChartProvider())) { - reLayout(collection.getSelectedChartProvider()); + ChartProvider chartProvider = collection.getSelectedChartProvider(); + if (checkNeedsReLayout(chartProvider)) { + String chartID = chartProvider.getID(); + if ("WaferChipChart".equals(chartID) || "BoxPlotChart".equals(chartID)) { + reLayout((Chart)chartProvider); + } else { + reLayout(chartProvider); + } } this.collection = collection;