From 9b86c579b3cfb254fe56512a3a77672513feda7a Mon Sep 17 00:00:00 2001 From: mengao <283296419@qq.com> Date: Wed, 30 Aug 2017 20:03:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?9.0=E6=96=B0=E5=9B=BE=E8=A1=A8=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9=E3=80=82=20?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E6=9C=80=E6=96=B0=E8=AE=BE=E8=AE=A1=E7=A8=BF?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=85=8D=E7=BD=AE=E9=9D=A2=E6=9D=BF=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A5=BC=E5=9B=BE=E9=85=8D=E7=BD=AE=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E9=97=AE=E9=A2=98=20=E4=BF=AE=E6=94=B9=E9=85=8D?= =?UTF-8?q?=E8=89=B2=E4=B8=8D=E8=83=BD=E4=BF=9D=E5=AD=98=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E6=9D=A1=E4=BB=B6=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E4=BF=9D=E5=AD=98=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/AbstractReportDataContentPane.java | 8 +++++++ .../BubblePlotReportDataContentPane.java | 3 ++- ...goryPlotMoreCateReportDataContentPane.java | 3 ++- .../CategoryPlotReportDataContentPane.java | 3 ++- .../MeterPlotReportDataContentPane.java | 3 ++- .../data/table/SeriesTypeUseComboxPane.java | 3 ++- .../gui/style/series/UIColorPickerPane.java | 15 +++++++------ .../chart/area/VanChartAreaSeriesPane.java | 1 - .../bubble/VanChartBubbleSeriesPane.java | 1 - ...anChartBubblePlotTableDataContentPane.java | 3 ++- .../background/VanChartBackgroundPane.java | 2 +- ...BackgroundWithOutShadowWithRadiusPane.java | 4 ++-- .../VanChartConditionAttrContentPane.java | 8 +++---- .../VanChartAbstractPlotSeriesPane.java | 6 ++++-- .../style/VanChartFunnelSeriesPane.java | 1 - .../style/series/VanChartGanttSeriesPane.java | 6 ------ .../chart/gauge/VanChartGaugeSeriesPane.java | 6 ------ .../chart/line/VanChartLineSeriesPane.java | 6 ------ .../chart/map/VanChartMapSeriesPane.java | 21 +++++-------------- .../style/VanChartMultiPieSeriesPane.java | 6 ------ .../chart/radar/VanChartRadarSeriesPane.java | 6 +----- .../SectionIntervalConfigPaneWithOutNum.java | 13 +++++++++++- .../scatter/VanChartScatterSeriesPane.java | 1 - .../style/VanChartStructureSeriesPane.java | 7 ------- .../style/VanChartWordCloudSeriesPane.java | 6 ------ 25 files changed, 57 insertions(+), 85 deletions(-) diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java index 2612ae7425..9ee06b76cc 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java @@ -16,6 +16,7 @@ import com.fr.design.layout.TableLayout; import com.fr.stable.StableUtils; import javax.swing.*; +import javax.swing.border.Border; import javax.swing.event.ChangeEvent; import java.awt.*; import java.util.ArrayList; @@ -200,4 +201,11 @@ public abstract class AbstractReportDataContentPane extends BasicBeanPane { this.add(cardPane, BorderLayout.CENTER); dataScreeningPane = new ChartDataFilterPane(this.initplot, parent); JPanel panel = new UIExpandablePane(Inter.getLocText("FR-Chart-Data_Filter"), 290, 24, dataScreeningPane); - dataScreeningPane.setBorder(BorderFactory.createEmptyBorder(10,10,0,15)); + panel.setBorder(BorderFactory.createEmptyBorder(0,5,0,5)); + dataScreeningPane.setBorder(BorderFactory.createEmptyBorder(10,5,0,5)); this.add(panel, BorderLayout.SOUTH); } diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java index 37c2f26b51..b5cdb0b74a 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java @@ -94,14 +94,9 @@ public class UIColorPickerPane extends BasicPane implements UIObserver { } }; - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] columnSize = {p, f}; - Component[][] components = createComponents(); - upControlPane = TableLayoutHelper.createTableLayoutPane(components, getRowSIze (), columnSize); - + upControlPane = getUpControlPane (components); this.textFieldList = this.getTextFieldList(); this.textGroup = new TextFieldGroupPane(); this.colorGroup = new ColorGroupPane(); @@ -113,6 +108,14 @@ public class UIColorPickerPane extends BasicPane implements UIObserver { refreshGroupPane(colors, getValueArray(number)); } + protected JPanel getUpControlPane (Component[][] components) { + double p = TableLayout.PREFERRED; + double f = TableLayout.FILL; + double[] columnSize = {p, f}; + return TableLayoutHelper.createTableLayoutPane(components, getRowSIze (), columnSize); + } + + protected double[] getRowSIze () { double p = TableLayout.PREFERRED; return new double[]{p, p, p}; diff --git a/designer_chart/src/com/fr/plugin/chart/area/VanChartAreaSeriesPane.java b/designer_chart/src/com/fr/plugin/chart/area/VanChartAreaSeriesPane.java index 3caa85b4e8..d590de46c5 100644 --- a/designer_chart/src/com/fr/plugin/chart/area/VanChartAreaSeriesPane.java +++ b/designer_chart/src/com/fr/plugin/chart/area/VanChartAreaSeriesPane.java @@ -42,7 +42,6 @@ public class VanChartAreaSeriesPane extends VanChartLineSeriesPane{ //设置色彩面板内容 protected void setColorPaneContent (JPanel panel) { - panel.add(getFillStylePane(), BorderLayout.NORTH); panel.add(createStylePane(), BorderLayout.CENTER); } diff --git a/designer_chart/src/com/fr/plugin/chart/bubble/VanChartBubbleSeriesPane.java b/designer_chart/src/com/fr/plugin/chart/bubble/VanChartBubbleSeriesPane.java index 41c672e144..2991b1c829 100644 --- a/designer_chart/src/com/fr/plugin/chart/bubble/VanChartBubbleSeriesPane.java +++ b/designer_chart/src/com/fr/plugin/chart/bubble/VanChartBubbleSeriesPane.java @@ -50,7 +50,6 @@ public class VanChartBubbleSeriesPane extends VanChartAbstractPlotSeriesPane { //设置色彩面板内容 @Override protected void setColorPaneContent (JPanel panel) { - panel.add(getFillStylePane(), BorderLayout.NORTH); panel.add(createAlphaPane(), BorderLayout.CENTER); } diff --git a/designer_chart/src/com/fr/plugin/chart/bubble/data/VanChartBubblePlotTableDataContentPane.java b/designer_chart/src/com/fr/plugin/chart/bubble/data/VanChartBubblePlotTableDataContentPane.java index 756f31ca91..19a2cbc807 100644 --- a/designer_chart/src/com/fr/plugin/chart/bubble/data/VanChartBubblePlotTableDataContentPane.java +++ b/designer_chart/src/com/fr/plugin/chart/bubble/data/VanChartBubblePlotTableDataContentPane.java @@ -64,7 +64,8 @@ public class VanChartBubblePlotTableDataContentPane extends AbstractTableDataCon JPanel north = TableLayout4VanChartHelper.createGapTableLayoutPane(components_north,rowSize_north,columnSize_north); north.setBorder(BorderFactory.createEmptyBorder(10, 24, 10, 15)); JPanel filterPane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart-Data_Filter"),dataScreeningPane); - dataScreeningPane.setBorder(BorderFactory.createEmptyBorder(10,10,0,15)); + dataScreeningPane.setBorder(BorderFactory.createEmptyBorder(10,5,0,5)); + filterPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,5)); this.setLayout(new BorderLayout()); diff --git a/designer_chart/src/com/fr/plugin/chart/designer/component/background/VanChartBackgroundPane.java b/designer_chart/src/com/fr/plugin/chart/designer/component/background/VanChartBackgroundPane.java index a1526b6a40..1c1cb8211d 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/component/background/VanChartBackgroundPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/component/background/VanChartBackgroundPane.java @@ -98,7 +98,7 @@ public class VanChartBackgroundPane extends BasicPane { new Component[]{null, null}, new Component[]{new UILabel(Inter.getLocText("FR-Chart-Shape_Fill")), typeComboBox}, new Component[]{null, centerPane}, - new Component[]{new UILabel(Inter.getLocText("Plugin-Chart_Alpha")), transparent}, + new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Alpha")), transparent}, new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Shadow")), shadow}, }; } diff --git a/designer_chart/src/com/fr/plugin/chart/designer/component/background/VanChartBackgroundWithOutShadowWithRadiusPane.java b/designer_chart/src/com/fr/plugin/chart/designer/component/background/VanChartBackgroundWithOutShadowWithRadiusPane.java index f1d1c9ca48..96dfca8be3 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/component/background/VanChartBackgroundWithOutShadowWithRadiusPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/component/background/VanChartBackgroundWithOutShadowWithRadiusPane.java @@ -25,8 +25,8 @@ public class VanChartBackgroundWithOutShadowWithRadiusPane extends VanChartBackg new Component[]{null, null}, new Component[]{new UILabel(Inter.getLocText("FR-Chart-Shape_Fill")), typeComboBox}, new Component[]{null, centerPane}, - new Component[]{new UILabel(Inter.getLocText("Plugin-Chart_Alpha")), transparent}, - new Component[]{new UILabel(Inter.getLocText("plugin-ChartF_Radius")+":"),radius} + new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Alpha")), transparent}, + new Component[]{new UILabel(Inter.getLocText("plugin-ChartF_Radius")),radius} }; } diff --git a/designer_chart/src/com/fr/plugin/chart/designer/other/VanChartConditionAttrContentPane.java b/designer_chart/src/com/fr/plugin/chart/designer/other/VanChartConditionAttrContentPane.java index 9baf215081..c65c6a5791 100644 --- a/designer_chart/src/com/fr/plugin/chart/designer/other/VanChartConditionAttrContentPane.java +++ b/designer_chart/src/com/fr/plugin/chart/designer/other/VanChartConditionAttrContentPane.java @@ -5,7 +5,6 @@ import com.fr.chart.chartglyph.ConditionAttr; import com.fr.chart.chartglyph.ConditionCollection; import com.fr.design.condition.ConditionAttributesPane; import com.fr.design.gui.controlpane.UIListControlPane; -import com.fr.design.gui.imenutable.UIMenuNameableCreator; import com.fr.general.NameObject; import com.fr.stable.Nameable; @@ -58,10 +57,9 @@ public class VanChartConditionAttrContentPane extends AbstractConditionAttrConte Nameable[] nameables = conditionPane.update(); cc.clearConditionAttr(); for (int i = 0; i < nameables.length; i++) { - if (nameables[i] instanceof UIMenuNameableCreator) { - UIMenuNameableCreator uiMenuNameableCreator = (UIMenuNameableCreator) nameables[i]; - ConditionAttr ca = (ConditionAttr) uiMenuNameableCreator.getObj(); - ca.setName(uiMenuNameableCreator.getName()); + if (nameables[i] instanceof NameObject) { + ConditionAttr ca = (ConditionAttr) ((NameObject) nameables[i]).getObject(); + ca.setName(nameables[i].getName()); cc.addConditionAttr(ca); } } 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 c7d9837f5e..abb629af99 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 @@ -83,7 +83,10 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP scrollPane.setViewportView(getContentInPlotType()); scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); } - return getContentInPlotType(); + JPanel panel = new JPanel(new BorderLayout()); + panel.add(fillStylePane, BorderLayout.NORTH); + panel.add(getContentInPlotType(), BorderLayout.CENTER); + return panel; } @Override @@ -115,7 +118,6 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP //设置色彩面板内容 protected void setColorPaneContent (JPanel panel) { - panel.add(getFillStylePane(), BorderLayout.NORTH); panel.add(createStylePane(), BorderLayout.CENTER); } diff --git a/designer_chart/src/com/fr/plugin/chart/funnel/designer/style/VanChartFunnelSeriesPane.java b/designer_chart/src/com/fr/plugin/chart/funnel/designer/style/VanChartFunnelSeriesPane.java index cd3ab93078..e8beea2fbf 100644 --- a/designer_chart/src/com/fr/plugin/chart/funnel/designer/style/VanChartFunnelSeriesPane.java +++ b/designer_chart/src/com/fr/plugin/chart/funnel/designer/style/VanChartFunnelSeriesPane.java @@ -42,7 +42,6 @@ public class VanChartFunnelSeriesPane extends VanChartAbstractPlotSeriesPane { //设置色彩面板内容 protected void setColorPaneContent (JPanel panel) { - panel.add(getFillStylePane(), BorderLayout.NORTH); panel.add(createStylePane(), BorderLayout.CENTER); panel.add(createAlphaPane(), BorderLayout.SOUTH); } 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 cecf05e6c0..57505188e2 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 @@ -41,7 +41,6 @@ public class VanChartGanttSeriesPane extends VanChartAbstractPlotSeriesPane { double[] col = {f}; Component[][] components = new Component[][]{ - new Component[]{getColorPane()}, new Component[]{createGanntStylePane()}, new Component[]{createLinkLinePane()}, new Component[]{createMarkerPane()} @@ -51,11 +50,6 @@ public class VanChartGanttSeriesPane extends VanChartAbstractPlotSeriesPane { return contentPane; } - //设置色彩面板内容 - protected void setColorPaneContent (JPanel panel) { - panel.add(getFillStylePane(), BorderLayout.NORTH); - } - private JPanel createGanntStylePane(){ seriesNewLine = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Open"), Inter.getLocText("Plugin-ChartF_Close")}); JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Series_New_Line"),seriesNewLine); diff --git a/designer_chart/src/com/fr/plugin/chart/gauge/VanChartGaugeSeriesPane.java b/designer_chart/src/com/fr/plugin/chart/gauge/VanChartGaugeSeriesPane.java index 4ba982d573..9e5238d892 100644 --- a/designer_chart/src/com/fr/plugin/chart/gauge/VanChartGaugeSeriesPane.java +++ b/designer_chart/src/com/fr/plugin/chart/gauge/VanChartGaugeSeriesPane.java @@ -57,7 +57,6 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane { double[] columnSize = {f}; double[] rowSize = {p,p,p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{getColorPane()}, new Component[]{createGaugeLayoutPane()}, new Component[]{createGaugeStylePane(rowSize, new double[]{f,e})}, new Component[]{createGaugeBandsPane()} @@ -66,11 +65,6 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane { return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); } - //设置色彩面板内容 - protected void setColorPaneContent (JPanel panel) { - panel.add(getFillStylePane(), BorderLayout.NORTH); - } - private JPanel createGaugeLayoutPane() { gaugeLayout = new UIButtonGroup(new String[]{Inter.getLocText("FR-Chart-Direction_Horizontal"), Inter.getLocText("FR-Chart-Direction_Vertical")}); JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("PageSetup-Orientation"),gaugeLayout); diff --git a/designer_chart/src/com/fr/plugin/chart/line/VanChartLineSeriesPane.java b/designer_chart/src/com/fr/plugin/chart/line/VanChartLineSeriesPane.java index 003a313e4f..dd54e7e770 100644 --- a/designer_chart/src/com/fr/plugin/chart/line/VanChartLineSeriesPane.java +++ b/designer_chart/src/com/fr/plugin/chart/line/VanChartLineSeriesPane.java @@ -26,7 +26,6 @@ public class VanChartLineSeriesPane extends VanChartAbstractPlotSeriesPane{ double[] col = {f}; Component[][] components = new Component[][]{ - new Component[]{getColorPane()}, new Component[]{createLineTypePane()}, new Component[]{createMarkerPane()}, new Component[]{createStackedAndAxisPane()}, @@ -38,9 +37,4 @@ public class VanChartLineSeriesPane extends VanChartAbstractPlotSeriesPane{ return contentPane; } - //设置色彩面板内容 - protected void setColorPaneContent (JPanel panel) { - panel.add(getFillStylePane(), BorderLayout.NORTH); - } - } \ No newline at end of file diff --git a/designer_chart/src/com/fr/plugin/chart/map/VanChartMapSeriesPane.java b/designer_chart/src/com/fr/plugin/chart/map/VanChartMapSeriesPane.java index 29a34a3ac6..cb0be77135 100644 --- a/designer_chart/src/com/fr/plugin/chart/map/VanChartMapSeriesPane.java +++ b/designer_chart/src/com/fr/plugin/chart/map/VanChartMapSeriesPane.java @@ -152,20 +152,10 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane { } //设置色彩面板内容 - protected void setColorPaneContent (JPanel panel) { - if (getFillStylePane() != null){ - panel.add(getFillStylePane(), BorderLayout.NORTH); - } - mapType = ((VanChartMapPlot) plot).getAllLayersMapType(); - switch (mapType) { - case AREA: - panel.add(createNullValueColorPane(), BorderLayout.CENTER); - panel.add(createAlphaPane(), BorderLayout.SOUTH); - break; - case POINT: - panel.add(createPointAlphaPane(), BorderLayout.CENTER); - break; - } + protected void setColorPaneContent(JPanel panel) { + panel.add(createNullValueColorPane(), BorderLayout.CENTER); + panel.add(createAlphaPane(), BorderLayout.SOUTH); + } @@ -199,7 +189,7 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane { double[] col = {f}; Component[][] components = new Component[][]{ - new Component[]{getColorPane()}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle((Inter.getLocText("Plugin-ChartF_Color")), createPointAlphaPane())}, new Component[]{createMarkerComPane()}, new Component[]{createLargeDataModelPane()}, new Component[]{createPointEffectPane()}, @@ -217,7 +207,6 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane { curvePane = new VanChartCurvePane(); Component[][] components = new Component[][]{ - new Component[]{getColorPane()}, new Component[]{createCurvePane()}, new Component[]{createLineMapLargeDataModelPane()}, new Component[]{createAnimationPane()} diff --git a/designer_chart/src/com/fr/plugin/chart/multilayer/style/VanChartMultiPieSeriesPane.java b/designer_chart/src/com/fr/plugin/chart/multilayer/style/VanChartMultiPieSeriesPane.java index cd7739a698..6a9ce50ae2 100644 --- a/designer_chart/src/com/fr/plugin/chart/multilayer/style/VanChartMultiPieSeriesPane.java +++ b/designer_chart/src/com/fr/plugin/chart/multilayer/style/VanChartMultiPieSeriesPane.java @@ -34,7 +34,6 @@ public class VanChartMultiPieSeriesPane extends VanChartPieSeriesPane { double[] columnSize = {f}; double[] rowSize = {p,p,p,p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{getColorPane()}, new Component[]{createSeriesStylePane(rowSize, new double[]{p,f})}, new Component[]{createBorderPane()}, }; @@ -67,11 +66,6 @@ public class VanChartMultiPieSeriesPane extends VanChartPieSeriesPane { return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Designer-Widget_Style"), panel); } - //设置色彩面板内容 - protected void setColorPaneContent (JPanel panel) { - panel.add(getFillStylePane(), BorderLayout.NORTH); - } - protected void populatePieAttr() { if(plot.accept(VanChartMultiPiePlot.class)){ VanChartMultiPiePlot multiPiePlot = (VanChartMultiPiePlot)plot; diff --git a/designer_chart/src/com/fr/plugin/chart/radar/VanChartRadarSeriesPane.java b/designer_chart/src/com/fr/plugin/chart/radar/VanChartRadarSeriesPane.java index 1facdf2d13..ec08b139ad 100644 --- a/designer_chart/src/com/fr/plugin/chart/radar/VanChartRadarSeriesPane.java +++ b/designer_chart/src/com/fr/plugin/chart/radar/VanChartRadarSeriesPane.java @@ -49,7 +49,6 @@ public class VanChartRadarSeriesPane extends VanChartAbstractPlotSeriesPane { } return new Component[][] { - new Component[]{getColorPane()}, new Component[]{createRadarTypePane()}, new Component[]{createLineTypePane()}, new Component[]{createMarkerPane()}, @@ -59,10 +58,7 @@ public class VanChartRadarSeriesPane extends VanChartAbstractPlotSeriesPane { //设置色彩面板内容 protected void setColorPaneContent (JPanel panel) { - panel.add(getFillStylePane(), BorderLayout.NORTH); - if(((VanChartRadarPlot)plot).isStackChart()) { - panel.add(createAlphaPane(), BorderLayout.CENTER); - } + panel.add(createAlphaPane(), BorderLayout.CENTER); } private JPanel createRadarTypePane() { diff --git a/designer_chart/src/com/fr/plugin/chart/range/component/SectionIntervalConfigPaneWithOutNum.java b/designer_chart/src/com/fr/plugin/chart/range/component/SectionIntervalConfigPaneWithOutNum.java index 7937b61f67..899b283e51 100644 --- a/designer_chart/src/com/fr/plugin/chart/range/component/SectionIntervalConfigPaneWithOutNum.java +++ b/designer_chart/src/com/fr/plugin/chart/range/component/SectionIntervalConfigPaneWithOutNum.java @@ -3,7 +3,9 @@ package com.fr.plugin.chart.range.component; import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.mainframe.chart.gui.style.series.MapColorPickerPaneWithFormula; import com.fr.general.Inter; +import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; +import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import java.awt.*; @@ -28,6 +30,15 @@ public class SectionIntervalConfigPaneWithOutNum extends MapColorPickerPaneWithF }); } + protected JPanel getUpControlPane (Component[][] components) { + double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; + double d = TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH; + double[] columnSize = {d, e}; + JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, getRowSIze (), columnSize); + panel.setPreferredSize(new Dimension(230, (int)panel.getPreferredSize().getHeight())); + return panel; + } + private void setRegionVisible(boolean visible){ getRegionNumPane().setVisible(visible); numLabel.setVisible(visible); @@ -40,7 +51,7 @@ public class SectionIntervalConfigPaneWithOutNum extends MapColorPickerPaneWithF setRegionVisible(false); return new Component[][]{ - new Component[]{new BoldFontTextLabel(""),getDesignTypeButtonGroup()}, + new Component[]{new BoldFontTextLabel(Inter.getLocText("Plugin-ChartF_RangeNum")),getDesignTypeButtonGroup()}, new Component[]{numLabel, getRegionNumPane()}, }; } diff --git a/designer_chart/src/com/fr/plugin/chart/scatter/VanChartScatterSeriesPane.java b/designer_chart/src/com/fr/plugin/chart/scatter/VanChartScatterSeriesPane.java index 90617b6cd8..980b3ed226 100644 --- a/designer_chart/src/com/fr/plugin/chart/scatter/VanChartScatterSeriesPane.java +++ b/designer_chart/src/com/fr/plugin/chart/scatter/VanChartScatterSeriesPane.java @@ -48,7 +48,6 @@ public class VanChartScatterSeriesPane extends VanChartAbstractPlotSeriesPane{ //设置色彩面板内容 protected void setColorPaneContent (JPanel panel) { - panel.add(getFillStylePane(), BorderLayout.NORTH); panel.add(createAlphaPane(), BorderLayout.CENTER); } diff --git a/designer_chart/src/com/fr/plugin/chart/structure/desinger/style/VanChartStructureSeriesPane.java b/designer_chart/src/com/fr/plugin/chart/structure/desinger/style/VanChartStructureSeriesPane.java index f4f0f2a072..ec85e3e30a 100644 --- a/designer_chart/src/com/fr/plugin/chart/structure/desinger/style/VanChartStructureSeriesPane.java +++ b/designer_chart/src/com/fr/plugin/chart/structure/desinger/style/VanChartStructureSeriesPane.java @@ -44,7 +44,6 @@ public class VanChartStructureSeriesPane extends VanChartAbstractPlotSeriesPane double[] columnSize = {f}; double[] rowSize = {p,p,p}; Component[][] components = new Component[][]{ - new Component[]{getColorPane()}, new Component[]{createLinkPane()}, new Component[]{createNodePane()} }; @@ -54,12 +53,6 @@ public class VanChartStructureSeriesPane extends VanChartAbstractPlotSeriesPane return contentPane; } - //设置色彩面板内容 - protected void setColorPaneContent (JPanel panel) { - panel.add(getFillStylePane(), BorderLayout.NORTH); - } - - private JPanel createLinkPane() { linkColor = new ColorSelectBox(100); 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 2346b62f32..1f524001f8 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 @@ -60,7 +60,6 @@ public class VanChartWordCloudSeriesPane extends VanChartAbstractPlotSeriesPane double[] columnSize = {f}; double[] rowSize = {p,p,p}; Component[][] components = new Component[][]{ - new Component[]{getColorPane()}, new Component[]{createWordCloudStylePane()}, }; @@ -69,11 +68,6 @@ public class VanChartWordCloudSeriesPane extends VanChartAbstractPlotSeriesPane return contentPane; } - //设置色彩面板内容 - protected void setColorPaneContent (JPanel panel) { - panel.add(getFillStylePane(), BorderLayout.NORTH); - } - private JPanel createWordCloudStylePane(){ double labelSize = LABEL_SIZE; double p = TableLayout.PREFERRED; From 02eb45388779b5947c2443439e23b81848f0d00a Mon Sep 17 00:00:00 2001 From: mengao <283296419@qq.com> Date: Thu, 31 Aug 2017 11:04:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E9=85=8D=E6=8E=A5=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E4=B8=8D?= =?UTF-8?q?=E5=85=A8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/VanChartAreaSeriesFillColorPane.java | 14 +++----------- .../designer/style/axis/VanChartBaseAxisPane.java | 4 ++-- 2 files changed, 5 insertions(+), 13 deletions(-) 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 b4913e6415..5606e7defd 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 @@ -4,7 +4,6 @@ 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; @@ -19,7 +18,6 @@ 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; @@ -41,15 +39,9 @@ public class VanChartAreaSeriesFillColorPane extends BasicPane { JPanel transparentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-Chart_Alpha"), transparent); - Component[][] components = new Component[][]{ - new Component[]{fillColorPane}, - new Component[]{transparentPane}, - }; - - JPanel contentPane = TableLayoutHelper.createTableLayoutPane(components, row, col); - contentPane.setPreferredSize(new Dimension(PANE_WIDTH, (int)contentPane.getPreferredSize().getHeight())); - - this.add(contentPane); + this.setLayout(new BorderLayout()); + this.add(fillColorPane, BorderLayout.NORTH); + this.add(transparentPane, BorderLayout.CENTER); } protected String title4PopupWindow(){ 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 2030f48e9e..649e030da4 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 @@ -252,8 +252,8 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { axisLimitSize = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Limit"),Inter.getLocText("Plugin-ChartF_NotLimit")}); JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_AreaSize"),axisLimitSize); - 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); From 299dbcb55bfa8e28438c22ff50f050ef04c3ae42 Mon Sep 17 00:00:00 2001 From: mengao <283296419@qq.com> Date: Thu, 31 Aug 2017 11:57:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../designer/style/series/VanChartAbstractPlotSeriesPane.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 abb629af99..7e02cbddf0 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 @@ -84,7 +84,9 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); } JPanel panel = new JPanel(new BorderLayout()); - panel.add(fillStylePane, BorderLayout.NORTH); + if (fillStylePane != null) { + panel.add(fillStylePane, BorderLayout.NORTH); + } panel.add(getContentInPlotType(), BorderLayout.CENTER); return panel; }