From 1617aadc14ffffecc78fbd8e08140eead3be1236 Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Fri, 8 May 2020 14:42:28 +0800 Subject: [PATCH] =?UTF-8?q?CHART-13740=20=E9=9B=B7=E8=BE=BE=E5=9B=BE?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=BA=BF=E6=94=AF=E6=8C=81=E7=BA=BF=E5=9E=8B?= =?UTF-8?q?=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../background/VanChartAxisAreaPane.java | 63 ++++++++++--------- .../radar/VanChartRadarAxisAreaPane.java | 21 +++---- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAxisAreaPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAxisAreaPane.java index 795dc3ce2..fc17554c2 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAxisAreaPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAxisAreaPane.java @@ -32,9 +32,6 @@ public class VanChartAxisAreaPane extends BasicBeanPane { private static final int PREFERRED_WIDTH = 100; - protected ColorSelectBox horizontalGridLine; - protected ColorSelectBox verticalGridLine; - protected AlertLineListControlPane alertLine; private UIButtonGroup isDefaultIntervalBackground; @@ -44,8 +41,10 @@ public class VanChartAxisAreaPane extends BasicBeanPane { private ColorSelectBox verticalColorBackground; protected BackgroundListControlPane customIntervalBackground; - private LineTypeComboBox horizonLineType;//横向线型 - private LineTypeComboBox verticalLineType;//纵向线型 + private LineTypeComboBox horizonLineType; + private LineTypeComboBox verticalLineType; + private ColorSelectBox horizontalColorBox; + private ColorSelectBox verticalColorBox; private JPanel horizontalColorPane; private JPanel verticalColorPane; @@ -53,9 +52,9 @@ public class VanChartAxisAreaPane extends BasicBeanPane { initComponents(); } - protected void initComponents() { - horizontalGridLine = new ColorSelectBox(PREFERRED_WIDTH); - verticalGridLine = new ColorSelectBox(PREFERRED_WIDTH); + private void initComponents() { + horizontalColorBox = new ColorSelectBox(PREFERRED_WIDTH); + verticalColorBox = new ColorSelectBox(PREFERRED_WIDTH); horizonLineType = new LineTypeComboBox(new LineType[]{LineType.NONE, LineType.SOLID, LineType.DASHED}); verticalLineType = new LineTypeComboBox(new LineType[]{LineType.NONE, LineType.SOLID, LineType.DASHED}); @@ -77,23 +76,33 @@ public class VanChartAxisAreaPane extends BasicBeanPane { } protected JPanel createGridLinePane() { + initGridLineComponents(); + + JPanel panel = new JPanel(new BorderLayout(0, 4)); + panel.add(createSingleGridLinePane(Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal"), true), BorderLayout.NORTH); + panel.add(createSingleGridLinePane(Toolkit.i18nText("Fine-Design_Chart_Direction_Vertical"), false), BorderLayout.CENTER); + + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Grid_Line"), panel); + } + + protected void initGridLineComponents() { Component[][] upComponent = new Component[][]{ new Component[]{null, null}, - new Component[]{null, horizontalGridLine} + new Component[]{null, horizontalColorBox} }; horizontalColorPane = TableLayout4VanChartHelper.createGapTableLayoutPane(upComponent); Component[][] downComponent = new Component[][]{ new Component[]{null, null}, - new Component[]{null, verticalGridLine} + new Component[]{null, verticalColorBox} }; verticalColorPane = TableLayout4VanChartHelper.createGapTableLayoutPane(downComponent); horizonLineType.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - if (horizontalGridLine == null || horizonLineType == null) { + if (horizontalColorBox == null || horizonLineType == null) { return; } horizontalColorPane.setVisible(horizonLineType.getSelectedItem() != LineType.NONE); @@ -103,7 +112,7 @@ public class VanChartAxisAreaPane extends BasicBeanPane { verticalLineType.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - if (verticalGridLine == null || verticalLineType == null) { + if (verticalColorBox == null || verticalLineType == null) { return; } verticalColorPane.setVisible(verticalLineType.getSelectedItem() != LineType.NONE); @@ -111,22 +120,20 @@ public class VanChartAxisAreaPane extends BasicBeanPane { }); checkColorBoxVisible(); + } - JPanel horizonLineTypePane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal"), horizonLineType); - JPanel horizontal = new JPanel(new BorderLayout()); - horizontal.add(horizonLineTypePane, BorderLayout.NORTH); - horizontal.add(horizontalColorPane, BorderLayout.CENTER); + protected JPanel createSingleGridLinePane(String title, boolean isHorizontal) { + LineTypeComboBox lineTypeComboBox = isHorizontal ? horizonLineType : verticalLineType; + JPanel colorSelectPane = isHorizontal ? horizontalColorPane : verticalColorPane; - JPanel verticalLineTypePane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Direction_Vertical"), verticalLineType); - JPanel vertical = new JPanel(new BorderLayout()); - vertical.add(verticalLineTypePane, BorderLayout.NORTH); - vertical.add(verticalColorPane, BorderLayout.CENTER); + JPanel lineTypePane = TableLayout4VanChartHelper.createGapTableLayoutPane(title, lineTypeComboBox); - JPanel panel = new JPanel(new BorderLayout(0, 4)); - panel.add(horizontal, BorderLayout.NORTH); - panel.add(vertical, BorderLayout.CENTER); + JPanel horizontalGridLinePane = new JPanel(new BorderLayout()); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Grid_Line"), panel); + horizontalGridLinePane.add(lineTypePane, BorderLayout.NORTH); + horizontalGridLinePane.add(colorSelectPane, BorderLayout.CENTER); + + return horizontalGridLinePane; } protected JPanel createAlertLinePane() { @@ -213,12 +220,12 @@ public class VanChartAxisAreaPane extends BasicBeanPane { VanChartAxis defaultYAxis = rectanglePlot.getDefaultYAxis(); if (defaultXAxis != null) { - verticalGridLine.setSelectObject(defaultXAxis.getMainGridColor()); + verticalColorBox.setSelectObject(defaultXAxis.getMainGridColor()); verticalLineType.setSelectedItem(defaultXAxis.getGridLineType()); } if (defaultYAxis != null) { - horizontalGridLine.setSelectObject(defaultYAxis.getMainGridColor()); + horizontalColorBox.setSelectObject(defaultYAxis.getMainGridColor()); horizonLineType.setSelectedItem(defaultYAxis.getGridLineType()); } } @@ -246,12 +253,12 @@ public class VanChartAxisAreaPane extends BasicBeanPane { VanChartAxis defaultYAxis = rectanglePlot.getDefaultYAxis(); if (defaultXAxis != null) { - defaultXAxis.setMainGridColor(verticalGridLine.getSelectObject()); + defaultXAxis.setMainGridColor(verticalColorBox.getSelectObject()); defaultXAxis.setGridLineType((LineType) verticalLineType.getSelectedItem()); } if (defaultYAxis != null) { - defaultYAxis.setMainGridColor(horizontalGridLine.getSelectObject()); + defaultYAxis.setMainGridColor(horizontalColorBox.getSelectObject()); defaultYAxis.setGridLineType((LineType) horizonLineType.getSelectedItem()); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/radar/VanChartRadarAxisAreaPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/radar/VanChartRadarAxisAreaPane.java index 687516c35..790b6e93f 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/radar/VanChartRadarAxisAreaPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/radar/VanChartRadarAxisAreaPane.java @@ -3,15 +3,14 @@ package com.fr.van.chart.designer.style.background.radar; import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.i18n.Toolkit; -import com.fr.design.layout.TableLayout; import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.designer.style.background.AlertLineListControlPane; import com.fr.van.chart.designer.style.background.BackgroundListControlPane; import com.fr.van.chart.designer.style.background.VanChartAxisAreaPane; import javax.swing.JPanel; +import java.awt.BorderLayout; import java.awt.Component; -import java.util.Arrays; /** * 样式-背景-绘图区背景-雷达图只有Y轴的配置（间隔背景、网格线、警戒线） @@ -23,24 +22,18 @@ public class VanChartRadarAxisAreaPane extends VanChartAxisAreaPane { //雷达图只有横向的y轴的网格线配置 @Override protected JPanel createGridLinePane() { + initGridLineComponents(); + + JPanel panel = new JPanel(new BorderLayout(0, 4)); + + panel.add(createSingleGridLinePane(Toolkit.i18nText("Fine-Design_Chart_Grid_Line"), true), BorderLayout.CENTER); - Component[][] components = new Component[][]{ - new Component[]{null,null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")),horizontalGridLine}, - }; - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; - double[] row = new double[components.length]; - Arrays.fill(row, p); - double[] col = {f, e}; - JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Grid_Line"), panel); } protected Component[][] getIntervalPaneComponents() { return new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")),horizontalColorBackground}, + new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Color")), horizontalColorBackground}, }; }