From fa82620bf764e195552c7e1bba4aab9c89c4371b Mon Sep 17 00:00:00 2001 From: Qin Xiaofu Date: Wed, 23 Aug 2017 10:32:01 +0800 Subject: [PATCH 1/9] =?UTF-8?q?CHART-1255=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E6=B7=BB=E5=8A=A00.5~17.5=E7=9A=84=E5=B1=82?= =?UTF-8?q?=E7=BA=A7option?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../type/VanChartMapSourceChoosePane.java | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) 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 cb3980d491..2092a30f00 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 @@ -57,10 +57,28 @@ import java.util.ArrayList; public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { private static final double[] COLUMN_SIZE = {48, TableLayout.FILL, TableLayout.PREFERRED}; - public static final ZoomLevel[] ZOOM_LEVELS = new ZoomLevel[]{ZoomLevel.AUTO, ZoomLevel.ZERO, ZoomLevel.ONE, - ZoomLevel.TWO, ZoomLevel.THREE, ZoomLevel.FOUR, ZoomLevel.FIVE, ZoomLevel.SIX, ZoomLevel.SEVEN, - ZoomLevel.EIGHT, ZoomLevel.NINE, ZoomLevel.TEN, ZoomLevel.ELEVEN, ZoomLevel.TWELVE, ZoomLevel.THIRTEEN, - ZoomLevel.FOURTEEN, ZoomLevel.FIFTEEN, ZoomLevel.SIXTEEN, ZoomLevel.SEVENTEEN, ZoomLevel.EIGHTEEN}; + public static final ZoomLevel[] ZOOM_LEVELS = new ZoomLevel[]{ + ZoomLevel.AUTO, + ZoomLevel.ZERO, ZoomLevel.ZEROPOINTFIVE, + ZoomLevel.ONE, ZoomLevel.ONEPOINTFIVE, + ZoomLevel.TWO, ZoomLevel.TWOPOINTFIVE, + ZoomLevel.THREE, ZoomLevel.THREEPOINTFIVE, + ZoomLevel.FOUR, ZoomLevel.FOURPOINTFIVE, + ZoomLevel.FIVE, ZoomLevel.FIVEPOINTFIVE, + ZoomLevel.SIX, ZoomLevel.SIXPOINTFIVE, + ZoomLevel.SEVEN, ZoomLevel.SEVENPOINTFIVE, + ZoomLevel.EIGHT, ZoomLevel.EIGHTPOINTFIVE, + ZoomLevel.NINE, ZoomLevel.NINEPOINTFIVE, + ZoomLevel.TEN, ZoomLevel.TENPOINTFIVE, + ZoomLevel.ELEVEN, ZoomLevel.ELEVENTPOINTFIVE, + ZoomLevel.TWELVE, ZoomLevel.TWELVEPOINTFIVE, + ZoomLevel.THIRTEEN, ZoomLevel.THIRTEENPOINTFIVE, + ZoomLevel.FOURTEEN, ZoomLevel.FOURTEENPOINTFIVE, + ZoomLevel.FIFTEEN, ZoomLevel.FIFTEENPOINTFIVE, + ZoomLevel.SIXTEEN, ZoomLevel.SIXTEENPOINTFIVE, + ZoomLevel.SEVENTEEN, ZoomLevel.SEVENTEENPOINTFIVE, + ZoomLevel.EIGHTEEN + }; private static final String AUTO_CENTER_STRING = Inter.getLocText("Plugin-ChartF_Automatic"); private static final String CUSTOM_CENTER_STRING = Inter.getLocText("Plugin-ChartF_Custom"); From fc806f3f1cc23697b4085e139964594d56c66f73 Mon Sep 17 00:00:00 2001 From: Qin Xiaofu Date: Thu, 24 Aug 2017 15:14:06 +0800 Subject: [PATCH 2/9] =?UTF-8?q?CHART-1212=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E8=BD=AE=E6=92=AD=E9=9D=A2=E6=9D=BF=E6=B7=BB=E5=8A=A0=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E8=BD=AE=E6=92=AD=E7=AE=AD=E5=A4=B4=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E7=9A=84=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/chart/gui/ChangeConfigPane.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java index 1f1f5a9f94..5a3a8ebc01 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java @@ -11,6 +11,7 @@ import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UISpinner; +import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane; @@ -42,6 +43,7 @@ public class ChangeConfigPane extends BasicBeanPane { //轮播切换方式配置接界面 private JPanel carouselConfigPane; protected UISpinner timeInterval; + protected UICheckBox arrowCheckbox; private ColorSelectBoxWithOutTransparent colorSelectBox4carousel; public ChangeConfigPane(){ @@ -95,9 +97,11 @@ public class ChangeConfigPane extends BasicBeanPane { double[] rowSize = {p,p,p}; timeInterval = new UISpinner(MIN_TIME, MAX_TIME, 1, 0); colorSelectBox4carousel = new ColorSelectBoxWithOutTransparent(WIDTH); + arrowCheckbox = new UICheckBox(Inter.getLocText("FR-Base_TurnOn")); Component[][] components = new Component[][]{ new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Time_Interval")), timeInterval}, new Component[]{new UILabel(Inter.getLocText("Background")),colorSelectBox4carousel}, + new Component[] {new UILabel(Inter.getLocText("Plugin-ChartF_Arrow_Style")), arrowCheckbox} }; return TableLayout4VanChartHelper.createGapTableLayoutPane(components,rowSize,columnSize); @@ -174,6 +178,7 @@ public class ChangeConfigPane extends BasicBeanPane { //轮播切换界面 timeInterval.setValue(changeConfigAttr.getTimeInterval()); colorSelectBox4carousel.setSelectObject(changeConfigAttr.getCarouselColor()); + arrowCheckbox.setSelected(changeConfigAttr.getShowArrow()); checkCardPane(); @@ -197,6 +202,7 @@ public class ChangeConfigPane extends BasicBeanPane { changeConfigAttr.setButtonColor(colorSelectBox4button.getSelectObject()); changeConfigAttr.setTimeInterval((int) timeInterval.getValue()); changeConfigAttr.setCarouselColor(colorSelectBox4carousel.getSelectObject()); + changeConfigAttr.setShowArrow(arrowCheckbox.isSelected()); } @Override From 4ed057c2d1ee1d6e37416e22dda08b7e84be2675 Mon Sep 17 00:00:00 2001 From: hzzz Date: Fri, 25 Aug 2017 14:38:07 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=95=B4=E6=95=B0=E5=BA=A6=E9=87=8F=20->?= =?UTF-8?q?=20=E5=B0=8F=E6=95=B0=E5=BA=A6=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/foldablepane/HeaderPane.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/designer_base/src/com/fr/design/foldablepane/HeaderPane.java b/designer_base/src/com/fr/design/foldablepane/HeaderPane.java index eebac2af5e..f0d19ee39f 100644 --- a/designer_base/src/com/fr/design/foldablepane/HeaderPane.java +++ b/designer_base/src/com/fr/design/foldablepane/HeaderPane.java @@ -1,10 +1,12 @@ package com.fr.design.foldablepane; import com.fr.design.constants.UIConstants; +import com.fr.design.gui.syntax.ui.rsyntaxtextarea.RSyntaxUtilities; import javax.swing.*; import java.awt.*; import java.awt.image.BufferedImage; +import java.util.Map; /** * Created by MoMeak on 2017/7/5. @@ -61,6 +63,10 @@ public class HeaderPane extends JPanel { g2d.fillRect(0, 0, headWidth, headHeight); g2d.setFont(new Font("SimSun", 0, fontSize)); g2d.setPaint(bgColor); + Map desktopHints = RSyntaxUtilities.getDesktopAntiAliasHints(); + if (desktopHints != null) { + g2d.setRenderingHints(desktopHints); + } g2d.drawString(this.title, TITLE_X, headHeight - fontSize / 2 - 1); int leftWdith = headWidth - LEFT_X; if (this.isShow) { From 055bceb5d44d5bebf5d5619f53e2e1efc6e19d6a Mon Sep 17 00:00:00 2001 From: mengao <283296419@qq.com> Date: Mon, 28 Aug 2017 09:10:27 +0800 Subject: [PATCH 4/9] =?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=EF=BC=8C=E6=A0=B7=E5=BC=8F=E3=80=81?= =?UTF-8?q?=E7=89=B9=E6=95=88=E9=9D=A2=E6=9D=BF=E6=95=B4=E4=BD=93=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E3=80=82=20=E4=BF=AE=E6=94=B9=E7=94=98=E7=89=B9?= =?UTF-8?q?=E5=9B=BE=EF=BC=8C=E6=BC=8F=E6=96=97=E5=9B=BE=E7=AD=89=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E9=85=8D=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 --- .../chart/gui/data/ChartDataFilterPane.java | 28 +++++++++++++++++-- .../chart/gui/style/ChartTextAttrPane.java | 4 +-- .../column/VanChartColumnSeriesPane.java | 7 +++-- .../designer/AbstractVanChartScrollPane.java | 8 ++++-- .../designer/TableLayout4VanChartHelper.java | 19 +++++++++---- .../VanChartAreaSeriesFillColorPane.java | 23 +++++++++++++-- .../component/VanChartBeautyPane.java | 3 +- .../component/VanChartFillStylePane.java | 3 +- .../component/VanChartLineTypePane.java | 3 +- .../component/VanChartLineWidthPane.java | 6 ++-- .../component/VanChartMarkerPane.java | 2 -- .../component/VanChartTooltipContentPane.java | 5 ++-- .../component/VanChartTrendLinePane.java | 3 +- .../background/VanChartBackgroundPane.java | 3 +- .../VanChartMarkerBackgroundPane.java | 4 ++- .../component/border/VanChartBorderPane.java | 3 +- .../component/format/VanChartFormatPane.java | 4 +-- .../marker/VanChartCommonMarkerPane.java | 10 +++---- .../marker/VanChartImageMarkerPane.java | 5 +++- .../chart/designer/other/AutoRefreshPane.java | 27 +++++++++--------- .../other/AutoRefreshPaneWithoutTooltip.java | 2 +- .../other/VanChartInteractivePane.java | 21 ++++++++------ .../style/VanChartPlotLegendPane.java | 13 +++++---- .../designer/style/VanChartTitlePane.java | 12 ++++---- .../style/axis/VanChartBaseAxisPane.java | 17 +++++++---- .../style/axis/VanChartTimeAxisPane.java | 5 ++-- .../style/axis/VanChartValueAxisPane.java | 5 ++-- .../gauge/VanChartGaugeDetailAxisPane.java | 2 +- .../axis/radar/VanChartRadarXAxisPane.java | 6 ++-- .../axis/radar/VanChartRadarYAxisPane.java | 5 ++-- .../style/background/VanChartAreaPane.java | 26 +++++++++++++---- .../background/VanChartAxisAreaPane.java | 5 ++-- .../label/VanChartPlotLabelDetailPane.java | 19 ++++++++----- .../VanChartAbstractPlotSeriesPane.java | 4 +-- .../tooltip/VanChartPlotTooltipPane.java | 26 ++++++++--------- .../style/axis/GanttAxisStylePane.java | 6 ++-- .../style/axis/GanttTimeAxisPane.java | 13 +++++---- .../series/VanChartGanttCommonMarkerPane.java | 6 ++-- .../style/series/VanChartGanttSeriesPane.java | 17 +++++------ .../chart/pie/RadiusCardLayoutPane.java | 5 +--- .../chart/pie/VanChartPieSeriesPane.java | 5 ++-- .../range/component/SectionLegendPane.java | 2 +- .../VanChartScatterLineTypePane.java | 5 ++-- .../style/VanChartWordCloudSeriesPane.java | 26 +++++++++-------- 44 files changed, 264 insertions(+), 159 deletions(-) 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 0f09b016b0..622dcb5df9 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 @@ -33,7 +33,7 @@ import java.util.List; */ public class ChartDataFilterPane extends ThirdTabPane { private static final long serialVersionUID = 3650522989381790194L; - private static final int PAN_WIDTH = 234; + private static final int PAN_WIDTH = 246; private static final int FIL_HEIGHT = 150; private CategoryFilterPane categoryPane; @@ -55,7 +55,7 @@ public class ChartDataFilterPane extends ThirdTabPane { cardLayout.show(centerPane, nameArray[index]); } }; - tabPane.setPreferredSize(new Dimension(200, 20)); + tabPane.setPreferredSize(new Dimension(221, 20)); } } @@ -68,6 +68,7 @@ public class ChartDataFilterPane extends ThirdTabPane { this.add(pane, BorderLayout.NORTH); } } + centerPane.setBorder(BorderFactory.createEmptyBorder(10,0,0,0)); this.add(centerPane, BorderLayout.CENTER); } @@ -125,7 +126,7 @@ public class ChartDataFilterPane extends ThirdTabPane { this.removeAll(); paneList = initPaneList4NoPresent(plot4Pane, parentPane); initAllPane(); - tabPane.setPreferredSize(new Dimension(200, 20)); + tabPane.setPreferredSize(new Dimension(221, 20)); centerPane.setPreferredSize(new Dimension(getContentPaneWidth(), 200)); this.validate(); } @@ -197,6 +198,16 @@ public class ChartDataFilterPane extends ThirdTabPane { this.parent = parent; } + protected void layoutContentPane() { + super.layoutContentPane(); + leftcontentPane.setBorder(BorderFactory.createEmptyBorder()); + } + + public void reloaPane(JPanel pane){ + super.reloaPane(pane); + leftcontentPane.setBorder(BorderFactory.createEmptyBorder()); + } + @Override public Dimension getPreferredSize() { Dimension dim = super.getPreferredSize(); @@ -365,6 +376,17 @@ public class ChartDataFilterPane extends ThirdTabPane { return dim; } + + protected void layoutContentPane() { + super.layoutContentPane(); + leftcontentPane.setBorder(BorderFactory.createEmptyBorder()); + } + + public void reloaPane(JPanel pane){ + super.reloaPane(pane); + leftcontentPane.setBorder(BorderFactory.createEmptyBorder()); + } + @Override protected JPanel createContentPane() { this.setLayout(new BorderLayout()); diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java index e53a505345..ff1dd111f7 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java @@ -144,8 +144,8 @@ public class ChartTextAttrPane extends BasicPane { buttonPane.add(fontSizeComboBox, BorderLayout.CENTER); buttonPane.add(GUICoreUtils.createFlowPane(components1, FlowLayout.LEFT, LayoutConstants.HGAP_LARGE), BorderLayout.EAST); - - double[] columnSize = {p,f}; + double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; + double[] columnSize = {f,e}; double[] rowSize = {p, p, p}; diff --git a/designer_chart/src/com/fr/plugin/chart/column/VanChartColumnSeriesPane.java b/designer_chart/src/com/fr/plugin/chart/column/VanChartColumnSeriesPane.java index c3cc438251..ed83345825 100644 --- a/designer_chart/src/com/fr/plugin/chart/column/VanChartColumnSeriesPane.java +++ b/designer_chart/src/com/fr/plugin/chart/column/VanChartColumnSeriesPane.java @@ -45,11 +45,12 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane { protected JPanel getContentInPlotType() { double p = TableLayout.PREFERRED; double f = TableLayout.FILL; + double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; double[] columnSize = {f}; double[] rowSize = {p,p,p,p,p,p,p,p,p,p}; Component[][] components = new Component[][]{ new Component[]{getColorPane()}, - new Component[]{createSeriesStylePane(new double[]{p,p}, new double[]{p,f})}, + new Component[]{createSeriesStylePane(new double[]{p,p}, new double[]{f,e})}, new Component[]{createBorderPane()}, new Component[]{createStackedAndAxisPane()}, new Component[]{createTrendLinePane()}, @@ -81,12 +82,12 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane { new Component[]{new UILabel(Inter.getLocText("FR-Chart-Gap_Series")),seriesGap}, new Component[]{new UILabel(Inter.getLocText("FR-Chart-Gap_Category")),categoryGap}, }; - JPanel panel2 = TableLayoutHelper.createTableLayoutPane(components2, row, col); + JPanel panel2 = TableLayout4VanChartHelper.createGapTableLayoutPane(components2, row, col); Component[][] components3 = new Component[][]{ new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Filled_With_Image")),isFillWithImage}, }; - JPanel panel3 = TableLayoutHelper.createTableLayoutPane(components3, row, col); + JPanel panel3 = TableLayout4VanChartHelper.createGapTableLayoutPane(components3, row, col); JPanel panel = new JPanel(new BorderLayout(0, 4)); panel.add(panel1, BorderLayout.NORTH); diff --git a/designer_chart/src/com/fr/plugin/chart/designer/AbstractVanChartScrollPane.java b/designer_chart/src/com/fr/plugin/chart/designer/AbstractVanChartScrollPane.java index 4ca6938601..f050286727 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/AbstractVanChartScrollPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/AbstractVanChartScrollPane.java @@ -13,7 +13,7 @@ public abstract class AbstractVanChartScrollPane extends BasicScrollPane { protected void layoutContentPane() { leftcontentPane = createContentPane(); - leftcontentPane.setBorder(BorderFactory.createMatteBorder(0, 0, 0, 0, original)); + leftcontentPane.setBorder(BorderFactory.createMatteBorder(0, 5, 0, 5, original)); this.add(leftcontentPane); } @@ -21,8 +21,10 @@ public abstract class AbstractVanChartScrollPane extends BasicScrollPane { int width = parent.getWidth(); int height = parent.getHeight(); if (leftcontentPane.getPreferredSize().height > maxheight) { - leftcontentPane.setBounds(0, -beginY, width - scrollBar.getWidth(), height + beginY); - scrollBar.setBounds(width - scrollBar.getWidth() - 1, 0, scrollBar.getWidth(), height); + scrollBar.setBounds(width - scrollBar.getWidth() - 1, 0, 6, height); + leftcontentPane.setBounds(0, -beginY, width - 6, height + beginY); + leftcontentPane.setBorder(BorderFactory.createMatteBorder(0, 4, 0, 4, original)); + } else { leftcontentPane.setBounds(0, 0, width, height); } diff --git a/designer_chart/src/com/fr/plugin/chart/designer/TableLayout4VanChartHelper.java b/designer_chart/src/com/fr/plugin/chart/designer/TableLayout4VanChartHelper.java index e85ccdc6c3..0c95ca6fed 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/TableLayout4VanChartHelper.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/TableLayout4VanChartHelper.java @@ -18,39 +18,48 @@ public class TableLayout4VanChartHelper { private static final int SMALL_GAP = 20; public static final int EXPANDABLE_PANE_WIDTH =290; public static final int EXPANDABLE_PANE_HIGHT =24; + public static final double DESCRIPTION_AREA_WIDTH =60; + public static final double EDIT_AREA_WIDTH =155; + public static final double SECOND_EDIT_AREA_WIDTH =143; + public static final int COMPONENT_INTERVAL =12; + public static JPanel createExpandablePaneWithTitle(String title, JPanel panel) { return new UIExpandablePane(title, EXPANDABLE_PANE_WIDTH, EXPANDABLE_PANE_HIGHT, panel){ protected void setcontentPanelontentPanelBorder (){ - getContentPanel().setBorder(BorderFactory.createEmptyBorder(0 ,10, 0, 15)); + getContentPanel().setBorder(BorderFactory.createEmptyBorder(0 ,5, 0, 0)); } }; } public static JPanel createGapTableLayoutPane(String title, Component component) { + return createGapTableLayoutPane(title, component, EDIT_AREA_WIDTH); + } + + public static JPanel createGapTableLayoutPane(String title, Component component, double componentWidth) { double p = TableLayout.PREFERRED; double f = TableLayout.FILL; - double[] columnSize = {p, f}; + double[] columnSize = {f, componentWidth}; double[] rowSize = {p, p}; Component[][] components = new Component[][]{ new Component[]{null, null}, new Component[]{new UILabel(Inter.getLocText(title)), component}, }; - return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, SMALL_GAP, LayoutConstants.VGAP_LARGE); + return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, COMPONENT_INTERVAL, LayoutConstants.VGAP_LARGE); } public static JPanel createGapTableLayoutPane(Component[][] components, double[] rowSize, double[] columnSize) { - return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, SMALL_GAP, LayoutConstants.VGAP_LARGE); + return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, COMPONENT_INTERVAL, LayoutConstants.VGAP_LARGE); } public static JPanel createGapTableLayoutPane(Component[][] components, double[] rowSize, double[] columnSize, int[][] rowCount) { return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, - SMALL_GAP, LayoutConstants.VGAP_LARGE); + COMPONENT_INTERVAL, LayoutConstants.VGAP_LARGE); } /** diff --git a/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartAreaSeriesFillColorPane.java b/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartAreaSeriesFillColorPane.java index 32f5dc3e78..b4913e6415 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartAreaSeriesFillColorPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartAreaSeriesFillColorPane.java @@ -2,13 +2,16 @@ package com.fr.plugin.chart.designer.component; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.frpane.UINumberDragPane; +import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; +import com.fr.design.layout.TableLayoutHelper; import com.fr.general.Inter; import com.fr.plugin.chart.VanChartAttrHelper; import com.fr.plugin.chart.base.AttrAreaSeriesFillColorBackground; import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; import com.fr.plugin.chart.designer.component.background.VanChartMarkerBackgroundPane; +import javax.swing.*; import java.awt.*; /** @@ -16,6 +19,7 @@ import java.awt.*; */ public class VanChartAreaSeriesFillColorPane extends BasicPane { private static final long serialVersionUID = 9166866984438854779L; + private static final int PANE_WIDTH = 221; private VanChartMarkerBackgroundPane fillColorPane; private UINumberDragPane transparent; @@ -24,15 +28,28 @@ public class VanChartAreaSeriesFillColorPane extends BasicPane { double f = TableLayout.FILL; double[] row = {p,p}; double[] col = {f}; - fillColorPane = new VanChartMarkerBackgroundPane(); + fillColorPane = new VanChartMarkerBackgroundPane(){ + protected Component[][] getPaneComponents() { + return new Component[][]{ + new Component[]{null, null}, + new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_FillColor")), typeComboBox}, + new Component[]{null, centerPane}, + }; + } + }; transparent = new UINumberDragPane(0, 100); + JPanel transparentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-Chart_Alpha"), transparent); + Component[][] components = new Component[][]{ new Component[]{fillColorPane}, - new Component[]{transparent}, + new Component[]{transparentPane}, }; - this.add(TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col)); + JPanel contentPane = TableLayoutHelper.createTableLayoutPane(components, row, col); + contentPane.setPreferredSize(new Dimension(PANE_WIDTH, (int)contentPane.getPreferredSize().getHeight())); + + this.add(contentPane); } protected String title4PopupWindow(){ diff --git a/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartBeautyPane.java b/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartBeautyPane.java index e8c85515c5..c1683df4e2 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartBeautyPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartBeautyPane.java @@ -23,7 +23,8 @@ public class VanChartBeautyPane 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}; Component[][] components = new Component[][]{ new Component[]{new UILabel(Inter.getLocText("Plugin-Chart_Style")), styleBox}, 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 12b9ab7960..bae3cd5c35 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 @@ -18,7 +18,8 @@ public class VanChartFillStylePane extends ChartFillStylePane { protected JPanel getContentPane () { 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}; Component[][] components = new Component[][]{ new Component[]{new UILabel(Inter.getLocText("ColorMatch")),styleSelectBox}, diff --git a/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartLineTypePane.java b/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartLineTypePane.java index c536ea9a69..50693b474d 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartLineTypePane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartLineTypePane.java @@ -46,7 +46,8 @@ public class VanChartLineTypePane extends BasicPane { protected JPanel createContentPane(double p, double f) { double[] row = {p, p, p, p}; - double[] col = {p, f}; + double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; + double[] col = {f, e}; Component[][] components = new Component[][]{ new Component[]{null,null}, diff --git a/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartLineWidthPane.java b/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartLineWidthPane.java index dc9d3c1306..900bf72575 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartLineWidthPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartLineWidthPane.java @@ -3,6 +3,7 @@ package com.fr.plugin.chart.designer.component; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayoutHelper; import com.fr.general.Inter; +import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; import javax.swing.*; import java.awt.*; @@ -14,8 +15,9 @@ public class VanChartLineWidthPane extends VanChartLineTypePane { private static final long serialVersionUID = 4537158946119294689L; protected JPanel createContentPane(double p, double f) { - double[] row = {p, p}; - double[] col = {p,f}; + double[] row = {p, p, p}; + double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; + double[] col = {f, e}; Component[][] components = new Component[][]{ new Component[]{null,null}, diff --git a/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartMarkerPane.java b/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartMarkerPane.java index 73d852bea2..278e76f7af 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartMarkerPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartMarkerPane.java @@ -43,8 +43,6 @@ public class VanChartMarkerPane extends BasicPane { commonMarkerPane = createCommonMarkerPane(); imageMarkerPane = createImageMarkerPane(); - commonMarkerPane.setBorder(BorderFactory.createEmptyBorder(10,25,0,15)); - cardLayout = new CardLayout(); centerPane = new JPanel(cardLayout) { 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 bebe2af7c6..08d5c2f00b 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 @@ -60,7 +60,8 @@ public class VanChartTooltipContentPane extends BasicBeanPane radius = new UISpinner(0, 100, 0.5, 0); double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; + double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; + double d = TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH; double[] row = {p, p, p}; - double[] col = {p, f}; + double[] col = {d, e}; Component[][] components = getUseComponent(); - JPanel jPanel = TableLayoutHelper.createTableLayoutPane(components, row, col); - jPanel.setBorder(BorderFactory.createEmptyBorder(10,25,0,15)); + JPanel jPanel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); this.add(jPanel); } diff --git a/designer_chart/src/com/fr/plugin/chart/designer/component/marker/VanChartImageMarkerPane.java b/designer_chart/src/com/fr/plugin/chart/designer/component/marker/VanChartImageMarkerPane.java index a7541f3d88..6786cda846 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/component/marker/VanChartImageMarkerPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/component/marker/VanChartImageMarkerPane.java @@ -8,8 +8,9 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.backgroundpane.ImageBackgroundQuickPane; import com.fr.general.Inter; -import com.fr.plugin.chart.marker.type.MarkerType; import com.fr.plugin.chart.base.VanChartAttrMarker; +import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; +import com.fr.plugin.chart.marker.type.MarkerType; import com.fr.stable.Constants; import javax.swing.*; @@ -25,6 +26,7 @@ public class VanChartImageMarkerPane extends BasicBeanPane { public VanChartImageMarkerPane() { imageBackgroundPane = new ImageBackgroundQuickPane(false); + imageBackgroundPane.setPreferredSize(new Dimension((int)TableLayout4VanChartHelper.EDIT_AREA_WIDTH, (int)imageBackgroundPane.getPreferredSize().getHeight())); width = new UISpinner(0, 100, 0.5, 30); height = new UISpinner(0, 100, 0.5, 30); @@ -41,6 +43,7 @@ public class VanChartImageMarkerPane extends BasicBeanPane { JPanel sizePanel = TableLayoutHelper.createTableLayoutPane(components, row, col); JPanel panel = createContentPane(imageBackgroundPane, sizePanel); + panel.setBorder(BorderFactory.createEmptyBorder(0,72,0,0)); this.add(panel); } diff --git a/designer_chart/src/com/fr/plugin/chart/designer/other/AutoRefreshPane.java b/designer_chart/src/com/fr/plugin/chart/designer/other/AutoRefreshPane.java index 26772f45bf..3bd6f9b4df 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/other/AutoRefreshPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/other/AutoRefreshPane.java @@ -1,7 +1,7 @@ package com.fr.plugin.chart.designer.other; import com.fr.base.BaseUtils; -import com.fr.design.dialog.BasicScrollPane; +import com.fr.design.beans.BasicBeanPane; import com.fr.design.dialog.DialogActionListener; import com.fr.design.dialog.UIDialog; import com.fr.design.gui.ibutton.UIButton; @@ -29,7 +29,7 @@ import java.awt.event.ActionListener; /** * Created by hufan on 2016/12/30. */ -public class AutoRefreshPane extends BasicScrollPane { +public class AutoRefreshPane extends BasicBeanPane { private static final int P_W = 320; private static final int P_H = 460; @@ -50,9 +50,11 @@ public class AutoRefreshPane extends BasicScrollPane { public AutoRefreshPane(VanChart chart, boolean isLargeModel) { this.chart = chart; this.isLargeModel = isLargeModel; + this.setLayout(new BorderLayout()); + this.add(createContentPane()); } - @Override + protected JPanel createContentPane() { JPanel content = new JPanel(new BorderLayout(0, 6)); moreLabel = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Open"), Inter.getLocText("Plugin-ChartF_Close")}); @@ -83,12 +85,12 @@ public class AutoRefreshPane extends BasicScrollPane { double p = TableLayout.PREFERRED; double f = TableLayout.FILL; - double[] columnSize = {p, f}; + double[] columnSize = {p, f, 20}; double[] rowSize = {p, p}; Component[][] components = initComponent(jPanel); contentPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); - contentPane.setBorder(BorderFactory.createEmptyBorder(0,15,0,0)); + contentPane.setBorder(BorderFactory.createEmptyBorder(0,12,0,0)); content.add(moreLabelPane, BorderLayout.NORTH); content.add(contentPane, BorderLayout.CENTER); return content; @@ -97,8 +99,8 @@ public class AutoRefreshPane extends BasicScrollPane { protected Component[][] initComponent(JPanel autoTooltipPane){ return new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Time_Interval")), autoRefreshTime}, - new Component[]{autoTooltip, tooltipSet}, + new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Time_Interval")), autoRefreshTime, new UILabel(Inter.getLocText("Chart-Time_Seconds"))}, + new Component[]{autoTooltip,null, tooltipSet}, }; } @@ -130,12 +132,6 @@ public class AutoRefreshPane extends BasicScrollPane { }); } - protected void layoutContentPane() { - leftcontentPane = createContentPane(); - leftcontentPane.setBorder(BorderFactory.createEmptyBorder(10, 10, 0, 0)); - this.add(leftcontentPane); - } - public void checkRefreshEnable() { Boolean enable = moreLabel.getSelectedIndex() == 0; contentPane.setVisible(enable); @@ -159,6 +155,11 @@ public class AutoRefreshPane extends BasicScrollPane { } + @Override + public RefreshMoreLabel updateBean() { + return null; + } + protected void populateAutoRefreshTime() { VanChartPlot plot = (VanChartPlot)chart.getPlot(); if(plot.isSupportAutoRefresh()) { diff --git a/designer_chart/src/com/fr/plugin/chart/designer/other/AutoRefreshPaneWithoutTooltip.java b/designer_chart/src/com/fr/plugin/chart/designer/other/AutoRefreshPaneWithoutTooltip.java index 40d8e74c8e..a74af70eeb 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/other/AutoRefreshPaneWithoutTooltip.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/other/AutoRefreshPaneWithoutTooltip.java @@ -19,7 +19,7 @@ public class AutoRefreshPaneWithoutTooltip extends AutoRefreshPane { protected Component[][] initComponent(JPanel autoTooltipPane){ return new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Time_Interval")), getAutoRefreshTime()} + new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Time_Interval")), getAutoRefreshTime(),new UILabel(Inter.getLocText("Chart-Time_Seconds"))} }; } diff --git a/designer_chart/src/com/fr/plugin/chart/designer/other/VanChartInteractivePane.java b/designer_chart/src/com/fr/plugin/chart/designer/other/VanChartInteractivePane.java index 2a11469963..b800c206e5 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/other/VanChartInteractivePane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/other/VanChartInteractivePane.java @@ -89,7 +89,8 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { protected JPanel getInteractivePane(VanChartPlot plot){ 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,p,p}; @@ -124,10 +125,14 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_From")), from}, new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_To")), to}, }; - changeEnablePane = TableLayoutHelper.createTableLayoutPane(components, row, col); - changeEnablePane.setBorder(BorderFactory.createEmptyBorder(10,15,0,0)); - zoomTypePane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_ZoomType"), zoomType); - zoomTypePane.setBorder(BorderFactory.createEmptyBorder(0,15,0,0)); + + double f = TableLayout.FILL; + double e = TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH; + double[] columnSize = {f, e}; + changeEnablePane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, columnSize); + changeEnablePane.setBorder(BorderFactory.createEmptyBorder(10,12,0,0)); + zoomTypePane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_ZoomType"), zoomType, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); + zoomTypePane.setBorder(BorderFactory.createEmptyBorder(0,12,0,0)); JPanel panel = createZoomPaneContent(zoomWidgetPane, zoomGesturePane, changeEnablePane, zoomTypePane, plot); zoomWidget.addActionListener(new ActionListener() { @Override @@ -196,9 +201,9 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { protected Component[][] createToolBarComponentsWithOutSort() { return new Component[][]{ - new Component[]{exportImages, null}, - new Component[]{fullScreenDisplay, null}, - new Component[]{collapse, null} + new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Content")), exportImages}, + new Component[]{null, fullScreenDisplay}, + new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_layout")),collapse} }; } diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/VanChartPlotLegendPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/VanChartPlotLegendPane.java index b9d1f95986..a7be4fbefe 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/VanChartPlotLegendPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/VanChartPlotLegendPane.java @@ -107,7 +107,8 @@ public class VanChartPlotLegendPane extends BasicPane { 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,p,p,p}; Component[][] components = new Component[][]{ @@ -131,7 +132,8 @@ public class VanChartPlotLegendPane extends BasicPane { 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,p,p,p,p}; Component[][] components = new Component[][]{ @@ -230,8 +232,8 @@ public class VanChartPlotLegendPane extends BasicPane { JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_AreaSize"),limitSize); - maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_MaxProportion"),maxProportion); - maxProportionPane.setBorder(BorderFactory.createEmptyBorder(0,15,0,0)); + maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_MaxProportion"),maxProportion,TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); + maxProportionPane.setBorder(BorderFactory.createEmptyBorder(0,12,0,0)); JPanel panel = new JPanel(new BorderLayout()); panel.add(limitSizePane, BorderLayout.NORTH); panel.add(maxProportionPane, BorderLayout.CENTER); @@ -250,7 +252,8 @@ public class VanChartPlotLegendPane extends BasicPane { 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}; Component[][] components = new Component[][]{ new Component[]{null,null}, diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/VanChartTitlePane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/VanChartTitlePane.java index f8947ad879..7a2f3be8ad 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/VanChartTitlePane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/VanChartTitlePane.java @@ -106,11 +106,13 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane { double p = TableLayout.PREFERRED; double f = TableLayout.FILL; - double[] columnSize = {p, f}; + double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; + double[] columnSize = {p, f}; + double[] column = {f,e}; double[] rowSize = {p,p,p,p,p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{createTitleContentPane(new double[]{p,p,p},columnSize),null}, - new Component[]{createTitlePositionPane(new double[]{p,p,p},columnSize),null}, + new Component[]{createTitleContentPane(new double[]{p,p,p},column),null}, + new Component[]{createTitlePositionPane(new double[]{p,p,p},column),null}, new Component[]{createTitleStylePane(),null}, new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Background"), backgroundPane),null}, new Component[]{createDisplayStrategy(),null} @@ -165,8 +167,8 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane { limitSize = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Limit"),Inter.getLocText("Plugin-ChartF_NotLimit")}); JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_AreaSize"),limitSize); - maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_MaxProportion"),maxProportion); - maxProportionPane.setBorder(BorderFactory.createEmptyBorder(0,15,0,0)); + maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_MaxProportion"),maxProportion, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); + maxProportionPane.setBorder(BorderFactory.createEmptyBorder(0,12,0,0)); JPanel panel = new JPanel(new BorderLayout()); panel.add(limitSizePane, BorderLayout.NORTH); panel.add(maxProportionPane, BorderLayout.CENTER); 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 28269b8662..a03915c4c3 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 @@ -73,6 +73,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { protected FormatPane valueFormat; protected JPanel centerPane; private VanChartHtmlLabelPane htmlLabelPane; + private JPanel labelGapValuePane; public VanChartBaseAxisPane(){ this(true); @@ -95,7 +96,8 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { 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, p, p, p,p}; Component[][] components = new Component[][]{ new Component[]{createTitlePane(new double[]{p, p, p, p, p, p}, columnSize, isXAxis), null}, @@ -161,11 +163,14 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { Component[][] gapComponents = new Component[][]{ new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_TextRotation")), labelTextRotation}, new Component[]{new UILabel(Inter.getLocText("ChartF-Label_Interval")), labelGapStyle}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Axis_labelInterval")),labelGapValue}, }; - JPanel gapPanel = TableLayoutHelper.createTableLayoutPane(gapComponents, row, col); + JPanel panel = TableLayoutHelper.createTableLayoutPane(gapComponents, row, col); + labelGapValuePane= TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText(" "),labelGapValue); + JPanel gapPanel = new JPanel(new BorderLayout()); + gapPanel.add(panel, BorderLayout.CENTER); + gapPanel.add(labelGapValuePane, BorderLayout.SOUTH); - Component[][] components = new Component[][]{ + Component[][] components = new Component[][]{ new Component[]{labelTextAttrPane, null}, new Component[]{gapPanel,null}, }; @@ -343,8 +348,8 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { } protected void checkLabelGapValuePane() { - if(labelGapValue != null && labelGapStyle != null){ - labelGapValue.setEnabled(labelGapStyle.getSelectedIndex() == 1); + if(labelGapValuePane != null && labelGapStyle != null){ + labelGapValuePane.setVisible(labelGapStyle.getSelectedIndex() == 1); } } 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 d1da53d682..b31207568c 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 @@ -58,11 +58,12 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane { 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,p,p,p,p,p,p,p,p,p,p}; Component[][] components = new Component[][]{ new Component[]{createTitlePane(new double[]{p, p, p, p, p,p}, columnSize, isXAxis),null}, - new Component[]{createLabelPane(new double[]{p, p, p}, columnSize),null}, + new Component[]{createLabelPane(new double[]{p, p}, columnSize),null}, new Component[]{createValueDefinition(),null}, new Component[]{createLineStylePane(new double[]{p, p,p,p,p}, columnSize),null}, new Component[]{createAxisPositionPane(new double[]{p, p}, columnSize, isXAxis),null}, 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 ed9f11c529..9372f28fd0 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 @@ -41,11 +41,12 @@ public class VanChartValueAxisPane extends VanChartBaseAxisPane { 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,p,p,p,p,p,p,p,p,p,p}; Component[][] components = new Component[][]{ new Component[]{createTitlePane(new double[]{p, p, p, p, p, p}, columnSize, isXAxis), null}, - new Component[]{createLabelPane(new double[]{p, p, p}, columnSize), null}, + new Component[]{createLabelPane(new double[]{p, p}, columnSize), null}, new Component[]{createMinMaxValuePane(new double[]{p, p}, columnSize), null}, new Component[]{createLineStylePane(new double[]{p, p, p, p, p}, columnSize), null}, new Component[]{createAxisPositionPane(new double[]{p, p, p}, columnSize, isXAxis), null}, diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java index 7df8f9bfbf..d4ef127d41 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java @@ -53,7 +53,7 @@ public class VanChartGaugeDetailAxisPane extends VanChartValueAxisPane{ switch (gaugeStyle){ case THERMOMETER: return new Component[][]{ - new Component[]{createLabelPane(new double[]{p, p, p}, columnSize), null}, + new Component[]{createLabelPane(new double[]{p, p}, columnSize), null}, new Component[]{createValueDefinition(), null}, new Component[]{createTickColorPane(new double[]{p, p, p}, new double[]{p, f}), null}, new Component[]{createValueStylePane()}, diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/radar/VanChartRadarXAxisPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/radar/VanChartRadarXAxisPane.java index 89d79bcce0..02075c8c50 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/axis/radar/VanChartRadarXAxisPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/axis/radar/VanChartRadarXAxisPane.java @@ -4,6 +4,7 @@ import com.fr.design.gui.ilable.UILabel; 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.designer.style.axis.VanChartBaseAxisPane; import javax.swing.*; @@ -20,10 +21,11 @@ public class VanChartRadarXAxisPane extends VanChartBaseAxisPane { 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,p,p}; Component[][] components = new Component[][]{ - new Component[]{createLabelPane(new double[]{p, p, p}, columnSize),null}, + new Component[]{createLabelPane(new double[]{p, p}, columnSize),null}, new Component[]{createLineStylePane(new double[]{p, p, p, p}, columnSize),null}, new Component[]{createValueStylePane(),null}, }; 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 789c34ee5c..96b30a4b41 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 @@ -30,10 +30,11 @@ public class VanChartRadarYAxisPane extends VanChartValueAxisPane { 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, p, p, p, p}; Component[][] components = new Component[][]{ - new Component[]{createLabelPane(new double[]{p, p, p}, columnSize), null}, + new Component[]{createLabelPane(new double[]{p, p}, columnSize), null}, new Component[]{createMinMaxValuePane(new double[]{p, p, p}, columnSize), null}, new Component[]{createLineStylePane(new double[]{p, p, p, p}, columnSize), null}, new Component[]{createValueStylePane(), null}, diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/background/VanChartAreaPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/background/VanChartAreaPane.java index 0d98d8ab15..3388596ff1 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/background/VanChartAreaPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/background/VanChartAreaPane.java @@ -1,17 +1,19 @@ package com.fr.plugin.chart.designer.style.background; -import java.util.ArrayList; -import java.util.List; - -import com.fr.chart.chartattr.*; +import com.fr.chart.chartattr.Plot; import com.fr.design.gui.frpane.AbstractAttrNoScrollPane; import com.fr.design.mainframe.chart.PaneTitleConstants; -import com.fr.design.mainframe.chart.gui.style.legend.AutoSelectedPane; import com.fr.design.mainframe.chart.gui.style.ThirdTabPane; +import com.fr.design.mainframe.chart.gui.style.legend.AutoSelectedPane; import com.fr.general.ComparatorUtils; import com.fr.plugin.chart.designer.style.VanChartStylePane; import com.fr.plugin.chart.vanchart.VanChart; +import javax.swing.*; +import java.awt.*; +import java.util.ArrayList; +import java.util.List; + /** * 属性表, 图表样式-背景界面. */ @@ -27,6 +29,20 @@ public class VanChartAreaPane extends ThirdTabPane implements AutoSele super(plot, parent); } + + protected void initLayout() { + this.setLayout(new BorderLayout()); + if (!paneList.isEmpty()) { + JPanel pane = new JPanel(new FlowLayout(FlowLayout.LEADING, 0, 0)); + if (nameArray.length > 1) { + pane.add(tabPane); + this.add(pane, BorderLayout.NORTH); + } + } + centerPane.setBorder(BorderFactory.createEmptyBorder(10,0,0,0)); + this.add(centerPane, BorderLayout.CENTER); + } + /** * 界面 使用标题 * @return 标题 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 d29726d019..5b91538a73 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 @@ -43,13 +43,14 @@ public class VanChartAxisAreaPane extends BasicBeanPane { protected void initComponents() { double p = TableLayout.PREFERRED; double f = TableLayout.FILL; + double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; double[] columnSize = {f}; double[] rowSize = {p, p, p}; Component[][] components = new Component[][]{ - new Component[]{createGridLinePane(new double[]{p, p, p}, new double[]{p, f})}, + new Component[]{createGridLinePane(new double[]{p, p, p}, new double[]{f, e})}, new Component[]{createAlertLinePane()}, - new Component[]{createIntervalPane(new double[]{p, p, p, p}, new double[]{p, f})}, + new Component[]{createIntervalPane(new double[]{p, p, p, p}, new double[]{f, e})}, }; JPanel panel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); this.setLayout(new BorderLayout()); diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/label/VanChartPlotLabelDetailPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/label/VanChartPlotLabelDetailPane.java index 41b0f5a76c..1e507415c2 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/label/VanChartPlotLabelDetailPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/label/VanChartPlotLabelDetailPane.java @@ -43,6 +43,8 @@ public class VanChartPlotLabelDetailPane extends BasicPane { protected ColorSelectBox backgroundColor; + private JPanel tractionLinePane; + protected VanChartStylePane parent; public VanChartPlotLabelDetailPane(Plot plot, VanChartStylePane parent) { @@ -61,7 +63,8 @@ public class VanChartPlotLabelDetailPane extends BasicPane { private JPanel createLabelPane(Plot plot) { double p = TableLayout.PREFERRED; double f = TableLayout.FILL; - double[] columnSize = {p, f}; + double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; + double[] columnSize = {f, e}; double[] rowSize = getLabelPaneRowSize(plot, p); Component[][] components = getLabelPaneComponents(plot, p, columnSize); @@ -111,20 +114,22 @@ public class VanChartPlotLabelDetailPane extends BasicPane { autoAdjust = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_On"), Inter.getLocText("Plugin-ChartF_Off")}, new Boolean[]{true, false}); - Component[][] comps = new Component[3][2]; + Component[][] comps = new Component[2][2]; comps[0] = new Component[]{null,null}; comps[1] = new Component[]{new UILabel(Inter.getLocText("Chart-Layout_Position"), SwingConstants.LEFT), position}; - + JPanel panel =new JPanel(new BorderLayout()); + panel.add(getLabelPositionPane(comps,row,col),BorderLayout.CENTER); if(plot.isSupportLeadLine()){ tractionLine = new UIToggleButton(Inter.getLocText("ChartF-Show_GuidLine")); - comps[2] = new Component[]{null,tractionLine}; + tractionLinePane = TableLayout4VanChartHelper.createGapTableLayoutPane("",tractionLine); + panel.add(tractionLinePane, BorderLayout.SOUTH); initPositionListener(); } else if(PlotFactory.plotAutoAdjustLabelPosition(plot)){ - comps[2]= new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Auto_Adjust"), SwingConstants.LEFT),autoAdjust}; + panel.add(TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Auto_Adjust"),autoAdjust), BorderLayout.SOUTH); } - return getLabelPositionPane(comps,row,col); + return panel; } return new JPanel(); } @@ -207,7 +212,7 @@ public class VanChartPlotLabelDetailPane extends BasicPane { checkPositionEnabled(); } private void checkPositionEnabled() { - tractionLine.setEnabled(position.getSelectedItem() == Constants.OUTSIDE); + tractionLinePane.setVisible(position.getSelectedItem() == Constants.OUTSIDE); } public void populate(AttrLabelDetail detail) { diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java index 338d78ca0d..c7d9837f5e 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java @@ -109,7 +109,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP JPanel panel = new JPanel(new BorderLayout()); setColorPaneContent(panel); JPanel colorPane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Color"), panel); - panel.setBorder(BorderFactory.createEmptyBorder(10,10,0,15)); + panel.setBorder(BorderFactory.createEmptyBorder(10,5,0,0)); return colorPane; } @@ -144,7 +144,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP //填充颜色 protected JPanel createAreaFillColorPane() { areaSeriesFillColorPane = new VanChartAreaSeriesFillColorPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_FillColor"), areaSeriesFillColorPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Chart_Area"), areaSeriesFillColorPane); } //边框（默认没有圆角） diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/tooltip/VanChartPlotTooltipPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/tooltip/VanChartPlotTooltipPane.java index b57b8340c8..305635588e 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/tooltip/VanChartPlotTooltipPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/tooltip/VanChartPlotTooltipPane.java @@ -80,7 +80,8 @@ public class VanChartPlotTooltipPane extends BasicPane { 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,p,p,p,p,p}; Component[][] components = createComponents(plot); @@ -115,21 +116,15 @@ public class VanChartPlotTooltipPane extends BasicPane { }; } }; - UILabel text = new UILabel(Inter.getLocText("Plugin-Chart_Character"), SwingConstants.LEFT); - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] columnSize = {p, f}; - double[] rowSize = {p, p, p}; - Component[][] components = new Component[][]{ - new Component[]{null, null}, - new Component[]{text, style}, - new Component[]{null, textFontPane}, - }; + + JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-Chart_Character"), style); + JPanel panel1 = new JPanel(new BorderLayout()); + panel1.add(panel, BorderLayout.CENTER); + panel1.add(textFontPane, BorderLayout.SOUTH); initStyleListener(); - JPanel panel = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Designer-Widget_Style"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Designer-Widget_Style"), panel1); } @@ -148,7 +143,8 @@ public class VanChartPlotTooltipPane extends BasicPane { Inter.getLocText("Plugin-ChartF_NotFollowMouse")}); 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}; Component[][] components = new Component[3][2]; components[0] = new Component[]{null,null}; @@ -186,7 +182,7 @@ public class VanChartPlotTooltipPane extends BasicPane { } private void checkStyleUse() { - textFontPane.setEnabled(style.getSelectedIndex() == 1); + textFontPane.setVisible(style.getSelectedIndex() == 1); } protected AttrTooltip getAttrTooltip() { diff --git a/designer_chart/src/com/fr/plugin/chart/gantt/designer/style/axis/GanttAxisStylePane.java b/designer_chart/src/com/fr/plugin/chart/gantt/designer/style/axis/GanttAxisStylePane.java index d31afbc6f1..c1b875c339 100644 --- a/designer_chart/src/com/fr/plugin/chart/gantt/designer/style/axis/GanttAxisStylePane.java +++ b/designer_chart/src/com/fr/plugin/chart/gantt/designer/style/axis/GanttAxisStylePane.java @@ -8,6 +8,7 @@ import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ColorSelectBoxWithOutTransparent; import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane; import com.fr.general.Inter; +import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; import com.fr.plugin.chart.gantt.attr.GanttAxisStyleAttr; import javax.swing.*; @@ -28,13 +29,14 @@ public class GanttAxisStylePane extends BasicBeanPane { double p = TableLayout.PREFERRED; double f = TableLayout.FILL; + double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; double[] row = {p,p,p}; - double[] col = {p, f}; + double[] col = {f, e}; Component[][] components = new Component[][]{ new Component[]{textAttrPane, null}, new Component[]{new UILabel(Inter.getLocText("FR-Chart-Color_Color")), colorSelectBox4button}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Alpha"), SwingConstants.RIGHT), transparent} + new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Alpha")), transparent} }; JPanel content = TableLayoutHelper.createTableLayoutPane(components, row, col); diff --git a/designer_chart/src/com/fr/plugin/chart/gantt/designer/style/axis/GanttTimeAxisPane.java b/designer_chart/src/com/fr/plugin/chart/gantt/designer/style/axis/GanttTimeAxisPane.java index b955bf11f7..e45dac4c8a 100644 --- a/designer_chart/src/com/fr/plugin/chart/gantt/designer/style/axis/GanttTimeAxisPane.java +++ b/designer_chart/src/com/fr/plugin/chart/gantt/designer/style/axis/GanttTimeAxisPane.java @@ -71,17 +71,18 @@ public class GanttTimeAxisPane extends AbstractVanChartScrollPane { double p = TableLayout.PREFERRED; double f = TableLayout.FILL; - double[] row = {p,p,p}; - double[] col = {p, f}; + double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; + double[] row = {p, p, p, p}; + double[] col = {f, e}; Component[][] components = new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Time_Zoom"), SwingConstants.RIGHT), timeZoom}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Initial_Level"), SwingConstants.RIGHT), initialLevel}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Weekend_Tooltip"), SwingConstants.RIGHT), weekendTooltip} + new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Time_Zoom")), timeZoom}, + new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Initial_Level")), initialLevel}, + new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Weekend_Tooltip")), weekendTooltip} }; - JPanel panel = TableLayoutHelper.createTableLayoutPane(components, row, col); + JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Condition_Config"),panel); } diff --git a/designer_chart/src/com/fr/plugin/chart/gantt/designer/style/series/VanChartGanttCommonMarkerPane.java b/designer_chart/src/com/fr/plugin/chart/gantt/designer/style/series/VanChartGanttCommonMarkerPane.java index 616fff1cb2..8e0250e271 100644 --- a/designer_chart/src/com/fr/plugin/chart/gantt/designer/style/series/VanChartGanttCommonMarkerPane.java +++ b/designer_chart/src/com/fr/plugin/chart/gantt/designer/style/series/VanChartGanttCommonMarkerPane.java @@ -5,9 +5,9 @@ import com.fr.chart.chartglyph.Marker; import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.chart.gui.ColorSelectBoxWithOutTransparent; import com.fr.general.Inter; -import com.fr.plugin.chart.marker.type.MarkerType; import com.fr.plugin.chart.base.VanChartAttrMarker; import com.fr.plugin.chart.designer.component.marker.VanChartCommonMarkerPane; +import com.fr.plugin.chart.marker.type.MarkerType; import java.awt.*; @@ -27,8 +27,8 @@ public class VanChartGanttCommonMarkerPane extends VanChartCommonMarkerPane { colorSelect = new ColorSelectBoxWithOutTransparent(100); return new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Shape") + ":"), getMarkerPane()}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Color_Color") + ":"), colorSelect} + new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Shape")), getMarkerPane()}, + new Component[]{new UILabel(Inter.getLocText("FR-Chart-Color_Color")), colorSelect} }; } diff --git a/designer_chart/src/com/fr/plugin/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java b/designer_chart/src/com/fr/plugin/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java index 949024e683..cecf05e6c0 100644 --- a/designer_chart/src/com/fr/plugin/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java +++ b/designer_chart/src/com/fr/plugin/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java @@ -58,12 +58,8 @@ public class VanChartGanttSeriesPane extends VanChartAbstractPlotSeriesPane { private JPanel createGanntStylePane(){ seriesNewLine = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Open"), Inter.getLocText("Plugin-ChartF_Close")}); - JPanel panel = new JPanel(new BorderLayout(5, 0)); - panel.add(new UILabel(Inter.getLocText("Plugin-ChartF_Series_New_Line")), BorderLayout.WEST); - panel.add(seriesNewLine, BorderLayout.CENTER); - + JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Series_New_Line"),seriesNewLine); JPanel ganntStylePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Style"), panel); - panel.setBorder(BorderFactory.createEmptyBorder(10,10,0,15)); return ganntStylePane; } @@ -73,17 +69,18 @@ public class VanChartGanttSeriesPane extends VanChartAbstractPlotSeriesPane { double p = TableLayout.PREFERRED; double f = TableLayout.FILL; + double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; + double[] col = {f, e}; double[] row = {p,p,p}; - double[] col = {p,f}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_LineStyle")+":"), lineWidth}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Color_Color")+":"), colorSelect} + new Component[]{null, null}, + new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_LineStyle")), lineWidth}, + new Component[]{new UILabel(Inter.getLocText("FR-Chart-Color_Color")), colorSelect} }; - JPanel panel = TableLayoutHelper.createTableLayoutPane(components, row, col); + JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); JPanel linkLinePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Link_Line"), panel); - panel.setBorder(BorderFactory.createEmptyBorder(10,10,0,15)); return linkLinePane; } diff --git a/designer_chart/src/com/fr/plugin/chart/pie/RadiusCardLayoutPane.java b/designer_chart/src/com/fr/plugin/chart/pie/RadiusCardLayoutPane.java index 53d33788b4..b63ebeab60 100644 --- a/designer_chart/src/com/fr/plugin/chart/pie/RadiusCardLayoutPane.java +++ b/designer_chart/src/com/fr/plugin/chart/pie/RadiusCardLayoutPane.java @@ -24,9 +24,6 @@ public class RadiusCardLayoutPane extends BasicBeanPane { private static final double MIN_RADIUS = 0; private static final double MAX_RADIUS = Double.MAX_VALUE; - //半径距离左边框的距离 - private static final int RADIUS_LEFT_MARGIN = 53; - private UIComboBox radiusType;//半径类型 private JPanel radiusContent;//半径的布局界面 private UISpinner radius;//半径值 @@ -45,7 +42,7 @@ public class RadiusCardLayoutPane extends BasicBeanPane { radiusContent = new JPanel(new BorderLayout()); radiusContent.add(radius, BorderLayout.CENTER); - radiusContent.setBorder(BorderFactory.createEmptyBorder(0, RADIUS_LEFT_MARGIN, 0, 0)); + radiusContent.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); nullPane = new JPanel(); diff --git a/designer_chart/src/com/fr/plugin/chart/pie/VanChartPieSeriesPane.java b/designer_chart/src/com/fr/plugin/chart/pie/VanChartPieSeriesPane.java index d84f3b2031..c0377baa3b 100644 --- a/designer_chart/src/com/fr/plugin/chart/pie/VanChartPieSeriesPane.java +++ b/designer_chart/src/com/fr/plugin/chart/pie/VanChartPieSeriesPane.java @@ -37,11 +37,12 @@ public class VanChartPieSeriesPane extends VanChartAbstractPlotSeriesPane { protected JPanel getContentInPlotType() { double p = TableLayout.PREFERRED; double f = TableLayout.FILL; + double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; double[] columnSize = {f}; - double[] rowSize = {p,p,p,p,p}; + double[] rowSize = {p,p,p,p,p,p}; Component[][] components = new Component[][]{ new Component[]{getColorPane()}, - new Component[]{createSeriesStylePane(rowSize, new double[]{p,f})}, + new Component[]{createSeriesStylePane(rowSize, new double[]{f, e})}, new Component[]{createBorderPane()}, }; diff --git a/designer_chart/src/com/fr/plugin/chart/range/component/SectionLegendPane.java b/designer_chart/src/com/fr/plugin/chart/range/component/SectionLegendPane.java index 416f2e414f..fcaf28e76f 100644 --- a/designer_chart/src/com/fr/plugin/chart/range/component/SectionLegendPane.java +++ b/designer_chart/src/com/fr/plugin/chart/range/component/SectionLegendPane.java @@ -33,7 +33,7 @@ public class SectionLegendPane extends JPanel{ double p = TableLayout.PREFERRED; double f = TableLayout.FILL; double[] col = {f}; - double[] row = {p, p, p, p}; + double[] row = {p, p, p}; Component[][] components = new Component[][]{ new Component[]{null}, new Component[]{intervalConfigPaneWithTitle}, diff --git a/designer_chart/src/com/fr/plugin/chart/scatter/component/VanChartScatterLineTypePane.java b/designer_chart/src/com/fr/plugin/chart/scatter/component/VanChartScatterLineTypePane.java index 36c51e05d8..55f0cf9d40 100644 --- a/designer_chart/src/com/fr/plugin/chart/scatter/component/VanChartScatterLineTypePane.java +++ b/designer_chart/src/com/fr/plugin/chart/scatter/component/VanChartScatterLineTypePane.java @@ -5,6 +5,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayoutHelper; import com.fr.general.Inter; import com.fr.plugin.chart.base.VanChartAttrLine; +import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; import com.fr.plugin.chart.designer.component.VanChartLineTypePane; import com.fr.plugin.chart.type.LineStyle; import com.fr.stable.Constants; @@ -27,8 +28,8 @@ public class VanChartScatterLineTypePane extends VanChartLineTypePane { @Override protected JPanel createContentPane(double p, double f) { double[] row = {p,p,p}; - double[] col = {p,f}; - + double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; + double[] col = {f, e}; Component[][] components = new Component[][]{ new Component[]{null,null}, new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_LineStyle")), lineWidth}, diff --git a/designer_chart/src/com/fr/plugin/chart/wordcloud/designer/style/VanChartWordCloudSeriesPane.java b/designer_chart/src/com/fr/plugin/chart/wordcloud/designer/style/VanChartWordCloudSeriesPane.java index d7cf3f8837..2346b62f32 100644 --- a/designer_chart/src/com/fr/plugin/chart/wordcloud/designer/style/VanChartWordCloudSeriesPane.java +++ b/designer_chart/src/com/fr/plugin/chart/wordcloud/designer/style/VanChartWordCloudSeriesPane.java @@ -3,6 +3,7 @@ package com.fr.plugin.chart.wordcloud.designer.style; import com.fr.base.Utils; import com.fr.base.background.ImageBackground; import com.fr.chart.chartattr.Plot; +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.gui.ispinner.UISpinner; @@ -21,6 +22,8 @@ import com.fr.plugin.chart.wordcloud.VanChartWordCloudPlot; import javax.swing.*; import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; @@ -31,11 +34,11 @@ public class VanChartWordCloudSeriesPane extends VanChartAbstractPlotSeriesPane private static final String AUTO_FONT_SIZE = Inter.getLocText("Plugin-ChartF_Auto"); private static final String CUSTOM_FONT_SIZE = Inter.getLocText("Plugin-ChartF_Define_Size"); private static final double MAX_ROTATION = 90; - private static final double LABEL_SIZE = 48; + private static final double LABEL_SIZE = 65; private UIComboBox fontNameComboBox; private UISpinner minRotation; private UISpinner maxRotation; - private UIComboBox defineFontSize; + private UIButtonGroup defineFontSize; private JPanel fontPanel; private UISpinner minFontSize; private UISpinner maxFontSize; @@ -69,13 +72,14 @@ public class VanChartWordCloudSeriesPane extends VanChartAbstractPlotSeriesPane //设置色彩面板内容 protected void setColorPaneContent (JPanel panel) { panel.add(getFillStylePane(), BorderLayout.NORTH); - panel.add(createAlphaPane(), BorderLayout.CENTER); } private JPanel createWordCloudStylePane(){ double labelSize = LABEL_SIZE; double p = TableLayout.PREFERRED; double f = TableLayout.FILL; + double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; + double[] centerC = {labelSize,f,p,f}; double[] centerR = {p}; @@ -87,17 +91,17 @@ public class VanChartWordCloudSeriesPane extends VanChartAbstractPlotSeriesPane new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Rotation_Angle")), minRotation, new UILabel("-"), maxRotation}, }; - JPanel centerPanel = TableLayoutHelper.createTableLayoutPane(centerComps,centerR,centerC); + JPanel centerPanel = TableLayout4VanChartHelper.createGapTableLayoutPane(centerComps,centerR,centerC); - double[] northC = {labelSize,f}; + double[] northC = {f, e}; double[] northR = {p,p}; fontNameComboBox = new UIComboBox(Utils.getAvailableFontFamilyNames4Report()); - defineFontSize = new UIComboBox(new String[]{AUTO_FONT_SIZE, CUSTOM_FONT_SIZE}); + defineFontSize = new UIButtonGroup(new String[]{AUTO_FONT_SIZE, CUSTOM_FONT_SIZE}); Component[][] northComps = new Component[][]{ new Component[]{new UILabel(Inter.getLocText("FR-Designer_Font")), fontNameComboBox}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Font-Size")), defineFontSize } + new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Custom")), defineFontSize } }; - JPanel northPanel = TableLayoutHelper.createTableLayoutPane(northComps,northR,northC); + JPanel northPanel = TableLayout4VanChartHelper.createGapTableLayoutPane(northComps,northR,northC); minFontSize = new UISpinner(0,Double.MAX_VALUE,1,10); maxFontSize = new UISpinner(0,Double.MAX_VALUE,1,100); @@ -105,7 +109,7 @@ public class VanChartWordCloudSeriesPane extends VanChartAbstractPlotSeriesPane new Component[]{null, minFontSize, new UILabel("-"), maxFontSize}, }; - fontPanel = TableLayoutHelper.createTableLayoutPane(fontComps,centerR,centerC); + fontPanel = TableLayout4VanChartHelper.createGapTableLayoutPane(fontComps,centerR,centerC); double[] columnSize = {f}; double[] rowSize = {p, p, p, p}; @@ -117,9 +121,9 @@ public class VanChartWordCloudSeriesPane extends VanChartAbstractPlotSeriesPane }; - defineFontSize.addItemListener(new ItemListener() { + defineFontSize.addActionListener(new ActionListener() { @Override - public void itemStateChanged(ItemEvent e) { + public void actionPerformed(ActionEvent e) { checkFontPane(); } }); From 7b7c2fed3b6e0cbda84b8b5dfc46597300ec6c48 Mon Sep 17 00:00:00 2001 From: kerry Date: Mon, 28 Aug 2017 10:20:31 +0800 Subject: [PATCH 5/9] =?UTF-8?q?REPORT-3734=20[9.0=E4=B8=80=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92]=E8=AE=BE=E8=AE=A1=E5=99=A8=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6=E7=AE=A1=E7=90=86=E6=89=93=E4=B8=8D=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/widget/ValueWidgetPane.java | 23 ++++++++++++++---- .../src/com/fr/design/widget/WidgetPane.java | 24 +++++++++++-------- .../design/gui/controlpane/UIControlPane.java | 4 ++-- 3 files changed, 34 insertions(+), 17 deletions(-) diff --git a/designer/src/com/fr/design/widget/ValueWidgetPane.java b/designer/src/com/fr/design/widget/ValueWidgetPane.java index 2914e100d5..a588a8151e 100644 --- a/designer/src/com/fr/design/widget/ValueWidgetPane.java +++ b/designer/src/com/fr/design/widget/ValueWidgetPane.java @@ -1,9 +1,11 @@ package com.fr.design.widget; -import javax.swing.JPanel; +import javax.swing.*; 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.design.mainframe.ElementCasePane; import com.fr.design.mainframe.widget.editors.WidgetValueEditor; import com.fr.form.ui.DataControl; @@ -11,6 +13,8 @@ import com.fr.form.ui.Widget; import com.fr.form.ui.WidgetValue; import com.fr.general.Inter; +import java.awt.*; + public class ValueWidgetPane extends WidgetPane { private JPanel widgetValuePane; private WidgetValueEditor widgetValueEditor; @@ -19,15 +23,24 @@ public class ValueWidgetPane extends WidgetPane { @Override protected void initComponents(ElementCasePane pane) { super.initComponents(pane); - + } + + public JPanel initNorthPane(){ label = new UILabel(" " + Inter.getLocText(new String[]{"Widget", "Value"})+ ":"); - northPane.add(label); label.setVisible(false); widgetValuePane = new JPanel(); widgetValuePane.setLayout(FRGUIPaneFactory.createBorderLayout()); - northPane.add(widgetValuePane); + double p = TableLayout.PREFERRED; + double f = TableLayout.FILL; + double[] columnSize = {p, p, p, f}; + double[] rowSize = {p}; + Component[][] components = new Component[][]{ + new Component[]{new UILabel(Inter.getLocText(new String[]{"FR-Designer_Selection", "FR-Designer_Widget"})), editorTypeComboBox, label,widgetValuePane}, + }; + JPanel jPanel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); + return jPanel; } - + @Override public void populate(Widget widget) { super.populate(widget); diff --git a/designer/src/com/fr/design/widget/WidgetPane.java b/designer/src/com/fr/design/widget/WidgetPane.java index c4ce0f5638..5e73ac7906 100644 --- a/designer/src/com/fr/design/widget/WidgetPane.java +++ b/designer/src/com/fr/design/widget/WidgetPane.java @@ -32,7 +32,7 @@ import java.util.Vector; */ public class WidgetPane extends AbstractAttrNoScrollPane implements ItemListener { - private EditorTypeComboBox editorTypeComboBox; + protected EditorTypeComboBox editorTypeComboBox; private CellWidgetCardPane cellEditorCardPane; private boolean shouldFireSelectedEvent = true; protected JPanel northPane; @@ -55,7 +55,18 @@ public class WidgetPane extends AbstractAttrNoScrollPane implements ItemListener editorTypeComboBox = new EditorTypeComboBox(pane != null); editorTypeComboBox.setPreferredSize(new Dimension(155, 30)); editorTypeComboBox.setMaximumRowCount(16); + northPane = initNorthPane(); + northPane.setBorder(BorderFactory.createEmptyBorder(12, 10, 10, 15)); + this.add(northPane, BorderLayout.NORTH); + + editorTypeComboBox.addItemListener(this); + + cellEditorCardPane = new CellWidgetCardPane(pane); + this.add(cellEditorCardPane, BorderLayout.CENTER); + this.addAttributeChangeListener(listener); + } + public JPanel initNorthPane(){ UILabel emptyLabel = new UILabel(); emptyLabel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0)); @@ -66,15 +77,8 @@ public class WidgetPane extends AbstractAttrNoScrollPane implements ItemListener Component[][] components = new Component[][]{ new Component[]{new UILabel(Inter.getLocText(new String[]{"FR-Designer_Selection", "FR-Designer_Widget"})), emptyLabel, editorTypeComboBox}, }; - northPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); - northPane.setBorder(BorderFactory.createEmptyBorder(12, 10, 10, 15)); - this.add(northPane, BorderLayout.NORTH); - - editorTypeComboBox.addItemListener(this); - - cellEditorCardPane = new CellWidgetCardPane(pane); - this.add(cellEditorCardPane, BorderLayout.CENTER); - this.addAttributeChangeListener(listener); + JPanel jPanel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); + return jPanel; } protected JPanel createContentPane() { diff --git a/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java b/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java index ba793a5968..287c76ffce 100644 --- a/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java +++ b/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java @@ -179,10 +179,10 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH topToolBar.setBorder(BorderFactory.createEmptyBorder(2, 0, 2, 0)); double p = TableLayout.PREFERRED; double f = TableLayout.FILL; - double[] columnSize = { p, f, 155}; + double[] columnSize = { p, f}; double[] rowSize = {p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(getAddItemText()), null, topToolBar}, + new Component[]{new UILabel(getAddItemText()), topToolBar}, }; JPanel leftTopPane = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); leftTopPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 6, 0)); From a18b7cb1bfa044934e2cba61affa1d065c3f0ce2 Mon Sep 17 00:00:00 2001 From: fanglei <294531121> Date: Mon, 28 Aug 2017 10:45:34 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=B0=86=E6=8E=A7=E4=BB=B6=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F=E4=BB=A3=E7=A0=81=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobile/ElementCasePropertyUI.java | 2 +- .../design/mainframe/WidgetPropertyPane.java | 22 +++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/designer_form/src/com/fr/design/designer/properties/mobile/ElementCasePropertyUI.java b/designer_form/src/com/fr/design/designer/properties/mobile/ElementCasePropertyUI.java index 065e3cd6e9..f84bafc295 100644 --- a/designer_form/src/com/fr/design/designer/properties/mobile/ElementCasePropertyUI.java +++ b/designer_form/src/com/fr/design/designer/properties/mobile/ElementCasePropertyUI.java @@ -21,7 +21,7 @@ public class ElementCasePropertyUI extends AbstractWidgetPropertyUIProvider { @Override public AbstractPropertyTable createWidgetAttrTable() { - return new ElementCasePropertyTable(xCreator); + return null; } @Override diff --git a/designer_form/src/com/fr/design/mainframe/WidgetPropertyPane.java b/designer_form/src/com/fr/design/mainframe/WidgetPropertyPane.java index ff6a8c640c..d5878a0957 100644 --- a/designer_form/src/com/fr/design/mainframe/WidgetPropertyPane.java +++ b/designer_form/src/com/fr/design/mainframe/WidgetPropertyPane.java @@ -123,9 +123,11 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetPrope extraPane.initPropertyGroups(designer); } } -// for (AbstractPropertyTable propertyTable : widgetPropertyTables) { -// propertyTable.initPropertyGroups(designer); -// } + if (widgetPropertyTables != null) { + for (AbstractPropertyTable propertyTable : widgetPropertyTables) { + propertyTable.initPropertyGroups(designer); + } + } } /** @@ -224,12 +226,14 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetPrope mobileExtraPropertyPanes.add(extraPane); wsp.add(extraPane); } -// AbstractPropertyTable propertyTable = widgetAttrProvider.createWidgetAttrTable(); -// widgetPropertyTables.add(propertyTable); -// designer.addDesignerEditListener(new WidgetPropertyDesignerAdapter(formWidgetCardPane)); -// -// UIScrollPane uiScrollPane = new UIScrollPane(getExtraBodyTable(propertyTable)); -// wsp.add(uiScrollPane); + AbstractPropertyTable propertyTable = widgetAttrProvider.createWidgetAttrTable(); + if (propertyTable != null) { + widgetPropertyTables.add(propertyTable); + designer.addDesignerEditListener(new WidgetPropertyDesignerAdapter(formWidgetCardPane)); + + UIScrollPane uiScrollPane = new UIScrollPane(getExtraBodyTable(propertyTable)); + wsp.add(uiScrollPane); + } } } } From 96bc00ca79d3274e7eb4cc00b45666ab8d8d7986 Mon Sep 17 00:00:00 2001 From: Qin Xiaofu Date: Mon, 28 Aug 2017 11:00:47 +0800 Subject: [PATCH 7/9] =?UTF-8?q?CHART-1212=20=E6=B7=BB=E5=8A=A0=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E8=BD=AE=E6=92=AD=E7=AE=AD=E5=A4=B4=E7=9A=84=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java index 32976eedd1..23135b0764 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java @@ -178,7 +178,7 @@ public class ChangeConfigPane extends BasicBeanPane { //轮播切换界面 timeInterval.setValue(changeConfigAttr.getTimeInterval()); colorSelectBox4carousel.setSelectObject(changeConfigAttr.getCarouselColor()); - arrowCheckbox.setSelected(changeConfigAttr.getShowArrow()); + arrowCheckbox.setSelected(changeConfigAttr.isShowArrow()); checkCardPane(); From 63e60c68f1e07416101336960af1b98b183dc691 Mon Sep 17 00:00:00 2001 From: fr_shine Date: Mon, 28 Aug 2017 13:59:39 +0800 Subject: [PATCH 8/9] attr class path --- .../com/fr/design/mainframe/chart/gui/ChangeConfigPane.java | 6 +++--- .../style/background/BackgroundListControlPane.java | 2 +- .../style/background/BackgroundNameObjectCreator.java | 2 +- .../background/VanChartCustomIntervalBackgroundPane.java | 2 +- .../style/background/radar/VanChartRadarAxisAreaPane.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java index 32976eedd1..02d78c0f3f 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java @@ -9,9 +9,9 @@ import com.fr.chart.base.AttrChangeType; import com.fr.chart.chartattr.ChartCollection; import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.ibutton.UIButtonGroup; +import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UISpinner; -import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane; @@ -178,7 +178,7 @@ public class ChangeConfigPane extends BasicBeanPane { //轮播切换界面 timeInterval.setValue(changeConfigAttr.getTimeInterval()); colorSelectBox4carousel.setSelectObject(changeConfigAttr.getCarouselColor()); - arrowCheckbox.setSelected(changeConfigAttr.getShowArrow()); + // arrowCheckbox.setSelected(changeConfigAttr.getShowArrow()); checkCardPane(); @@ -202,7 +202,7 @@ public class ChangeConfigPane extends BasicBeanPane { changeConfigAttr.setButtonColor(colorSelectBox4button.getSelectObject()); changeConfigAttr.setTimeInterval((int) timeInterval.getValue()); changeConfigAttr.setCarouselColor(colorSelectBox4carousel.getSelectObject()); - changeConfigAttr.setShowArrow(arrowCheckbox.isSelected()); + // changeConfigAttr.setShowArrow(arrowCheckbox.isSelected()); } @Override 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..7e19f97be3 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 @@ -10,9 +10,9 @@ import com.fr.general.NameObject; import com.fr.plugin.chart.attr.DefaultAxisHelper; import com.fr.plugin.chart.attr.axis.VanChartAlertValue; import com.fr.plugin.chart.attr.axis.VanChartAxis; +import com.fr.plugin.chart.attr.axis.VanChartCustomIntervalBackground; import com.fr.plugin.chart.attr.plot.VanChartPlot; import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot; -import com.fr.plugin.chart.base.VanChartCustomIntervalBackground; import com.fr.stable.Nameable; import java.util.ArrayList; diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/background/BackgroundNameObjectCreator.java b/designer_chart/src/com/fr/plugin/chart/designer/style/background/BackgroundNameObjectCreator.java index bf5c6cf668..781cfe35c4 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/background/BackgroundNameObjectCreator.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/background/BackgroundNameObjectCreator.java @@ -4,7 +4,7 @@ import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.controlpane.UnrepeatedNameHelper; import com.fr.general.FRLogger; import com.fr.general.NameObject; -import com.fr.plugin.chart.base.VanChartCustomIntervalBackground; +import com.fr.plugin.chart.attr.axis.VanChartCustomIntervalBackground; import com.fr.stable.Nameable; import java.lang.reflect.Constructor; diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java index bf6bb46950..5c9ab759cc 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java @@ -14,7 +14,7 @@ import com.fr.design.style.color.ColorSelectBox; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.Inter; import com.fr.plugin.chart.VanChartAttrHelper; -import com.fr.plugin.chart.base.VanChartCustomIntervalBackground; +import com.fr.plugin.chart.attr.axis.VanChartCustomIntervalBackground; import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; import javax.swing.*; 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..c99443624a 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 @@ -4,7 +4,7 @@ import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.ilable.UILabel; import com.fr.general.Inter; import com.fr.plugin.chart.attr.axis.VanChartAlertValue; -import com.fr.plugin.chart.base.VanChartCustomIntervalBackground; +import com.fr.plugin.chart.attr.axis.VanChartCustomIntervalBackground; import com.fr.plugin.chart.designer.style.background.VanChartAxisAreaPane; import java.awt.*; From e52f941086fe6a1e1bfef7a092bcf20c24fcf598 Mon Sep 17 00:00:00 2001 From: kerry Date: Mon, 28 Aug 2017 14:55:23 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B4=A8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/design/widget/ValueWidgetPane.java | 5 +++-- designer/src/com/fr/design/widget/WidgetPane.java | 4 ++-- .../src/com/fr/design/widget/ui/DateEditorDefinePane.java | 1 - .../fr/design/widget/ui/designer/DateEditorDefinePane.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/designer/src/com/fr/design/widget/ValueWidgetPane.java b/designer/src/com/fr/design/widget/ValueWidgetPane.java index a588a8151e..2205f785dc 100644 --- a/designer/src/com/fr/design/widget/ValueWidgetPane.java +++ b/designer/src/com/fr/design/widget/ValueWidgetPane.java @@ -26,16 +26,17 @@ public class ValueWidgetPane extends WidgetPane { } public JPanel initNorthPane(){ + JPanel northPane = super.initNorthPane(); label = new UILabel(" " + Inter.getLocText(new String[]{"Widget", "Value"})+ ":"); label.setVisible(false); widgetValuePane = new JPanel(); widgetValuePane.setLayout(FRGUIPaneFactory.createBorderLayout()); double p = TableLayout.PREFERRED; double f = TableLayout.FILL; - double[] columnSize = {p, p, p, f}; + double[] columnSize = {p, p, f}; double[] rowSize = {p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText(new String[]{"FR-Designer_Selection", "FR-Designer_Widget"})), editorTypeComboBox, label,widgetValuePane}, + new Component[]{northPane, label,widgetValuePane}, }; JPanel jPanel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); return jPanel; diff --git a/designer/src/com/fr/design/widget/WidgetPane.java b/designer/src/com/fr/design/widget/WidgetPane.java index 5e73ac7906..ac7a9ac0e0 100644 --- a/designer/src/com/fr/design/widget/WidgetPane.java +++ b/designer/src/com/fr/design/widget/WidgetPane.java @@ -32,10 +32,10 @@ import java.util.Vector; */ public class WidgetPane extends AbstractAttrNoScrollPane implements ItemListener { - protected EditorTypeComboBox editorTypeComboBox; + private EditorTypeComboBox editorTypeComboBox; private CellWidgetCardPane cellEditorCardPane; private boolean shouldFireSelectedEvent = true; - protected JPanel northPane; + private JPanel northPane; public WidgetPane() { this(null); diff --git a/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java index 141675d158..9adb2f14f2 100644 --- a/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java +++ b/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java @@ -129,7 +129,6 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane