From 263efee93d91cee34ed835d2022079e0f3f66d7d Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Thu, 17 Nov 2016 15:16:25 +0800 Subject: [PATCH 1/4] update --- .../src/com/fr/design/mainframe/chart/gui/ChartTypePane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java index eab0010eae..2663ad5ab4 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java @@ -272,7 +272,7 @@ public class ChartTypePane extends AbstractChartAttrPane{ Chart chart = collection.getSelectedChart(); String plotID = chart.getPlot().getPlotID(); boolean isUseDefault = ChartTypeInterfaceManager.getInstance().isUseDefaultPane(plotID); - if (editPane != null && editPane.isDefaultPane() != isUseDefault || (!isUseDefault && !ComparatorUtils.equals(lastPlotID, plotID))){ + if (editPane != null && editPane.isDefaultPane() != isUseDefault || (!isUseDefault && !ComparatorUtils.equals(lastPlotID, plotID)) /*|| needRelayoutPlotPane*/){ editPane.reLayout(chart); } } From c7313ff1e6b91fa1072c595ef3a1b6c6b99833f6 Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Thu, 17 Nov 2016 16:11:55 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/chart/gui/ChartTypePane.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java index 4dbd362e9d..0eb9caf71d 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java @@ -291,8 +291,10 @@ public class ChartTypePane extends AbstractChartAttrPane{ paneState.setPaneState(collection.getState()); } + // TODO: 2016/11/17 因为现在populate面板时会重新构造面板，所以每次都需要重构 private boolean needReactor(ChartCollection collection) { - return paneState.getChartID() != collection.getRepresentChartID() || paneState.getPaneState() != collection.getState(); + /*return paneState.getChartID() != collection.getRepresentChartID() || paneState.getPaneState() != collection.getState();*/ + return true; } /** @@ -305,6 +307,9 @@ public class ChartTypePane extends AbstractChartAttrPane{ this.removeAttributeChangeListener(); buttonPane.populateBean(collection); chartTypePane.populateBean(chart); + //remove面板之后，就需要重构下拉框 + reactorChartTypePane(collection); + this.initAllListeners(); } From 23f80fd8b716897ee6785729ce2c46cd4f237fe5 Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Thu, 17 Nov 2016 16:14:47 +0800 Subject: [PATCH 3/4] update --- .../src/com/fr/design/mainframe/chart/gui/ChartTypePane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java index 0eb9caf71d..dc339057c6 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java @@ -272,7 +272,7 @@ public class ChartTypePane extends AbstractChartAttrPane{ Chart chart = collection.getSelectedChart(); String plotID = chart.getPlot().getPlotID(); boolean isUseDefault = ChartTypeInterfaceManager.getInstance().isUseDefaultPane(plotID); - if (editPane != null && editPane.isDefaultPane() != isUseDefault || (!isUseDefault && !ComparatorUtils.equals(lastPlotID, plotID)) /*|| needRelayoutPlotPane*/){ + if (editPane != null && editPane.isDefaultPane() != isUseDefault || (!isUseDefault && !ComparatorUtils.equals(lastPlotID, plotID))){ editPane.reLayout(chart); } } From 54150480d91f4e511489e5330ec3280124721b9f Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Fri, 18 Nov 2016 09:35:51 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=B3=A8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/mainframe/chart/gui/ChartTypeButtonPane.java | 5 +++-- .../src/com/fr/design/mainframe/chart/gui/ChartTypePane.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java index 8d9ed81530..6c48772b06 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java @@ -275,8 +275,9 @@ public class ChartTypeButtonPane extends BasicBeanPane implemen break; } } - if (editChartType != null) { - editChartType.populateBean(editingCollection.getSelectedChart()); + //切换时重新更新整个面板 + if (parent != null) { + parent.populate(editingCollection); } } } diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java index dc339057c6..6c747c9cc1 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java @@ -304,7 +304,7 @@ public class ChartTypePane extends AbstractChartAttrPane{ Chart chart = collection.getSelectedChart(); this.remove(leftContentPane); initContentPane(); - this.removeAttributeChangeListener(); + buttonPane.populateBean(collection); chartTypePane.populateBean(chart); //remove面板之后，就需要重构下拉框