From 1b805c0e8bcf03c5bfacf8ab06cec4adc3515a85 Mon Sep 17 00:00:00 2001 From: mengao <283296419@qq.com> Date: Wed, 20 Sep 2017 22:23:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E9=9D=A2=E6=9D=BF=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=91=E6=8E=A7=E5=88=B7=E6=96=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=82=B9=E6=8F=90=E7=A4=BA=E8=AE=BE=E7=BD=AE=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=20=E4=BF=AE=E6=94=B9=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/chart/ChartTypePane.java | 7 ++-- .../impl/ChartHyperPoplinkPane.java | 8 +++-- .../mainframe/MiddleChartPropertyPane.java | 5 +-- .../chart/gui/data/ChartDataFilterPane.java | 3 +- ...goryPlotMoreCateReportDataContentPane.java | 4 +-- .../CategoryPlotReportDataContentPane.java | 2 +- .../table/MeterPlotTableDataContentPane.java | 3 +- ...anChartBubblePlotTableDataContentPane.java | 2 +- .../component/VanChartFillStylePane.java | 6 ++-- .../component/VanChartTooltipContentPane.java | 2 +- .../format/FormatPaneWithOutFont.java | 3 +- .../chart/designer/other/AutoRefreshPane.java | 3 -- .../style/VanChartRangeLegendPane.java | 1 + .../style/axis/VanChartBaseAxisPane.java | 6 ++-- .../VanChartPlotRefreshTooltipPane.java | 32 +++++++++++++------ .../chart/map/designer/VanChartGroupPane.java | 7 +++- .../VanMapAreaPointAndLineGroupPane.java | 6 ++++ .../type/VanChartMapSourceChoosePane.java | 31 +++++++++++------- .../MultiPiePlotTableDataContentPane.java | 17 +++++----- ...StructureIndependentVanChartInterface.java | 10 ++++++ 20 files changed, 104 insertions(+), 54 deletions(-) diff --git a/designer_chart/src/com/fr/design/chart/ChartTypePane.java b/designer_chart/src/com/fr/design/chart/ChartTypePane.java index d48ab810ab..01040d6c54 100644 --- a/designer_chart/src/com/fr/design/chart/ChartTypePane.java +++ b/designer_chart/src/com/fr/design/chart/ChartTypePane.java @@ -97,12 +97,15 @@ public class ChartTypePane extends ChartCommonWizardPane { if (value instanceof ChartIcon) { this.setIcon((ChartIcon) value); setHorizontalAlignment(UILabel.CENTER); + ChartIcon chartIcon = (ChartIcon) value; if (isSelected) { // 深蓝色. this.setBackground(new Color(57, 107, 181)); + this.setBorder(GUICoreUtils.createTitledBorder(getChartName(chartIcon), Color.WHITE)); + } else { + this.setBorder(GUICoreUtils.createTitledBorder(getChartName(chartIcon))); } - ChartIcon chartIcon = (ChartIcon) value; - this.setBorder(GUICoreUtils.createTitledBorder(getChartName(chartIcon), null)); + } return this; } diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java index cd449d0dbf..3d9e0026db 100644 --- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java +++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java @@ -28,6 +28,7 @@ import java.awt.*; */ public class ChartHyperPoplinkPane extends BasicBeanPane { private static final long serialVersionUID = 2469115951510144738L; + private static final int EDIT_PANE_WIDTH = 248; private UITextField itemNameTextField; private ChartHyperEditPane hyperEditPane; private ChartComponent chartComponent; @@ -41,15 +42,16 @@ public class ChartHyperPoplinkPane extends BasicBeanPane { } hyperEditPane = new ChartHyperEditPane(getChartParaType(), getValueEditorPane(), getValueEditorPane()); - this.add(hyperEditPane, BorderLayout.CENTER); + hyperEditPane.setPreferredSize(new Dimension(EDIT_PANE_WIDTH, (int)hyperEditPane.getPreferredSize().getHeight()));// 固定属性配置面板大小,灵活调整图表显示面板. + this.add(hyperEditPane, BorderLayout.WEST); ChartCollection cc = createChartCollection(); chartComponent = new ChartComponent(); - chartComponent.setPreferredSize(new Dimension(300, 170));// 在单元格弹出时 需要调整保证属性表的大小. + chartComponent.setPreferredSize(new Dimension((int)this.getPreferredSize().getWidth()-EDIT_PANE_WIDTH, 170));// 在单元格弹出时 需要调整保证属性表的大小. chartComponent.setSupportEdit(false); chartComponent.populate(cc); - this.add(chartComponent, BorderLayout.EAST); + this.add(chartComponent, BorderLayout.CENTER); hyperEditPane.populate(cc); diff --git a/designer_chart/src/com/fr/design/mainframe/MiddleChartPropertyPane.java b/designer_chart/src/com/fr/design/mainframe/MiddleChartPropertyPane.java index 1d9732205d..3224d6d241 100644 --- a/designer_chart/src/com/fr/design/mainframe/MiddleChartPropertyPane.java +++ b/designer_chart/src/com/fr/design/mainframe/MiddleChartPropertyPane.java @@ -33,10 +33,11 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{ protected void initComponenet() { this.setLayout(new BorderLayout()); - this.setBorder(null); + this.setBorder(BorderFactory.createEmptyBorder(10,0,0,0)); createNameLabel(); - this.add(createNorthComponent(), BorderLayout.NORTH); + //去掉上方名字，先注释掉 +// this.add(createNorthComponent(), BorderLayout.NORTH); chartEditPane = StableUtils.construct(ChartEditPane.class); chartEditPane.setSupportCellData(true); } diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/ChartDataFilterPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/ChartDataFilterPane.java index 9a4a67b16e..a30f28c3e7 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/ChartDataFilterPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/ChartDataFilterPane.java @@ -59,9 +59,10 @@ public class ChartDataFilterPane extends ThirdTabPane { if (nameArray.length > 1) { pane.add(tabPane); this.add(pane, BorderLayout.NORTH); + centerPane.setBorder(BorderFactory.createEmptyBorder(10,0,0,0)); } + centerPane.setBorder(null); } - centerPane.setBorder(BorderFactory.createEmptyBorder(10,0,0,0)); this.add(centerPane, BorderLayout.CENTER); } 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 34486394ac..90bb3af827 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 @@ -67,7 +67,7 @@ public class CategoryPlotMoreCateReportDataContentPane extends CategoryPlotRepor catePane.add(boxPane, BorderLayout.SOUTH); - catePane.setBorder(BorderFactory.createEmptyBorder(0,24,10,15)); + catePane.setBorder(BorderFactory.createEmptyBorder(0,24,10,6)); this.add(catePane, "0,0,2,0"); filterPane = new ChartDataFilterPane(new Bar2DPlot(), parent); @@ -96,7 +96,7 @@ public class CategoryPlotMoreCateReportDataContentPane extends CategoryPlotRepor private TinyFormulaPane addNewCatePane() { final TinyFormulaPane pane = initCategoryBox(StringUtils.EMPTY); - pane.setPreferredSize(new Dimension(106, 16)); + pane.setPreferredSize(new Dimension(100, 16)); pane.registerChangeListener(uiobListener); diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java index d65f04b616..34489350ac 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java @@ -34,7 +34,7 @@ public class CategoryPlotReportDataContentPane extends AbstractReportDataContent initEveryPane(); categoryName = initCategoryBox(Inter.getLocText("FR-Chart-Category_Name")); categoryName.setPreferredSize(new Dimension(246,30)); - categoryName.setBorder(BorderFactory.createEmptyBorder(0,24,0,15)); + categoryName.setBorder(BorderFactory.createEmptyBorder(0,24,0,7)); this.add(categoryName, "0,0,2,0"); filterPane = new ChartDataFilterPane(new Bar2DPlot(), parent); JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart-Data_Filter"),filterPane); diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/MeterPlotTableDataContentPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/MeterPlotTableDataContentPane.java index b8cb14bed5..a220804e14 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/MeterPlotTableDataContentPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/MeterPlotTableDataContentPane.java @@ -47,8 +47,9 @@ public class MeterPlotTableDataContentPane extends AbstractTableDataContentPane JPanel jPanel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart-Data_Filter"),filterPane); JPanel panel = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); - filterPane.setBorder(BorderFactory.createEmptyBorder(10,10,0,15)); + filterPane.setBorder(BorderFactory.createEmptyBorder(0,10,0,15)); panel.setBorder(BorderFactory.createEmptyBorder(10,24,10,15)); + jPanel.setBorder(BorderFactory.createEmptyBorder(0,12,0,5)); this.add(getJSeparator(),BorderLayout.NORTH); this.add(panel,BorderLayout.CENTER); diff --git a/designer_chart/src/com/fr/plugin/chart/bubble/data/VanChartBubblePlotTableDataContentPane.java b/designer_chart/src/com/fr/plugin/chart/bubble/data/VanChartBubblePlotTableDataContentPane.java index 3c055caae3..8c2607a02e 100644 --- a/designer_chart/src/com/fr/plugin/chart/bubble/data/VanChartBubblePlotTableDataContentPane.java +++ b/designer_chart/src/com/fr/plugin/chart/bubble/data/VanChartBubblePlotTableDataContentPane.java @@ -60,7 +60,7 @@ public class VanChartBubblePlotTableDataContentPane extends AbstractTableDataCon }; JPanel north = TableLayout4VanChartHelper.createGapTableLayoutPane(components_north,rowSize_north,columnSize_north); - north.setBorder(BorderFactory.createEmptyBorder(6, 24, 10, 15)); + north.setBorder(BorderFactory.createEmptyBorder(10, 24, 10, 15)); JPanel filterPane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart-Data_Filter"),dataScreeningPane); dataScreeningPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,5)); filterPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,5)); diff --git a/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartFillStylePane.java b/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartFillStylePane.java index 1cfc178311..b544ca1d5a 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartFillStylePane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartFillStylePane.java @@ -26,12 +26,14 @@ public class VanChartFillStylePane extends ChartFillStylePane { new Component[]{null,customPane}, }; - return TableLayout4VanChartHelper.createGapTableLayoutPane(components,rowSize,columnSize); + JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components,rowSize,columnSize); + panel.setBorder(BorderFactory.createEmptyBorder(5,5,0,0)); + return panel; } @Override public Dimension getPreferredSize() { if(styleSelectBox.getSelectedIndex() != styleSelectBox.getItemCount() - 1) { - return new Dimension(styleSelectBox.getPreferredSize().width, 26); + return new Dimension(styleSelectBox.getPreferredSize().width, 30); } return super.getPreferredSize(); } diff --git a/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartTooltipContentPane.java b/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartTooltipContentPane.java index 08d5c2f00b..9b38bc7c75 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartTooltipContentPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartTooltipContentPane.java @@ -61,7 +61,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane { - private static final int P_W = 320; - private static final int P_H = 460; private VanChart chart; private UIButtonGroup moreLabel; @@ -140,7 +138,6 @@ public class AutoRefreshPane extends BasicBeanPane { } }); - dialog.setSize(P_W, P_H); dialog.setVisible(true); } }); diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/VanChartRangeLegendPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/VanChartRangeLegendPane.java index 0c8fd37037..d8f527400d 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/VanChartRangeLegendPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/VanChartRangeLegendPane.java @@ -102,6 +102,7 @@ public class VanChartRangeLegendPane extends VanChartPlotLegendPane { initLegendTypeButtonListener(); JPanel legendTypeButtonWithTilePane = createTableLayoutPaneWithTitle(Inter.getLocText("Plugin-ChartF_Legend_Form"),legendTypeButton); + legendTypeButtonWithTilePane.setBorder(BorderFactory.createEmptyBorder(0,5,0,0)); rangeLegendPane = createRangeLegendPane(); 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 2123588c72..9a5c0ee4da 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 @@ -134,7 +134,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_TextRotation")),titleTextRotation}, }; - JPanel panel = TableLayoutHelper.createTableLayoutPane(components, row, col); + JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); return TableLayout4VanChartHelper.createExpandablePaneWithTitle(PaneTitleConstants.CHART_STYLE_TITLE_TITLE, panel); } @@ -222,7 +222,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { mainTick = new UIButtonGroup(strings, values); secondTick = new UIButtonGroup(strings, values); - JPanel panel = TableLayoutHelper.createTableLayoutPane(getLineStylePaneComponents(), row, col); + JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(getLineStylePaneComponents(), row, col); return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_AxisLineStyle"), panel); } @@ -249,7 +249,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { new Component[]{new UILabel(Inter.getLocText("FR-Designer_AxisReversed")),reversed}, } ; - JPanel panel = TableLayoutHelper.createTableLayoutPane(components, row, col); + JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Chart-Layout_Position"), panel); } diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/tooltip/VanChartPlotRefreshTooltipPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/tooltip/VanChartPlotRefreshTooltipPane.java index bf3845ea78..eb18f499a3 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/tooltip/VanChartPlotRefreshTooltipPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/tooltip/VanChartPlotRefreshTooltipPane.java @@ -1,6 +1,7 @@ package com.fr.plugin.chart.designer.style.tooltip; import com.fr.chart.chartattr.Plot; +import com.fr.design.dialog.BasicScrollPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.layout.TableLayout; @@ -29,7 +30,7 @@ public class VanChartPlotRefreshTooltipPane extends VanChartPlotTooltipNoCheckPa public VanChartPlotRefreshTooltipPane(Plot plot) { super(plot, null); - this.setSize(270,400); + this.setPreferredSize(new Dimension(320, 400)); } protected JPanel createTooltipPane(Plot plot) { @@ -45,13 +46,25 @@ public class VanChartPlotRefreshTooltipPane extends VanChartPlotTooltipNoCheckPa Component[][] components = createComponents(plot); JPanel panel = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); - JScrollPane jScrollPane = new JScrollPane(panel); - jScrollPane.setPreferredSize(new Dimension(P_W, P_H)); - - jScrollPane.setVerticalScrollBarPolicy (JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); - JPanel jPanel = new JPanel(); - jPanel.add(jScrollPane); - return jPanel; + BasicScrollPane scrollPane = new BasicScrollPane() { + + @Override + protected String title4PopupWindow() { + return null; + } + + @Override + protected JPanel createContentPane() { + return panel; + } + + @Override + public void populateBean(Object ob) { + return; + } + }; + scrollPane.setPreferredSize(new Dimension(P_W, P_H)); + return scrollPane; } protected Component[][] createComponents(Plot plot) { @@ -78,9 +91,10 @@ public class VanChartPlotRefreshTooltipPane extends VanChartPlotTooltipNoCheckPa double f = TableLayout.FILL; double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; double[] columnSize = {f, e}; - double[] rowSize = {p}; + double[] rowSize = {p, p}; Component[][] components = new Component[][]{ + new Component[]{null, null}, new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Duration_Time")), duration}, }; diff --git a/designer_chart/src/com/fr/plugin/chart/map/designer/VanChartGroupPane.java b/designer_chart/src/com/fr/plugin/chart/map/designer/VanChartGroupPane.java index f23604b1fb..844bb7e443 100644 --- a/designer_chart/src/com/fr/plugin/chart/map/designer/VanChartGroupPane.java +++ b/designer_chart/src/com/fr/plugin/chart/map/designer/VanChartGroupPane.java @@ -3,6 +3,7 @@ package com.fr.plugin.chart.map.designer; import com.fr.design.gui.ibutton.UIButtonGroup; import javax.swing.*; +import javax.swing.border.Border; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import java.awt.*; @@ -34,9 +35,13 @@ public abstract class VanChartGroupPane extends JPanel{ cardLayout.show(centerPane, nameList[buttonGroup.getSelectedIndex()]); } }); - + buttonGroup.setBorder(getButtonGroupBorder()); this.setLayout(new BorderLayout(0, 4)); this.add(buttonGroup, BorderLayout.NORTH); this.add(centerPane, BorderLayout.CENTER); } + + protected Border getButtonGroupBorder () { + return null; + } } diff --git a/designer_chart/src/com/fr/plugin/chart/map/designer/VanMapAreaPointAndLineGroupPane.java b/designer_chart/src/com/fr/plugin/chart/map/designer/VanMapAreaPointAndLineGroupPane.java index df9e994e2d..681ba3a651 100644 --- a/designer_chart/src/com/fr/plugin/chart/map/designer/VanMapAreaPointAndLineGroupPane.java +++ b/designer_chart/src/com/fr/plugin/chart/map/designer/VanMapAreaPointAndLineGroupPane.java @@ -3,6 +3,7 @@ package com.fr.plugin.chart.map.designer; import com.fr.general.Inter; import javax.swing.*; +import javax.swing.border.Border; /** * Created by Mitisky on 16/5/20. @@ -17,4 +18,9 @@ public class VanMapAreaPointAndLineGroupPane extends VanChartGroupPane { public VanMapAreaPointAndLineGroupPane(final JPanel areaPane, final JPanel pointPane, final JPanel linePane){ super(new String[]{AREA_MAP_STRING, POINT_MAP_STRING, LINE_MAP_STRING}, new JPanel[]{areaPane, pointPane, linePane}); } + + @Override + protected Border getButtonGroupBorder () { + return BorderFactory.createEmptyBorder(0,8,0,18); + } } diff --git a/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java b/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java index 77bc8020e9..b89bc667db 100644 --- a/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java +++ b/designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java @@ -213,9 +213,9 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { sourceTitleLabel = createSourceTitleLabel(); double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; + double d = TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH; double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; - double[] columnSize = {f, e}; + double[] columnSize = {d, e}; double[] rowSize = {p, p}; Component[][] components = new Component[][]{ new Component[]{null,null}, @@ -288,39 +288,45 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { layerCardPane.add(pane, itemName); } - panel.add(gisLayer, BorderLayout.CENTER); + JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Gis_Layer"), gisLayer); + + panel.add(panel1, BorderLayout.CENTER); panel.add(layerCardPane, BorderLayout.SOUTH); - return TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Gis_Layer"), panel); + return panel; } private JPanel createCustomTileLayer() { double p = TableLayout.PREFERRED; double[] rowSize = {p, p}; - double[] COLUMN_SIZE = {p, TableLayout.FILL}; + double[] COLUMN_SIZE = {TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH-3}; customTileLayer = new UITextArea(); attribution = new UITextArea(); Component[][] comps = new Component[][]{ - new Component[]{new UILabel("url", SwingConstants.RIGHT), customTileLayer}, + new Component[]{new UILabel("url"), customTileLayer}, new Component[]{new UILabel("Attribution"), attribution} }; - return TableLayoutHelper.createTableLayoutPane(comps, rowSize, COLUMN_SIZE); + JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(comps, rowSize, COLUMN_SIZE); + panel.setBorder(TableLayout4VanChartHelper.SECOND_EDIT_AREA_BORDER); + return panel; } private JPanel createWMSPanel() { final double p = TableLayout.PREFERRED; double[] rowSize = {p}; + double[] COLUMN_SIZE = {TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH, 84,44}; + wmsUrl = new UITextArea(); connectButton = new UIButton(Inter.getLocText("Plugin-ChartF_Connect_WMP")); Component[][] comps = new Component[][]{ - new Component[]{new UILabel("url", SwingConstants.RIGHT), wmsUrl, connectButton} + new Component[]{new UILabel("url"), wmsUrl, connectButton} }; - JPanel northPane = TableLayoutHelper.createTableLayoutPane(comps,rowSize, COLUMN_SIZE); - + JPanel northPane = TableLayout4VanChartHelper.createGapTableLayoutPane(comps, rowSize, COLUMN_SIZE); + northPane.setBorder(TableLayout4VanChartHelper.SECOND_EDIT_AREA_BORDER); JPanel wmsPanel = new JPanel(new BorderLayout(0, 4)); wmsLayerPane = new JPanel(new BorderLayout()); resetWMSLayerPane(new ArrayList()); @@ -429,11 +435,12 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { double p = TableLayout.PREFERRED; double f = TableLayout.FILL; + double d = TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH; double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; double s = TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH; double[] rowSize = {p,p,p}; - double[] columnSize = {f, e}; - double[] column = {f, s}; + double[] columnSize = {d, e}; + double[] column = {d, s}; Component[][] comps = new Component[][]{ new Component[]{null, null}, diff --git a/designer_chart/src/com/fr/plugin/chart/multilayer/data/MultiPiePlotTableDataContentPane.java b/designer_chart/src/com/fr/plugin/chart/multilayer/data/MultiPiePlotTableDataContentPane.java index becec4822c..b5dad1e1c5 100644 --- a/designer_chart/src/com/fr/plugin/chart/multilayer/data/MultiPiePlotTableDataContentPane.java +++ b/designer_chart/src/com/fr/plugin/chart/multilayer/data/MultiPiePlotTableDataContentPane.java @@ -33,6 +33,7 @@ import java.util.List; public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPane implements UIObserver { private static final int HT = 20; private static final int WD = 100; + private static final int LABEL_WIDTH = 72; private UISpinner levelNumEdit; private UITextField nameField; @@ -84,7 +85,7 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa private JPanel createCenterPane() { double p = TableLayout.PREFERRED; double f = TableLayout.FILL; - double[] columnSize_center = {f, COMPONENT_WIDTH}; + double[] columnSize_center = {LABEL_WIDTH, COMPONENT_WIDTH}; double[] rowSize_center = new double[levelNum + 3]; initLevelNameList(); @@ -113,8 +114,9 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa registerListener4Center(); - return TableLayout4VanChartHelper.createGapTableLayoutPane(components_center,rowSize_center,columnSize_center); - + JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components_center,rowSize_center,columnSize_center); + panel.setBorder(BorderFactory.createEmptyBorder(0,10,0,0)); + return panel; } @@ -147,8 +149,7 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa private JPanel createNorthPane() { double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] columnSize_north = {f, COMPONENT_WIDTH}; + double[] columnSize_north = {LABEL_WIDTH, COMPONENT_WIDTH}; double[] rowSize_north = {p, p, p}; levelNumEdit = new UISpinner(1, 15, 1, levelNum){ @@ -169,10 +170,8 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa super.setTextFieldValue(value); } }; - levelNumEdit.setPreferredSize(new Dimension(WD, HT)); nameField = new UITextField(); - nameField.setPreferredSize(new Dimension(WD, HT)); Component[][] components_north = new Component[][]{ new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_MultiPie_Series_Name")), nameField}, @@ -180,7 +179,9 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Level_Number")), levelNumEdit}, }; - return TableLayout4VanChartHelper.createGapTableLayoutPane(components_north, rowSize_north, columnSize_north); + JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components_north, rowSize_north, columnSize_north); + panel.setBorder(BorderFactory.createEmptyBorder(0,10,0,0)); + return panel; } private void refreshCenterPane(){ diff --git a/designer_chart/src/com/fr/plugin/chart/structure/desinger/StructureIndependentVanChartInterface.java b/designer_chart/src/com/fr/plugin/chart/structure/desinger/StructureIndependentVanChartInterface.java index 52eeda2ed9..65725cf532 100644 --- a/designer_chart/src/com/fr/plugin/chart/structure/desinger/StructureIndependentVanChartInterface.java +++ b/designer_chart/src/com/fr/plugin/chart/structure/desinger/StructureIndependentVanChartInterface.java @@ -5,6 +5,7 @@ import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; import com.fr.design.condition.ConditionAttributesPane; import com.fr.design.gui.frpane.AttributeChangeListener; +import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.mainframe.chart.AbstractChartAttrPane; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartStylePane; @@ -13,6 +14,7 @@ import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.general.Inter; import com.fr.plugin.chart.base.VanChartConstants; +import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; import com.fr.plugin.chart.designer.other.VanChartInteractivePaneWithOutSort; import com.fr.plugin.chart.designer.other.VanChartOtherPane; import com.fr.plugin.chart.designer.style.VanChartStylePane; @@ -23,6 +25,8 @@ import com.fr.plugin.chart.structure.desinger.style.VanChartStructureSeriesPane; import com.fr.plugin.chart.structure.desinger.type.VanChartStructureTypePane; import com.fr.plugin.chart.vanchart.AbstractIndependentVanChartUI; +import javax.swing.*; + /** * Created by shine on 2017/2/15. */ @@ -60,6 +64,12 @@ public class StructureIndependentVanChartInterface extends AbstractIndependentVa protected BasicBeanPane createInteractivePane() { return new VanChartInteractivePaneWithOutSort(){ + @Override + protected JPanel getzoomTypePane(UIButtonGroup zoomType) { + JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_ZoomType"), zoomType); + return panel; + } + @Override protected String[] getNameArray() { return new String[]{Inter.getLocText("Plugin-ChartF_XYAxis"), Inter.getLocText("Chart-Use_None")};