From 7db61352ff4bbb50fe3b1b55acb8d685febe52a8 Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Thu, 23 Jul 2020 18:54:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=95=B0=E6=8D=AE=E4=B8=8D?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=95=B0=E6=8D=AE=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../table/BoxPlotTableDataContentPane.java | 31 ++++------ .../BoxPlotTableResultDataSeriesPane.java | 5 +- .../table/BoxPlotTableSeriesTypeUsePane.java | 5 +- .../data/table/BoxTableDefinitionHelper.java | 59 +++++++++++++++++++ 4 files changed, 76 insertions(+), 24 deletions(-) create mode 100644 designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxTableDefinitionHelper.java diff --git a/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableDataContentPane.java index 6ea7e126e..c17b39bf0 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableDataContentPane.java @@ -12,8 +12,6 @@ import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane; import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.plugin.chart.box.data.VanBoxTableDefinition; -import com.fr.plugin.chart.box.data.VanBoxTableDefinitionHelper; -import com.fr.plugin.chart.box.data.VanBoxTableResultDefinition; import javax.swing.BorderFactory; import javax.swing.JPanel; @@ -31,6 +29,7 @@ public class BoxPlotTableDataContentPane extends AbstractTableDataContentPane { private BoxPlotTableSeriesTypeUsePane seriesTypeComboxPane; private BoxPlotTableResultDataSeriesPane resultDataSeriesPane; + private JPanel filterPane; private ChartDataFilterPane dataScreeningPane; private ChartDataPane parent; @@ -88,10 +87,10 @@ public class BoxPlotTableDataContentPane extends AbstractTableDataContentPane { dataScreeningPane = new ChartDataFilterPane(initplot, parent, false); dataScreeningPane.setBorder(BorderFactory.createEmptyBorder(10, 24, 10, 15)); - JPanel panel = new UIExpandablePane(Toolkit.i18nText("Fine-Design_Chart_Data_Filter"), 290, 24, dataScreeningPane); - panel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 5)); + filterPane = new UIExpandablePane(Toolkit.i18nText("Fine-Design_Chart_Data_Filter"), 290, 24, dataScreeningPane); + filterPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 5)); - return panel; + return filterPane; } private void initDataTypeListener() { @@ -109,6 +108,10 @@ public class BoxPlotTableDataContentPane extends AbstractTableDataContentPane { if (resultDataSeriesPane != null) { resultDataSeriesPane.setVisible(dataType.getSelectedIndex() == 1); } + + if (filterPane != null) { + filterPane.setVisible(dataType.getSelectedIndex() == 0); + } } public void checkBoxUse(boolean hasUse) { @@ -144,7 +147,7 @@ public class BoxPlotTableDataContentPane extends AbstractTableDataContentPane { public void updateBean(ChartCollection collection) { checkChartCollection(collection); - VanBoxTableDefinition table = VanBoxTableDefinitionHelper.getBoxTableDefinition(collection); + VanBoxTableDefinition table = BoxTableDefinitionHelper.getBoxTableDefinition(collection); if (table != null) { table.setDetailed(dataType.getSelectedIndex() == 0); @@ -164,7 +167,7 @@ public class BoxPlotTableDataContentPane extends AbstractTableDataContentPane { checkChartCollection(collection); if (dataType != null) { - dataType.setSelectedIndex(VanBoxTableDefinitionHelper.isDetailedTableDataType(collection) ? 0 : 1); + dataType.setSelectedIndex(BoxTableDefinitionHelper.isDetailedTableDataType(collection) ? 0 : 1); } if (seriesTypeComboxPane != null) { seriesTypeComboxPane.populateBean(collection); @@ -180,7 +183,7 @@ public class BoxPlotTableDataContentPane extends AbstractTableDataContentPane { } private void checkChartCollection(ChartCollection collection) { - VanBoxTableDefinition table = VanBoxTableDefinitionHelper.getBoxTableDefinition(collection); + VanBoxTableDefinition table = BoxTableDefinitionHelper.getBoxTableDefinition(collection); if (table == null) { collection.getSelectedChart().setFilterDefinition(new VanBoxTableDefinition()); @@ -188,26 +191,18 @@ public class BoxPlotTableDataContentPane extends AbstractTableDataContentPane { } private void populateDataScreeningPane(ChartDataFilterPane dataScreeningPane, ChartCollection collection) { - NormalTableDataDefinition detailedDefinition = VanBoxTableDefinitionHelper.getBoxTableDetailedDefinition(collection); - VanBoxTableResultDefinition resultDefinition = VanBoxTableDefinitionHelper.getBoxTableResultDefinition(collection); + NormalTableDataDefinition detailedDefinition = BoxTableDefinitionHelper.getBoxTableDetailedDefinition(collection); if (detailedDefinition != null) { dataScreeningPane.populateDefinition(detailedDefinition, false); - } else if (resultDefinition != null) { - dataScreeningPane.populateDefinition(resultDefinition, false); } } private void updateDataScreeningPane(ChartDataFilterPane dataScreeningPane, ChartCollection collection) { - NormalTableDataDefinition detailedDefinition = VanBoxTableDefinitionHelper.getBoxTableDetailedDefinition(collection); - VanBoxTableResultDefinition resultDefinition = VanBoxTableDefinitionHelper.getBoxTableResultDefinition(collection); + NormalTableDataDefinition detailedDefinition = BoxTableDefinitionHelper.getBoxTableDetailedDefinition(collection); if (detailedDefinition != null) { dataScreeningPane.updateDefinition(detailedDefinition); } - - if (resultDefinition != null) { - dataScreeningPane.updateDefinition(resultDefinition); - } } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableResultDataSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableResultDataSeriesPane.java index 04dd3cda9..ff5391d11 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableResultDataSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableResultDataSeriesPane.java @@ -8,7 +8,6 @@ import com.fr.design.i18n.Toolkit; import com.fr.design.layout.TableLayout; import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; import com.fr.plugin.chart.box.data.VanBoxTableDefinition; -import com.fr.plugin.chart.box.data.VanBoxTableDefinitionHelper; import com.fr.plugin.chart.box.data.VanBoxTableResultDefinition; import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; @@ -120,7 +119,7 @@ public class BoxPlotTableResultDataSeriesPane extends AbstractTableDataContentPa public void populateBean(ChartCollection collection) { super.populateBean(collection); - VanBoxTableResultDefinition definition = VanBoxTableDefinitionHelper.getBoxTableResultDefinition(collection); + VanBoxTableResultDefinition definition = BoxTableDefinitionHelper.getBoxTableResultDefinition(collection); if (definition == null) { return; @@ -136,7 +135,7 @@ public class BoxPlotTableResultDataSeriesPane extends AbstractTableDataContentPa } public void updateBean(ChartCollection collection) { - VanBoxTableDefinition table = VanBoxTableDefinitionHelper.getBoxTableDefinition(collection); + VanBoxTableDefinition table = BoxTableDefinitionHelper.getBoxTableDefinition(collection); VanBoxTableResultDefinition definition = new VanBoxTableResultDefinition(); diff --git a/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableSeriesTypeUsePane.java b/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableSeriesTypeUsePane.java index 1fd9186b1..ea8533577 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableSeriesTypeUsePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableSeriesTypeUsePane.java @@ -18,7 +18,6 @@ import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.UIComponentUtils; import com.fr.general.ComparatorUtils; import com.fr.plugin.chart.box.data.VanBoxTableDefinition; -import com.fr.plugin.chart.box.data.VanBoxTableDefinitionHelper; import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; @@ -168,7 +167,7 @@ public class BoxPlotTableSeriesTypeUsePane extends UIComboBoxPane