9.0新图表配置界面修改。

按照最新设计稿调整配置面板
修改饼图配置界面问题
修改配色不能保存问题
修改条件显示不能保存问题

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<ChartC
 		return jSeparator;
 	}
 
+	protected Border getSidesBorder() {
+		return BorderFactory.createEmptyBorder(0,5,0,5);
+	}
+	protected Border getFilterPaneBorder() {
+		return BorderFactory.createEmptyBorder(10,5,0,5);
+	}
+
 }

designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/BubblePlotReportDataContentPane.java

@@ -27,7 +27,8 @@ public class BubblePlotReportDataContentPane extends AbstractReportDataContentPa
 		initEveryPane();
 		filterPane = new ChartDataFilterPane(new BubblePlot(), parent);
 		JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart-Data_Filter"),filterPane);
-		filterPane.setBorder(BorderFactory.createEmptyBorder(10,10,0,15));
+		panel.setBorder(getSidesBorder());
+		filterPane.setBorder(getFilterPaneBorder());
 		this.add(panel, "0,6,2,4");
 	}
 	

designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotMoreCateReportDataContentPane.java

@@ -66,7 +66,8 @@ public class CategoryPlotMoreCateReportDataContentPane extends CategoryPlotRepor
         this.add(catePane, "0,0,2,0");
 		filterPane = new ChartDataFilterPane(new Bar2DPlot(), parent);
 		JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart-Data_Filter"),filterPane);
-		filterPane.setBorder(BorderFactory.createEmptyBorder(10,10,0,15));
+		panel.setBorder(getSidesBorder());
+		filterPane.setBorder(getFilterPaneBorder());
 		this.add(panel, "0,6,2,4");
         
         addButton.addActionListener(new ActionListener() {

designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java

@@ -38,7 +38,8 @@ public class CategoryPlotReportDataContentPane extends AbstractReportDataContent
         this.add(categoryName, "0,0,2,0");
         filterPane = new ChartDataFilterPane(new Bar2DPlot(), parent);
         JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart-Data_Filter"),filterPane);
-        filterPane.setBorder(BorderFactory.createEmptyBorder(10,10,0,15));
+        panel.setBorder(getSidesBorder());
+        filterPane.setBorder(getFilterPaneBorder());
         this.add(panel, "0,6,2,4");    }
     
 	protected TinyFormulaPane initCategoryBox(final String leftLabel) {

designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/MeterPlotReportDataContentPane.java

@@ -58,7 +58,8 @@ public class MeterPlotReportDataContentPane extends AbstractReportDataContentPan
 		this.add(panel, BorderLayout.NORTH);
 		filterPane = new ChartDataFilterPane(new MeterPlot(), parent);
 		JPanel pane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart-Data_Filter"),filterPane);
-		filterPane.setBorder(BorderFactory.createEmptyBorder(10,10,0,15));
+		pane.setBorder(getSidesBorder());
+		filterPane.setBorder(getFilterPaneBorder());
 
 		this.add(pane, BorderLayout.CENTER);
 	}

designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/SeriesTypeUseComboxPane.java

@@ -57,7 +57,8 @@ public class SeriesTypeUseComboxPane extends UIComboBoxPane<ChartCollection> {
         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);
     }
 

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};

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);
     }
 

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);
     }
 

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());

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},
         };
     }

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}
         };
     }
 

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);
             }
         }

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);
     }
 

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);
     }

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);

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);

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);
-    }
-
 }

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()}

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;

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() {

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()},
         };
     }

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);
     }
 

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);
 

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;