From f7d427ab56fa42ed83d96778b1b968b1e54269d2 Mon Sep 17 00:00:00 2001 From: zheng Date: Wed, 25 Jul 2018 15:05:25 +0800 Subject: [PATCH] CHART-2611 --- .../fr/design/mainframe/chart/gui/ChartTypePane.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java index 99c0db27d8..e847f190c6 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java @@ -208,18 +208,26 @@ public class ChartTypePane extends AbstractChartAttrPane{ Iterator iterator = allChartTypePane.keySet().iterator(); while (iterator.hasNext()) { - addOnePriorityCards(iterator.next()); + addOnePriorityCards(iterator.next(), false); } } private void addOnePriorityCards(String priority) { + addOnePriorityCards(priority, true); + } + + private void addOnePriorityCards(String priority, boolean ignore) { Map> map = allChartTypePane.get(priority); Iterator>> iterator = map.entrySet().iterator(); while (iterator.hasNext()) { - cards.add(iterator.next().getValue()); + Map.Entry> entry = iterator.next(); + String plotID = entry.getKey(); + if (ignore || ChartTypeManager.enabledChart(plotID)) { + cards.add(entry.getValue()); + } } }