From 2d0cab363e9fd03d681b20f530d2cc9a159c0e12 Mon Sep 17 00:00:00 2001 From: mengao <283296419@qq.com> Date: Tue, 29 Aug 2017 09:01:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?9.0=E6=96=B0=E5=9B=BE=E8=A1=A8=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9=E3=80=82=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A1=E5=BD=A2=E5=9B=BE=E3=80=81=E6=8A=98?= =?UTF-8?q?=E7=BA=BF=E5=9B=BE=E3=80=81=E9=9B=B7=E8=BE=BE=E5=9B=BE=E3=80=81?= =?UTF-8?q?=E6=A1=86=E6=9E=B6=E5=9B=BE=E7=AD=89=E5=9B=BE=E8=A1=A8=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=95=8C=E9=9D=A2bug=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/gui/style/FormatPane.java | 5 ++- .../fr/design/chart/axis/MinMaxValuePane.java | 4 +- ...goryPlotMoreCateReportDataContentPane.java | 3 +- ...egoryPlotMoreCateTableDataContentPane.java | 11 +++-- .../chart/area/VanChartAreaSeriesPane.java | 6 +++ .../background/VanChartBackgroundPane.java | 11 +++-- .../VanChartMarkerBackgroundPane.java | 10 ++--- .../component/format/DataSheetFormatPane.java | 40 +++++++++++++++++++ .../component/format/VanChartFormatPane.java | 34 ++++++---------- .../VanChartFormatPaneWithCheckBox.java | 2 +- .../style/axis/VanChartBaseAxisPane.java | 3 +- .../style/axis/VanChartTimeAxisPane.java | 20 +++++----- .../style/axis/VanChartValueAxisPane.java | 5 +-- .../component/VanChartMinMaxValuePane.java | 17 ++++---- .../axis/radar/VanChartRadarYAxisPane.java | 5 ++- .../background/AlertLineListControlPane.java | 11 ++++- .../background/BackgroundListControlPane.java | 9 +++++ .../background/VanChartAxisAreaPane.java | 7 ++-- .../radar/VanChartRadarAxisAreaPane.java | 1 + .../datasheet/VanChartDataSheetPane.java | 4 +- .../style/series/VanChartEffectPane.java | 2 +- .../VanChartDrillMapInteractivePane.java | 27 +++++++------ .../chart/map/VanChartMapSeriesPane.java | 11 ++--- .../VanPointMapPlotReportDataContentPane.java | 2 +- .../VanPointMapPlotTableDataContentPane.java | 2 +- .../chart/map/line/VanChartCurvePane.java | 10 +++-- .../component/LegendLabelFormatPane.java | 3 +- .../style/StructureNodeStylePane.java | 9 +++-- .../style/VanChartStructureSeriesPane.java | 3 +- 29 files changed, 170 insertions(+), 107 deletions(-) create mode 100644 designer_chart/src/com/fr/plugin/chart/designer/component/format/DataSheetFormatPane.java diff --git a/designer_base/src/com/fr/design/gui/style/FormatPane.java b/designer_base/src/com/fr/design/gui/style/FormatPane.java index 58efc7f1ee..5dc9d347ab 100644 --- a/designer_base/src/com/fr/design/gui/style/FormatPane.java +++ b/designer_base/src/com/fr/design/gui/style/FormatPane.java @@ -12,7 +12,6 @@ import com.fr.design.constants.UIConstants; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBoxRenderer; import com.fr.design.gui.ilable.UILabel; -import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.general.ComparatorUtils; @@ -70,6 +69,10 @@ public class FormatPane extends AbstractBasicStylePane { this.initComponents(TYPES); } + public UIComboBox getTypeComboBox() { + return typeComboBox; + } + protected void initComponents(Integer[] types) { this.setLayout(new BorderLayout(0, 4)); iniSampleLable(); diff --git a/designer_chart/src/com/fr/design/chart/axis/MinMaxValuePane.java b/designer_chart/src/com/fr/design/chart/axis/MinMaxValuePane.java index 0d78f84ffc..5f73635d82 100644 --- a/designer_chart/src/com/fr/design/chart/axis/MinMaxValuePane.java +++ b/designer_chart/src/com/fr/design/chart/axis/MinMaxValuePane.java @@ -35,9 +35,9 @@ public class MinMaxValuePane extends JPanel { minValueField = new UITextField(6); maxCheckBox = new UICheckBox(Inter.getLocText(new String[]{"Custom", "Max_Value"})); maxValueField = new UITextField(6); - isCustomMainUnitBox = new UICheckBox(Inter.getLocText("FR-Chart_MainGraduationUnit")); + isCustomMainUnitBox = new UICheckBox(Inter.getLocText(new String[]{"Custom", "FR-Chart_MainGraduationUnit"})); mainUnitField = new UITextField(6); - isCustomSecUnitBox = new UICheckBox(Inter.getLocText("FR-Chart_SecondGraduationUnit")); + isCustomSecUnitBox = new UICheckBox(Inter.getLocText(new String[]{"Custom", "FR-Chart_SecondGraduationUnit"})); secUnitField = new UITextField(6); double p = TableLayout.PREFERRED; diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotMoreCateReportDataContentPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotMoreCateReportDataContentPane.java index 93dd33290c..7adfd599f7 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotMoreCateReportDataContentPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotMoreCateReportDataContentPane.java @@ -61,7 +61,6 @@ public class CategoryPlotMoreCateReportDataContentPane extends CategoryPlotRepor catePane.add(boxPane, BorderLayout.SOUTH); - catePane.setPreferredSize(new Dimension(246,30)); catePane.setBorder(BorderFactory.createEmptyBorder(0,24,10,15)); this.add(catePane, "0,0,2,0"); @@ -90,7 +89,7 @@ public class CategoryPlotMoreCateReportDataContentPane extends CategoryPlotRepor private TinyFormulaPane addNewCatePane() { final TinyFormulaPane pane = initCategoryBox(StringUtils.EMPTY); - pane.setPreferredSize(new Dimension(122, 16)); + pane.setPreferredSize(new Dimension(106, 16)); pane.registerChangeListener(uiobListener); diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotMoreCateTableDataContentPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotMoreCateTableDataContentPane.java index 937a03662a..b656a549b6 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotMoreCateTableDataContentPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotMoreCateTableDataContentPane.java @@ -32,7 +32,7 @@ import java.util.List; public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableDataContentPane implements UIObserver{ private static final long serialVersionUID = -3305681053750642843L; private static final int COMBOX_GAP = 8; - private static final int COMBOX_WIDTH = 100; + private static final int COMBOX_WIDTH = 95; private static final int COMBOX_HEIGHT = 20; private JPanel boxPane; @@ -48,18 +48,17 @@ public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableD public CategoryPlotMoreCateTableDataContentPane(ChartDataPane parent) { categoryCombox = new UIComboBox(); - categoryCombox.setPreferredSize(new Dimension(120,20)); + categoryCombox.setPreferredSize(new Dimension(COMBOX_WIDTH,COMBOX_HEIGHT)); JPanel categoryPane = new JPanel(new BorderLayout(4,0)); categoryPane.setBorder(BorderFactory.createMatteBorder(0, 0, 6, 1, getBackground())); UILabel categoryLabel = new BoldFontTextLabel(Inter.getLocText("FR-Chart-Category_Name")) ; - categoryLabel.setPreferredSize(new Dimension(85,20)); + categoryLabel.setPreferredSize(new Dimension(85,COMBOX_HEIGHT)); addButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); - addButton.setPreferredSize(new Dimension(20, 20)); + addButton.setPreferredSize(new Dimension(20, COMBOX_HEIGHT)); categoryPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{categoryCombox, addButton,null,categoryLabel,null})); - categoryPane.setPreferredSize(new Dimension(246,30)); categoryPane.setBorder(BorderFactory.createEmptyBorder(0,24,10,15)); @@ -70,7 +69,7 @@ public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableD this.setLayout(new BorderLayout()); this.add(categoryPane, BorderLayout.NORTH); - this.add(new JSeparator()); + this.add(getJSeparator()); seriesTypeComboxPane = new SeriesTypeUseComboxPane(parent, new Bar2DPlot()); this.add(seriesTypeComboxPane, BorderLayout.SOUTH); diff --git a/designer_chart/src/com/fr/plugin/chart/area/VanChartAreaSeriesPane.java b/designer_chart/src/com/fr/plugin/chart/area/VanChartAreaSeriesPane.java index bbb30b8888..3caa85b4e8 100644 --- a/designer_chart/src/com/fr/plugin/chart/area/VanChartAreaSeriesPane.java +++ b/designer_chart/src/com/fr/plugin/chart/area/VanChartAreaSeriesPane.java @@ -40,6 +40,12 @@ public class VanChartAreaSeriesPane extends VanChartLineSeriesPane{ return contentPane; } + //设置色彩面板内容 + protected void setColorPaneContent (JPanel panel) { + panel.add(getFillStylePane(), BorderLayout.NORTH); + panel.add(createStylePane(), BorderLayout.CENTER); + } + protected Class getStackAndAxisPaneClass() { return VanChartCustomStackAndAxisConditionPane.class; } diff --git a/designer_chart/src/com/fr/plugin/chart/designer/component/background/VanChartBackgroundPane.java b/designer_chart/src/com/fr/plugin/chart/designer/component/background/VanChartBackgroundPane.java index 4f60739ef7..a1526b6a40 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/component/background/VanChartBackgroundPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/component/background/VanChartBackgroundPane.java @@ -43,16 +43,19 @@ public class VanChartBackgroundPane extends BasicPane { public VanChartBackgroundPane() { initComponents(); + JPanel panel = initContentPanel(); + this.setLayout(new BorderLayout()); + this.add(panel, BorderLayout.CENTER); + } + protected JPanel initContentPanel() { double p = TableLayout.PREFERRED; double f = TableLayout.FILL; double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; double[] columnSize = {f, e}; - double[] rowSize = { p,p,p,p,p,p}; - JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(getPaneComponents(), rowSize, columnSize); - this.setLayout(new BorderLayout()); - this.add(panel,BorderLayout.CENTER); + double[] rowSize = {p, p, p, p, p}; + return TableLayout4VanChartHelper.createGapTableLayoutPane(getPaneComponents(), rowSize, columnSize); } protected void initComponents() { diff --git a/designer_chart/src/com/fr/plugin/chart/designer/component/background/VanChartMarkerBackgroundPane.java b/designer_chart/src/com/fr/plugin/chart/designer/component/background/VanChartMarkerBackgroundPane.java index 0b1a5fcead..300d9d8f5d 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/component/background/VanChartMarkerBackgroundPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/component/background/VanChartMarkerBackgroundPane.java @@ -19,19 +19,15 @@ import java.awt.*; public class VanChartMarkerBackgroundPane extends VanChartBackgroundPane { private static final long serialVersionUID = -1032221277140976934L; - public VanChartMarkerBackgroundPane(){ - initComponents(); - + protected JPanel initContentPanel() { double p = TableLayout.PREFERRED; double f = TableLayout.FILL; double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; double[] columnSize = {f, e}; - double[] rowSize = {p, p}; + double[] rowSize = {p, p, p}; - JPanel panel = TableLayoutHelper.createTableLayoutPane(getPaneComponents(), rowSize, columnSize); - this.setLayout(new BorderLayout()); - this.add(panel,BorderLayout.CENTER); + return TableLayoutHelper.createTableLayoutPane(getPaneComponents(), rowSize, columnSize); } protected Component[][] getPaneComponents() { diff --git a/designer_chart/src/com/fr/plugin/chart/designer/component/format/DataSheetFormatPane.java b/designer_chart/src/com/fr/plugin/chart/designer/component/format/DataSheetFormatPane.java new file mode 100644 index 0000000000..8cdf810db8 --- /dev/null +++ b/designer_chart/src/com/fr/plugin/chart/designer/component/format/DataSheetFormatPane.java @@ -0,0 +1,40 @@ +package com.fr.plugin.chart.designer.component.format; + +import com.fr.design.gui.icombobox.UIComboBox; +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.gui.style.FormatPane; +import com.fr.design.layout.TableLayout; +import com.fr.general.Inter; +import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; + +import javax.swing.*; +import java.awt.*; + +/** + * Created by mengao on 2017/8/14. + */ +public class DataSheetFormatPane extends FormatPane { + protected Component[][] getComponent(JPanel fontPane, JPanel centerPane, JPanel typePane) { + return new Component[][]{ + new Component[]{null, centerPane}, + }; + } + + protected void setTypeComboBoxPane(UIComboBox typeComboBox) { + double f = TableLayout.FILL; + double p = TableLayout.PREFERRED; + double[] rowSize = {p, p}; + double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; + double[] columnSize = {f, e}; + JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(getTypeComboBoxComponent(typeComboBox), rowSize, columnSize); + this.add(panel, BorderLayout.NORTH); + } + + protected Component[][] getTypeComboBoxComponent (UIComboBox typeComboBox) { + return new Component[][]{ + new Component[]{null, null}, + new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_DataType"), SwingConstants.LEFT), typeComboBox}, + + }; + } +} diff --git a/designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPane.java b/designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPane.java index e4d256b811..ea9a1deef9 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPane.java @@ -1,40 +1,32 @@ package com.fr.plugin.chart.designer.component.format; -import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.style.FormatPane; -import com.fr.design.layout.TableLayout; import com.fr.general.Inter; -import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; import javax.swing.*; import java.awt.*; /** - * Created by mengao on 2017/8/14. + * Created by mengao on 2017/8/28. */ public class VanChartFormatPane extends FormatPane { - protected Component[][] getComponent(JPanel fontPane, JPanel centerPane, JPanel typePane) { - return new Component[][]{ - new Component[]{null, centerPane}, - }; - } + private static final int HEIGHT = 30; - protected void setTypeComboBoxPane(UIComboBox typeComboBox) { - double f = TableLayout.FILL; - double p = TableLayout.PREFERRED; - double[] rowSize = {p, p}; - double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; - double[] columnSize = {f, e}; - JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(getTypeComboBoxComponent(typeComboBox), rowSize, columnSize); - this.add(panel, BorderLayout.NORTH); - } - protected Component[][] getTypeComboBoxComponent (UIComboBox typeComboBox) { + protected Component[][] getComponent (JPanel fontPane, JPanel centerPane, JPanel typePane) { return new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_DataType"), SwingConstants.LEFT), typeComboBox}, - + new Component[]{new UILabel(Inter.getLocText("FR-Base_Format"), SwingConstants.LEFT), typePane}, + new Component[]{centerPane, null}, }; } + + public Dimension getPreferredSize() { + //todo @mango + if (getTypeComboBox().getSelectedIndex() == 0) { + return new Dimension((int)getTypeComboBox().getPreferredSize().getWidth(), HEIGHT); + } + return super.getPreferredSize(); + } } diff --git a/designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java b/designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java index c91bb4495c..feba874e96 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java @@ -114,7 +114,7 @@ public abstract class VanChartFormatPaneWithCheckBox extends JPanel{ } protected FormatPane createFormatPane() { - return new FormatPane(); + return new VanChartFormatPane(); } public boolean isDirty() { diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartBaseAxisPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartBaseAxisPane.java index a03915c4c3..b6001487be 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartBaseAxisPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartBaseAxisPane.java @@ -126,8 +126,8 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { Component[][] components = new Component[][]{ new Component[]{null,null}, new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Content")),titleContent}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Position")),titleAlignPane}, new Component[]{null,titleUseHtml}, + new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Position")),titleAlignPane}, new Component[]{titleTextAttrPane,null}, new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_TextRotation")),titleTextRotation}, }; @@ -306,6 +306,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { protected FormatPane createFormatPane(){ return new FormatPane(){ protected Component[][] getComponent (JPanel fontPane, JPanel centerPane, JPanel typePane) { + typePane.setBorder(BorderFactory.createEmptyBorder()); return new Component[][]{ new Component[]{typePane,null}, new Component[]{centerPane, null}, diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartTimeAxisPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartTimeAxisPane.java index b31207568c..ed85071a6d 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartTimeAxisPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartTimeAxisPane.java @@ -144,11 +144,13 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane { double p = TableLayout.PREFERRED; double f = TableLayout.FILL; double[] rowSize = {p, p, p, p}; - double[] columnSize = {f, p, p}; + double[] columnSize = {f}; JPanel mainTickPane = new JPanel(); mainTickPane.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0)); + mainUnitField.setPreferredSize(new Dimension(100,20)); + secondUnitField.setPreferredSize(new Dimension(100,20)); mainTickPane.add(mainUnitField); mainTickPane.add(mainType); @@ -157,15 +159,15 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane { secTickPane.add(secondUnitField); secTickPane.add(secondType); - minPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("FR-Chart-Data_Min"),minValueField); - maxPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("FR-Chart-Data_Max"),maxValueField); - mainPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_MainType"),mainTickPane); - secPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_SecType"),secTickPane); + minPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("FR-Chart-Data_Min"),minValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); + maxPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("FR-Chart-Data_Max"),maxValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); + mainPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_MainType"),mainTickPane, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); + secPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_SecType"),secTickPane, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); - minPane.setBorder(BorderFactory.createEmptyBorder(0,25,0,15)); - maxPane.setBorder(BorderFactory.createEmptyBorder(0,25,0,15)); - mainPane.setBorder(BorderFactory.createEmptyBorder(0,25,0,15)); - secPane.setBorder(BorderFactory.createEmptyBorder(0,25,0,15)); + minPane.setBorder(BorderFactory.createEmptyBorder(0,TableLayout4VanChartHelper.COMPONENT_INTERVAL,0,0)); + maxPane.setBorder(BorderFactory.createEmptyBorder(0,TableLayout4VanChartHelper.COMPONENT_INTERVAL,0,0)); + mainPane.setBorder(BorderFactory.createEmptyBorder(0,TableLayout4VanChartHelper.COMPONENT_INTERVAL,0,0)); + secPane.setBorder(BorderFactory.createEmptyBorder(0,TableLayout4VanChartHelper.COMPONENT_INTERVAL,0,0)); JPanel minPaneWithCheckBox = new JPanel(new BorderLayout()); JPanel maxPaneWithCheckBox = new JPanel(new BorderLayout()); diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartValueAxisPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartValueAxisPane.java index 9372f28fd0..6eb199983d 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartValueAxisPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartValueAxisPane.java @@ -66,7 +66,6 @@ public class VanChartValueAxisPane extends VanChartBaseAxisPane { logBox = new UICheckBox(Inter.getLocText(new String[]{"Custom", "Plugin-ChartF_LogBaseValue"})); logBaseField = new UITextField(); - logBaseField.setPreferredSize(new Dimension(55, 20)); logBox.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { logBaseField.setEnabled(logBox.isSelected()); @@ -79,9 +78,9 @@ public class VanChartValueAxisPane extends VanChartBaseAxisPane { // logPane.add(logBaseField); - logPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_LogBaseValue"), logBaseField); + logPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_LogBaseValue"), logBaseField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); - logPane.setBorder(BorderFactory.createEmptyBorder(0, 25, 0, 15)); + logPane.setBorder(BorderFactory.createEmptyBorder(0, TableLayout4VanChartHelper.COMPONENT_INTERVAL, 0, 0)); JPanel logPaneWithCheckBox = new JPanel(new BorderLayout()); diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/component/VanChartMinMaxValuePane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/component/VanChartMinMaxValuePane.java index 212692a8a3..b183e31529 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/component/VanChartMinMaxValuePane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/component/VanChartMinMaxValuePane.java @@ -14,6 +14,7 @@ import java.awt.event.ActionListener; * Created by mengao on 2017/4/4. */ public class VanChartMinMaxValuePane extends MinMaxValuePane { + public static final int COMPONENT_INTERVAL =12; private JPanel minPane; private JPanel maxPane; @@ -57,15 +58,15 @@ public class VanChartMinMaxValuePane extends MinMaxValuePane { @Override protected Component[][] getPanelComponents() { - minPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("FR-Chart-Data_Min"),minValueField); - maxPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("FR-Chart-Data_Max"),maxValueField); - mainPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_MainType"),mainUnitField); - secPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_SecType"),secUnitField); + minPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("FR-Chart-Data_Min"),minValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); + maxPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("FR-Chart-Data_Max"),maxValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); + mainPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_MainType"),mainUnitField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); + secPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_SecType"),secUnitField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); - minPane.setBorder(BorderFactory.createEmptyBorder(0,25,0,15)); - maxPane.setBorder(BorderFactory.createEmptyBorder(0,25,0,15)); - mainPane.setBorder(BorderFactory.createEmptyBorder(0,25,0,15)); - secPane.setBorder(BorderFactory.createEmptyBorder(0,25,0,15)); + minPane.setBorder(BorderFactory.createEmptyBorder(0,COMPONENT_INTERVAL,0,0)); + maxPane.setBorder(BorderFactory.createEmptyBorder(0,COMPONENT_INTERVAL,0,0)); + mainPane.setBorder(BorderFactory.createEmptyBorder(0,COMPONENT_INTERVAL,0,0)); + secPane.setBorder(BorderFactory.createEmptyBorder(0,COMPONENT_INTERVAL,0,0)); JPanel minPaneWithCheckBox = new JPanel(new BorderLayout()); JPanel maxPaneWithCheckBox = new JPanel(new BorderLayout()); diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/radar/VanChartRadarYAxisPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/radar/VanChartRadarYAxisPane.java index 96b30a4b41..e722402be8 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/radar/VanChartRadarYAxisPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/radar/VanChartRadarYAxisPane.java @@ -46,7 +46,8 @@ public class VanChartRadarYAxisPane extends VanChartValueAxisPane { protected JPanel createMinMaxValuePane(double[] row, double[] col) { double p = TableLayout.PREFERRED; double f = TableLayout.FILL; - double[] columnSize = {p, f}; + double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; + double[] columnSize = {f, e}; valueStyle = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_UnifiedComputing"), Inter.getLocText("Plugin-ChartF_RespectivelySpecified")}); @@ -69,7 +70,7 @@ public class VanChartRadarYAxisPane extends VanChartValueAxisPane { }); JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_ValueDefinition"), contentPane); - contentPane.setBorder(BorderFactory.createEmptyBorder(10,10,0,15)); + contentPane.setBorder(BorderFactory.createEmptyBorder(10,5,0,0)); return panel; } diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/background/AlertLineListControlPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/background/AlertLineListControlPane.java index f79ac7f0ad..cbea242c08 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/background/AlertLineListControlPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/background/AlertLineListControlPane.java @@ -2,6 +2,7 @@ package com.fr.plugin.chart.designer.style.background; import com.fr.chart.chartattr.Plot; import com.fr.design.gui.controlpane.NameableCreator; +import com.fr.design.gui.controlpane.ShortCut4JControlPane; import com.fr.design.gui.controlpane.UIListControlPane; import com.fr.design.mainframe.DesignerContext; import com.fr.general.ComparatorUtils; @@ -44,7 +45,15 @@ public class AlertLineListControlPane extends UIListControlPane { } protected String getAddItemText() { - return Inter.getLocText("Plugin-ChartF_AlertLine"); + return Inter.getLocText(new String[]{"Plugin-Chart_Add_Line","Plugin-ChartF_AlertLine"}); + } + + protected ShortCut4JControlPane[] createShortcuts() { + return new ShortCut4JControlPane[]{ + moveUpItemShortCut(), + moveDownItemShortCut(), + removeItemShortCut() + }; } public void populate(Plot plot) { diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/background/BackgroundListControlPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/background/BackgroundListControlPane.java index 5d502e08bb..ca4ef4f2b4 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/background/BackgroundListControlPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/background/BackgroundListControlPane.java @@ -2,6 +2,7 @@ package com.fr.plugin.chart.designer.style.background; import com.fr.chart.chartattr.Plot; import com.fr.design.gui.controlpane.NameableCreator; +import com.fr.design.gui.controlpane.ShortCut4JControlPane; import com.fr.design.gui.controlpane.UIListControlPane; import com.fr.design.mainframe.DesignerContext; import com.fr.general.ComparatorUtils; @@ -48,6 +49,14 @@ public class BackgroundListControlPane extends UIListControlPane { return Inter.getLocText("Plugin-ChartF_CustomIntervalBackground"); } + protected ShortCut4JControlPane[] createShortcuts() { + return new ShortCut4JControlPane[]{ + moveUpItemShortCut(), + moveDownItemShortCut(), + removeItemShortCut() + }; + } + public void populate(Plot plot) { this.plot = plot; VanChartRectanglePlot rectanglePlot = (VanChartRectanglePlot) plot; diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/background/VanChartAxisAreaPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/background/VanChartAxisAreaPane.java index 5b91538a73..8d91af94d8 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/background/VanChartAxisAreaPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/background/VanChartAxisAreaPane.java @@ -76,7 +76,7 @@ public class VanChartAxisAreaPane extends BasicBeanPane { protected JPanel createAlertLinePane() { alertLine = new AlertLineListControlPane(); JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_AlertLine"), alertLine); - alertLine.setBorder(BorderFactory.createEmptyBorder(10, 10, 0, 15)); + alertLine.setBorder(BorderFactory.createEmptyBorder(10, 5, 0, 0)); return panel; } @@ -99,10 +99,11 @@ public class VanChartAxisAreaPane extends BasicBeanPane { } }); JPanel intervalPane = new JPanel(new BorderLayout(0, 6)); - intervalPane.add(isDefaultIntervalBackground, BorderLayout.NORTH); + JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Chart_Interval_Back"), isDefaultIntervalBackground); + intervalPane.add(panel1, BorderLayout.NORTH); intervalPane.add(centerPane, BorderLayout.CENTER); JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_IntervalBackground"), intervalPane); - intervalPane.setBorder(BorderFactory.createEmptyBorder(10, 10, 0, 15)); + intervalPane.setBorder(BorderFactory.createEmptyBorder(10, 5, 0, 0)); return panel; } diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/background/radar/VanChartRadarAxisAreaPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/background/radar/VanChartRadarAxisAreaPane.java index d9b13ff510..bea1c91843 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/background/radar/VanChartRadarAxisAreaPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/background/radar/VanChartRadarAxisAreaPane.java @@ -19,6 +19,7 @@ public class VanChartRadarAxisAreaPane extends VanChartAxisAreaPane { //雷达图只有横向的y轴的网格线配置 protected Component[][] getGridLinePaneComponents() { return new Component[][]{ + new Component[]{null,null}, new Component[]{new UILabel(Inter.getLocText("FR-Chart-Color_Color")),horizontalGridLine}, }; } diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/datasheet/VanChartDataSheetPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/datasheet/VanChartDataSheetPane.java index 94ee1871c4..d4869e6362 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/datasheet/VanChartDataSheetPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/datasheet/VanChartDataSheetPane.java @@ -20,7 +20,7 @@ import com.fr.plugin.chart.base.VanChartConstants; import com.fr.plugin.chart.designer.AbstractVanChartScrollPane; import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; import com.fr.plugin.chart.designer.component.border.VanChartBorderPane; -import com.fr.plugin.chart.designer.component.format.VanChartFormatPane; +import com.fr.plugin.chart.designer.component.format.DataSheetFormatPane; import com.fr.plugin.chart.type.AxisType; import javax.swing.*; @@ -85,7 +85,7 @@ public class VanChartDataSheetPane extends AbstractVanChartScrollPane { private JPanel createDataSheetPane(){ textAttrPane = new ChartTextAttrPane(); - formatPane = new VanChartFormatPane(); + formatPane = new DataSheetFormatPane(); formatPane.setForDataSheet(); borderPane = new VanChartBorderPane(); diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/series/VanChartEffectPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/series/VanChartEffectPane.java index e5605c1e9c..f849d13ac8 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/series/VanChartEffectPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/series/VanChartEffectPane.java @@ -57,7 +57,7 @@ public class VanChartEffectPane extends BasicBeanPane { periodPane.setLayout(new BorderLayout(5, 0)); periodPane.add(new UILabel(Inter.getLocText("Plugin-ChartF_Flash_Period")), BorderLayout.WEST); periodPane.add(period, BorderLayout.CENTER); - periodPane.add(new UILabel("s"), BorderLayout.EAST); + periodPane.add(new UILabel(Inter.getLocText("FR-Base-Time_Second")), BorderLayout.EAST); return periodPane; } diff --git a/designer_chart/src/com/fr/plugin/chart/drillmap/designer/other/VanChartDrillMapInteractivePane.java b/designer_chart/src/com/fr/plugin/chart/drillmap/designer/other/VanChartDrillMapInteractivePane.java index f5c214e9b4..83de6eeac9 100644 --- a/designer_chart/src/com/fr/plugin/chart/drillmap/designer/other/VanChartDrillMapInteractivePane.java +++ b/designer_chart/src/com/fr/plugin/chart/drillmap/designer/other/VanChartDrillMapInteractivePane.java @@ -6,7 +6,6 @@ import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane; -import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.Inter; import com.fr.plugin.chart.attr.plot.VanChartPlot; import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; @@ -28,6 +27,7 @@ public class VanChartDrillMapInteractivePane extends VanChartInteractivePaneWith private VanChartBackgroundPaneWithOutImageAndShadow backgroundPane; private VanChartBackgroundPaneWithOutImageAndShadow selectBackgroundPane; private VanChartCatalogHyperLinkPane catalogSuperLink; + private JPanel drillPane; @Override protected JPanel getInteractivePane(VanChartPlot plot){ @@ -52,9 +52,8 @@ public class VanChartDrillMapInteractivePane extends VanChartInteractivePaneWith textAttrPane = new ChartTextAttrPane(){ protected Component[][] getComponents(JPanel buttonPane) { return new Component[][]{ - new Component[]{null}, - new Component[]{fontNameComboBox}, - new Component[]{buttonPane} + new Component[]{fontNameComboBox, null}, + new Component[]{buttonPane, null} }; } }; @@ -67,14 +66,17 @@ public class VanChartDrillMapInteractivePane extends VanChartInteractivePaneWith double[] columnSize = {f}; double[] rowSize = {p,p,p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{null,null}, - new Component[]{openOrClose}, + new Component[]{null}, new Component[]{createTitlePane(Inter.getLocText("Plugin-Chart_Character"), textAttrPane)}, new Component[]{createTitlePane(Inter.getLocText("Plugin-ChartF_Background"), backgroundPane)}, new Component[]{createTitlePane(Inter.getLocText("Plugin-ChartF_Select_Color"), selectBackgroundPane)}, - new Component[]{createTitlePane(Inter.getLocText("M_Insert-Hyperlink"), catalogSuperLink)} + new Component[]{catalogSuperLink} }; - JPanel drillPane = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); + drillPane = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); + + JPanel panel = new JPanel(new BorderLayout()); + panel.add(openOrClose, BorderLayout.NORTH); + panel.add(drillPane, BorderLayout.CENTER); openOrClose.addChangeListener(new ChangeListener() { @Override @@ -83,7 +85,9 @@ public class VanChartDrillMapInteractivePane extends VanChartInteractivePaneWith } }); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Drill_Dir"), drillPane); + JPanel panel1 = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Drill_Dir"), panel); + panel.setBorder(BorderFactory.createEmptyBorder(10,5,0,0)); + return panel1; } private JPanel createTitlePane(String title, Component component) { @@ -91,10 +95,7 @@ public class VanChartDrillMapInteractivePane extends VanChartInteractivePaneWith } private void checkEnable() { - boolean enable = openOrClose.getSelectedIndex() == 0; - textAttrPane.setEnabled(enable); - GUICoreUtils.setEnabled(backgroundPane, enable); - GUICoreUtils.setEnabled(selectBackgroundPane, enable); + drillPane.setVisible(openOrClose.getSelectedIndex() == 0); } @Override diff --git a/designer_chart/src/com/fr/plugin/chart/map/VanChartMapSeriesPane.java b/designer_chart/src/com/fr/plugin/chart/map/VanChartMapSeriesPane.java index 079ad9d1a3..38e9eb39ad 100644 --- a/designer_chart/src/com/fr/plugin/chart/map/VanChartMapSeriesPane.java +++ b/designer_chart/src/com/fr/plugin/chart/map/VanChartMapSeriesPane.java @@ -6,7 +6,6 @@ import com.fr.chart.chartglyph.ConditionAttr; import com.fr.design.gui.frpane.UINumberDragPane; import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.icombobox.UIComboBox; -import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; @@ -162,8 +161,10 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane { case AREA: panel.add(createNullValueColorPane(), BorderLayout.CENTER); panel.add(createAlphaPane(), BorderLayout.SOUTH); + break; case POINT: panel.add(createPointAlphaPane(), BorderLayout.CENTER); + break; } } @@ -285,13 +286,7 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane { } }); - JPanel northPane = new JPanel(new BorderLayout()); - northPane.add(markerTypeCom, BorderLayout.CENTER); - UILabel label = new UILabel(Inter.getLocText("Plugin-ChartF_Point_Style"), SwingConstants.LEFT); - label.setPreferredSize(new Dimension(44, 20)); - northPane.add(label, BorderLayout.WEST); - northPane.setBorder(BorderFactory.createEmptyBorder(10,0,0,0)); - + JPanel northPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Point_Style"), markerTypeCom); JPanel markerPane = new JPanel(new BorderLayout(0, 6)); markerPane.add(northPane, BorderLayout.NORTH); markerPane.add(cardPane, BorderLayout.CENTER); diff --git a/designer_chart/src/com/fr/plugin/chart/map/designer/data/contentpane/report/VanPointMapPlotReportDataContentPane.java b/designer_chart/src/com/fr/plugin/chart/map/designer/data/contentpane/report/VanPointMapPlotReportDataContentPane.java index 50b86590c2..fa91c3407d 100644 --- a/designer_chart/src/com/fr/plugin/chart/map/designer/data/contentpane/report/VanPointMapPlotReportDataContentPane.java +++ b/designer_chart/src/com/fr/plugin/chart/map/designer/data/contentpane/report/VanPointMapPlotReportDataContentPane.java @@ -96,7 +96,7 @@ public class VanPointMapPlotReportDataContentPane extends VanAreaMapPlotReportDa double[] rowSize = {p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Geographical_Position")),locationType}, + new Component[]{new UILabel(Inter.getLocText("Plugin-Chart_Geographic")),locationType}, }; JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components,rowSize,columnSize,30,6); diff --git a/designer_chart/src/com/fr/plugin/chart/map/designer/data/contentpane/table/VanPointMapPlotTableDataContentPane.java b/designer_chart/src/com/fr/plugin/chart/map/designer/data/contentpane/table/VanPointMapPlotTableDataContentPane.java index 67bc3dd42b..1feadfdf1c 100644 --- a/designer_chart/src/com/fr/plugin/chart/map/designer/data/contentpane/table/VanPointMapPlotTableDataContentPane.java +++ b/designer_chart/src/com/fr/plugin/chart/map/designer/data/contentpane/table/VanPointMapPlotTableDataContentPane.java @@ -120,7 +120,7 @@ public class VanPointMapPlotTableDataContentPane extends VanAreaMapPlotTableData double[] columnSize = {p, f}; double[] rowSize = {p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Geographical_Position")),locationType}, + new Component[]{new UILabel(Inter.getLocText("Plugin-Chart_Geographic")),locationType}, }; JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components,rowSize,columnSize,30,6); diff --git a/designer_chart/src/com/fr/plugin/chart/map/line/VanChartCurvePane.java b/designer_chart/src/com/fr/plugin/chart/map/line/VanChartCurvePane.java index 358bffe99c..3c200e3160 100644 --- a/designer_chart/src/com/fr/plugin/chart/map/line/VanChartCurvePane.java +++ b/designer_chart/src/com/fr/plugin/chart/map/line/VanChartCurvePane.java @@ -7,6 +7,7 @@ import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.general.Inter; +import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; import com.fr.plugin.chart.map.line.condition.AttrCurve; import javax.swing.*; @@ -33,7 +34,8 @@ public class VanChartCurvePane extends BasicBeanPane{ double p = TableLayout.PREFERRED; double f = TableLayout.FILL; - double[] columnSize = { p, f }; + double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; + double[] columnSize = {f, e}; double[] rowSize = {p, p, p, p}; Component[][] components = getUseComponent(); JPanel panel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); @@ -44,9 +46,9 @@ public class VanChartCurvePane extends BasicBeanPane{ private Component[][] getUseComponent() { return new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Line_Width")+":"), lineWidth}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Bedding")+":"),bending}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Alpha") + ":"), lineAlphaPane} + new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Line_Width")), lineWidth}, + new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Bedding")),bending}, + new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Alpha")), lineAlphaPane} }; } diff --git a/designer_chart/src/com/fr/plugin/chart/range/component/LegendLabelFormatPane.java b/designer_chart/src/com/fr/plugin/chart/range/component/LegendLabelFormatPane.java index a6e292784c..dea47c00d6 100644 --- a/designer_chart/src/com/fr/plugin/chart/range/component/LegendLabelFormatPane.java +++ b/designer_chart/src/com/fr/plugin/chart/range/component/LegendLabelFormatPane.java @@ -8,6 +8,7 @@ import com.fr.design.layout.TableLayout; import com.fr.general.Inter; import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; import com.fr.plugin.chart.designer.component.VanChartHtmlLabelPaneWithOutWidthAndHeight; +import com.fr.plugin.chart.designer.component.format.VanChartFormatPane; import com.fr.plugin.chart.designer.style.VanChartStylePane; import javax.swing.*; @@ -30,7 +31,7 @@ public class LegendLabelFormatPane extends JPanel{ public LegendLabelFormatPane(){ labelFormatStyle = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Common"), Inter.getLocText("Plugin-ChartF_Custom")}); - labelFormat = new FormatPane(); + labelFormat = new VanChartFormatPane(); htmlLabelPane = new VanChartHtmlLabelPaneWithOutWidthAndHeight(); centerPane = new JPanel(new CardLayout()){ diff --git a/designer_chart/src/com/fr/plugin/chart/structure/desinger/style/StructureNodeStylePane.java b/designer_chart/src/com/fr/plugin/chart/structure/desinger/style/StructureNodeStylePane.java index 58a740c40e..332c175bb6 100644 --- a/designer_chart/src/com/fr/plugin/chart/structure/desinger/style/StructureNodeStylePane.java +++ b/designer_chart/src/com/fr/plugin/chart/structure/desinger/style/StructureNodeStylePane.java @@ -36,8 +36,9 @@ public class StructureNodeStylePane extends BasicBeanPane { public StructureNodeStylePane() { double p = TableLayout.PREFERRED; double f = TableLayout.FILL; - double[] columnSize = {p,f}; - double[] rowSize = {p,p,p,p,p}; + double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; + double[] columnSize = {f, e}; + double[] rowSize = {p, p, p, p, p}; nodeRadiusType = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Automatic"), Inter.getLocText("Plugin-ChartF_Custom")}); @@ -48,7 +49,7 @@ public class StructureNodeStylePane extends BasicBeanPane { JPanel jPanel = new JPanel(new BorderLayout()); jPanel.add(TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Node_Radius"), nodeRadiusType), BorderLayout.NORTH); - nodeRadiusPane = TableLayout4VanChartHelper.createGapTableLayoutPane(" ", nodeRadius); + nodeRadiusPane = TableLayout4VanChartHelper.createGapTableLayoutPane("", nodeRadius); jPanel.add(nodeRadiusPane, BorderLayout.CENTER); Component[][] components1 = new Component[][]{ @@ -93,7 +94,7 @@ public class StructureNodeStylePane extends BasicBeanPane { } private void checkRadius() { - nodeRadius.setEnabled(nodeRadiusType.getSelectedIndex() == 1); + nodeRadiusPane.setVisible(nodeRadiusType.getSelectedIndex() == 1); } private void checkImagePane() { diff --git a/designer_chart/src/com/fr/plugin/chart/structure/desinger/style/VanChartStructureSeriesPane.java b/designer_chart/src/com/fr/plugin/chart/structure/desinger/style/VanChartStructureSeriesPane.java index 029599989a..f4f0f2a072 100644 --- a/designer_chart/src/com/fr/plugin/chart/structure/desinger/style/VanChartStructureSeriesPane.java +++ b/designer_chart/src/com/fr/plugin/chart/structure/desinger/style/VanChartStructureSeriesPane.java @@ -77,7 +77,8 @@ public class VanChartStructureSeriesPane extends VanChartAbstractPlotSeriesPane double p = TableLayout.PREFERRED; double f = TableLayout.FILL; - double[] columnSize = {p,f}; + double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; + double[] columnSize = {f, e}; double[] rowSize = {p,p,p,p}; JPanel jPanel = new JPanel(new BorderLayout()); From 334071cc2528efbc70c98cc19d34aa7b749c75a0 Mon Sep 17 00:00:00 2001 From: mengao <283296419@qq.com> Date: Tue, 29 Aug 2017 13:22:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/gui/style/FormatPane.java | 2 +- .../{VanChartFormatPane.java => FormatPaneWithOutFont.java} | 2 +- .../component/format/VanChartFormatPaneWithCheckBox.java | 2 +- .../plugin/chart/range/component/LegendLabelFormatPane.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) rename designer_chart/src/com/fr/plugin/chart/designer/component/format/{VanChartFormatPane.java => FormatPaneWithOutFont.java} (94%) diff --git a/designer_base/src/com/fr/design/gui/style/FormatPane.java b/designer_base/src/com/fr/design/gui/style/FormatPane.java index 5dc9d347ab..0b810b7ae8 100644 --- a/designer_base/src/com/fr/design/gui/style/FormatPane.java +++ b/designer_base/src/com/fr/design/gui/style/FormatPane.java @@ -69,7 +69,7 @@ public class FormatPane extends AbstractBasicStylePane { this.initComponents(TYPES); } - public UIComboBox getTypeComboBox() { + protected UIComboBox getTypeComboBox() { return typeComboBox; } diff --git a/designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPane.java b/designer_chart/src/com/fr/plugin/chart/designer/component/format/FormatPaneWithOutFont.java similarity index 94% rename from designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPane.java rename to designer_chart/src/com/fr/plugin/chart/designer/component/format/FormatPaneWithOutFont.java index ea9a1deef9..cd4ff91fe6 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/component/format/FormatPaneWithOutFont.java @@ -10,7 +10,7 @@ import java.awt.*; /** * Created by mengao on 2017/8/28. */ -public class VanChartFormatPane extends FormatPane { +public class FormatPaneWithOutFont extends FormatPane { private static final int HEIGHT = 30; diff --git a/designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java b/designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java index feba874e96..2319956f16 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java @@ -114,7 +114,7 @@ public abstract class VanChartFormatPaneWithCheckBox extends JPanel{ } protected FormatPane createFormatPane() { - return new VanChartFormatPane(); + return new FormatPaneWithOutFont(); } public boolean isDirty() { diff --git a/designer_chart/src/com/fr/plugin/chart/range/component/LegendLabelFormatPane.java b/designer_chart/src/com/fr/plugin/chart/range/component/LegendLabelFormatPane.java index dea47c00d6..a9ea6a10ca 100644 --- a/designer_chart/src/com/fr/plugin/chart/range/component/LegendLabelFormatPane.java +++ b/designer_chart/src/com/fr/plugin/chart/range/component/LegendLabelFormatPane.java @@ -8,7 +8,7 @@ import com.fr.design.layout.TableLayout; import com.fr.general.Inter; import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; import com.fr.plugin.chart.designer.component.VanChartHtmlLabelPaneWithOutWidthAndHeight; -import com.fr.plugin.chart.designer.component.format.VanChartFormatPane; +import com.fr.plugin.chart.designer.component.format.FormatPaneWithOutFont; import com.fr.plugin.chart.designer.style.VanChartStylePane; import javax.swing.*; @@ -31,7 +31,7 @@ public class LegendLabelFormatPane extends JPanel{ public LegendLabelFormatPane(){ labelFormatStyle = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Common"), Inter.getLocText("Plugin-ChartF_Custom")}); - labelFormat = new VanChartFormatPane(); + labelFormat = new FormatPaneWithOutFont(); htmlLabelPane = new VanChartHtmlLabelPaneWithOutWidthAndHeight(); centerPane = new JPanel(new CardLayout()){