From 86cb9f74e59cc6bc8498c23908d82bc85072b62c Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Sat, 8 Aug 2020 20:23:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?CHART-14925=20=E5=88=86=E7=B1=BB=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E9=80=89=E4=B8=AD=E6=97=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../van/chart/box/data/table/BoxPlotTableSeriesTypeUsePane.java | 1 + 1 file changed, 1 insertion(+) 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 ea8533577..b9993440f 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 @@ -71,6 +71,7 @@ public class BoxPlotTableSeriesTypeUsePane extends UIComboBoxPane Date: Sat, 8 Aug 2020 20:41:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?CHART-14960=20=E7=BB=93=E6=9E=9C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=9A=84=E7=B3=BB=E5=88=97=E5=92=8C=E4=B8=AD=E4=BD=8D?= =?UTF-8?q?=E6=95=B0=E5=A2=9E=E5=8A=A0=E6=97=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../table/BoxPlotTableResultDataSeriesPane.java | 14 ++++++++++++++ .../box/data/table/UIComboBoxWithEditLabel.java | 4 ++++ 2 files changed, 18 insertions(+) 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 a9813f2d3..bdaf58a34 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 @@ -56,6 +56,11 @@ public class BoxPlotTableResultDataSeriesPane extends AbstractTableDataContentPa median = createUIComboBoxWithEditLabel(Toolkit.i18nText("Fine-Design_Chart_Data_Median")); q1 = createUIComboBoxWithEditLabel(Toolkit.i18nText("Fine-Design_Chart_Data_Q1")); min = createUIComboBoxWithEditLabel(Toolkit.i18nText("Fine-Design_Chart_Data_Min")); + + addNoneItem(); + + seriesName.setSelectedItem(null); + median.populateComboBox(null); } private JPanel createUIComboBoxPane(UIComboBox comboBox, String title) { @@ -134,6 +139,8 @@ public class BoxPlotTableResultDataSeriesPane extends AbstractTableDataContentPa refreshBoxItems(median.getComboBox(), list); refreshBoxItems(q1.getComboBox(), list); refreshBoxItems(min.getComboBox(), list); + + addNoneItem(); } public void clearAllBoxList() { @@ -145,6 +152,13 @@ public class BoxPlotTableResultDataSeriesPane extends AbstractTableDataContentPa clearBoxItems(median.getComboBox()); clearBoxItems(q1.getComboBox()); clearBoxItems(min.getComboBox()); + + addNoneItem(); + } + + private void addNoneItem() { + seriesName.addItem(Toolkit.i18nText("Fine-Design_Chart_Use_None")); + median.addItem(Toolkit.i18nText("Fine-Design_Chart_Use_None")); } public void populateBean(ChartCollection collection) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/box/data/table/UIComboBoxWithEditLabel.java b/designer-chart/src/main/java/com/fr/van/chart/box/data/table/UIComboBoxWithEditLabel.java index dbfcae01f..339203860 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/box/data/table/UIComboBoxWithEditLabel.java +++ b/designer-chart/src/main/java/com/fr/van/chart/box/data/table/UIComboBoxWithEditLabel.java @@ -45,6 +45,10 @@ public abstract class UIComboBoxWithEditLabel extends JPanel implements UIObserv this.comboBox = comboBox; } + public void addItem(String value) { + comboBox.addItem(value); + } + protected void addItemListener(ItemListener aListener) { comboBox.addItemListener(aListener); } From 72f0afea3a5b19cb385409fc66f82edd8b4faa72 Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Sat, 8 Aug 2020 20:51:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?CHART-15003=20=E4=BA=A4=E4=BA=92=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=94=B6=E7=BC=A9=E4=BA=8E=E6=8A=BD?= =?UTF-8?q?=E5=B1=89=E5=86=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/box/BoxIndependentVanChartInterface.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/box/BoxIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/box/BoxIndependentVanChartInterface.java index ba7360a79..e4906b625 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/box/BoxIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/box/BoxIndependentVanChartInterface.java @@ -6,7 +6,6 @@ import com.fr.design.beans.BasicBeanPane; import com.fr.design.condition.ConditionAttributesPane; import com.fr.design.gui.frpane.AttributeChangeListener; import com.fr.design.i18n.Toolkit; -import com.fr.design.layout.TableLayout; import com.fr.design.mainframe.chart.AbstractChartAttrPane; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartStylePane; @@ -76,10 +75,7 @@ public class BoxIndependentVanChartInterface extends AbstractIndependentVanChart return new VanChartInteractivePane() { protected Component[][] createToolBarComponents() { - return new Component[][]{ - new Component[]{null, exportImages}, - new Component[]{null, fullScreenDisplay} - }; + return createToolBarComponentsWithOutSort(); } protected AutoRefreshPane getMoreLabelPane(VanChartPlot plot) { @@ -87,11 +83,6 @@ public class BoxIndependentVanChartInterface extends AbstractIndependentVanChart return new AutoRefreshPaneWithoutTooltip(chart, isLargeModel); } - protected double[] getToolBarRowSize() { - double p = TableLayout.PREFERRED; - return new double[]{p, p}; - } - protected ZoomPane createZoomPane() { return new ZoomPane(); }