9.0界面修改

designer_chart/src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java

@@ -113,20 +113,20 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
             }
         };
         styleAttrPane.setPreferredSize(new Dimension(WIDTH, (int) styleAttrPane.getPreferredSize().getHeight()));
-        return TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-Chart_Character")+":", styleAttrPane);
+        return TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-Chart_Character"), styleAttrPane);
     }
 
 
     private JPanel createButtonBackgroundColorPane(){
         colorSelectBox4button = new ColorSelectBoxWithOutTransparent(WIDTH);
-        return TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Background") + ":", colorSelectBox4button);
+        return TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Background"), colorSelectBox4button);
     }
 
     private JPanel createButtonConfigPane() {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         double[] columnSize = {p, f};
-        double[] rowSize = {p,p,p};
+        double[] rowSize = {p,p};
         Component[][] components = new Component[][]{
                 new Component[]{createTitleStylePane(),null},
                 new Component[]{createButtonBackgroundColorPane(),null},

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

@@ -59,6 +59,18 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
         }
     }
 
+    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);
+            }
+        }
+        this.add(centerPane, BorderLayout.CENTER);
+    }
+
 
     protected List<NamePane> initPaneList(Plot plot, AbstractAttrNoScrollPane parent) {
         plot4Pane = plot;

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

@@ -44,8 +44,10 @@ public abstract class AbstractReportDataContentPane extends BasicBeanPane<ChartC
 
         initSeriesPane();
 
-		this.add(seriesPane, "0,2,2,2");
+        JPanel panel = new JPanel(new BorderLayout());
-		seriesPane.setBorder(BorderFactory.createEmptyBorder(0,24,0,15));
+		panel.setBorder(BorderFactory.createEmptyBorder(0,24,0,15));
+		panel.add(seriesPane);
+		this.add(panel, "0,2,2,2");
 	}
 
     //kunsnat: 用于重载, 甘特图, 股价图 第一列 默认应该不可编辑.
@@ -192,4 +194,10 @@ public abstract class AbstractReportDataContentPane extends BasicBeanPane<ChartC
 		}
 	}
 
+	protected JSeparator getJSeparator() {
+		JSeparator jSeparator = new JSeparator();
+		jSeparator.setPreferredSize(new Dimension(246, 2));
+		return jSeparator;
+	}
+
 }

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

@@ -27,6 +27,7 @@ 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));
 		this.add(panel, "0,6,2,4");
 	}
 	

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

@@ -67,7 +67,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);
-        this.add(panel, "0,6,2,4");
+		filterPane.setBorder(BorderFactory.createEmptyBorder(10,10,0,15));
+		this.add(panel, "0,6,2,4");
         
         addButton.addActionListener(new ActionListener() {
 			@Override

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

@@ -38,6 +38,7 @@ 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));
         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

@@ -57,14 +57,9 @@ public class MeterPlotReportDataContentPane extends AbstractReportDataContentPan
 		this.setLayout(new BorderLayout());
 		this.add(panel, BorderLayout.NORTH);
 		filterPane = new ChartDataFilterPane(new MeterPlot(), parent);
-		JPanel panel1 = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart-Data_Filter"),filterPane);
+		JPanel pane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart-Data_Filter"),filterPane);
+		filterPane.setBorder(BorderFactory.createEmptyBorder(10,10,0,15));
 
-		double[] cs = {p};
-		components = new Component[][]{
-				new Component[]{panel1},
-		};
-		JPanel pane = TableLayoutHelper.createTableLayoutPane(components, rowSize, cs);
-		
 		this.add(pane, BorderLayout.CENTER);
 	}
 

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

@@ -6,7 +6,6 @@ import com.fr.chart.chartattr.BubblePlot;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.chartdata.BubbleTableDefinition;
 import com.fr.design.gui.icombobox.UIComboBox;
-import com.fr.design.gui.ilable.BoldFontTextLabel;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
@@ -14,6 +13,7 @@ import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
+import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.StringUtils;
 
@@ -52,23 +52,23 @@ public class BubblePlotTableDataContentPane extends AbstractTableDataContentPane
         double[] columnSize_north = {p, f};
         double[] rowSize_north = {p, p, p, p};
         Component[][] components_north = new Component[][]{
-                new Component[]{new UILabel(Inter.getLocText("Chart-Series_Name")+":", SwingConstants.RIGHT), seriesName},
+                new Component[]{new UILabel(Inter.getLocText("Chart-Series_Name")), seriesName},
-                new Component[]{new UILabel("x :",SwingConstants.RIGHT), xCombox},
+                new Component[]{new UILabel("x"), xCombox},
-                new Component[]{new UILabel("y :",SwingConstants.RIGHT), yCombox},
+                new Component[]{new UILabel("y"), yCombox},
-                new Component[]{new UILabel(Inter.getLocText("FR-Chart_Bubble_Size")+":", SwingConstants.RIGHT), bubbleSize}
+                new Component[]{new UILabel(Inter.getLocText("FR-Chart_Bubble_Size")), bubbleSize}
         };
         JPanel north = TableLayoutHelper.createTableLayoutPane(components_north,rowSize_north,columnSize_north);
         north.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 1));
 
         Component[][] components = new Component[][]{
                      new Component[]{north},
-                     new Component[]{new JSeparator()},
+                     new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart-Data_Filter"),dataScreeningPane), null},
-                     new Component[]{new BoldFontTextLabel(Inter.getLocText("Chart-Data_Filter"))},
-                     new Component[]{dataScreeningPane}
              };
 
 
         JPanel panel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+        dataScreeningPane.setBorder(BorderFactory.createEmptyBorder(10,10,0,15));
+
         this.setLayout(new BorderLayout());
         this.add(panel, BorderLayout.CENTER);
         

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

@@ -11,6 +11,7 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane;
 import com.fr.general.Inter;
+import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
 
 import javax.swing.*;
 import java.awt.*;
@@ -35,31 +36,35 @@ public class MeterPlotTableDataContentPane extends AbstractTableDataContentPane
 		nameBox = new UIComboBox();
 		valueBox = new UIComboBox();
 		filterPane = new ChartDataFilterPane(new MeterPlot(), parent);
-		
+
 		nameBox.setPreferredSize(new Dimension(100, 20));
 		valueBox.setPreferredSize(new Dimension(100, 20));
 
 		double p = TableLayout.PREFERRED;
 		double f = TableLayout.FILL;
 		double[] columnSize = { p,f};
-		double[] rowSize = { p, p,p,p,p,p,p,p, p};
+		double[] rowSize = {p, p};
 
         Component[][] components = createComponents();
 
-        JPanel panel = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);
+		JPanel jPanel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart-Data_Filter"),filterPane);
-        this.add(panel,BorderLayout.CENTER);
+		JPanel panel = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);
-        
+
+		filterPane.setBorder(BorderFactory.createEmptyBorder(10,10,0,15));
+		panel.setBorder(BorderFactory.createEmptyBorder(10,24,10,15));
+
+        this.add(getJSeparator(),BorderLayout.NORTH);
+		this.add(panel,BorderLayout.CENTER);
+		this.add(jPanel,BorderLayout.SOUTH);
+
         nameBox.addItemListener(tooltipListener);
         valueBox.addItemListener(tooltipListener);
 	}
 
     private Component[][] createComponents() {
         return new Component[][]{
-                new Component[]{new BoldFontTextLabel(METER_NAME, SwingConstants.RIGHT), getNameComponent()},
+                new Component[]{new BoldFontTextLabel(METER_NAME), getNameComponent()},
-                new Component[]{new BoldFontTextLabel(METER_VALUE, SwingConstants.RIGHT), valueBox},
+                new Component[]{new BoldFontTextLabel(METER_VALUE), valueBox},
-                new Component[]{new JSeparator(), null},
-                new Component[]{new BoldFontTextLabel(Inter.getLocText("Chart-Data_Filter"))},
-                new Component[]{filterPane, null}
         };
     }
 

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

@@ -1,18 +1,19 @@
 package com.fr.design.mainframe.chart.gui.data.table;
 
-import java.awt.BorderLayout;
-import java.util.List;
-
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.chartattr.PiePlot;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 
+import java.awt.*;
+import java.util.List;
+
 public class PiePlotTableDataContentPane extends AbstractTableDataContentPane{
 	private SeriesTypeUseComboxPane typeChoosePane;
 	
 	public PiePlotTableDataContentPane(ChartDataPane parent) {
 		typeChoosePane = new SeriesTypeUseComboxPane(parent, new PiePlot());
 		this.setLayout(new BorderLayout());
+		this.add(getJSeparator(), BorderLayout.NORTH);
 		this.add(typeChoosePane, BorderLayout.CENTER);
 	}
 

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

@@ -57,6 +57,7 @@ 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));
         this.add(panel, BorderLayout.SOUTH);
     }
 

designer_chart/src/com/fr/plugin/chart/bubble/data/VanChartBubblePlotTableDataContentPane.java

@@ -8,7 +8,6 @@ import com.fr.chart.chartdata.BubbleTableDefinition;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.TableLayout;
-import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
@@ -50,7 +49,7 @@ public class VanChartBubblePlotTableDataContentPane extends AbstractTableDataCon
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         double[] columnSize = {f};
-        double[] rowSize = { p, p,p,p};
+        double[] rowSize = {p, p};
 
         double[] columnSize_north = {p, f};
         double[] rowSize_north = {p, p, p, p};
@@ -62,21 +61,17 @@ public class VanChartBubblePlotTableDataContentPane extends AbstractTableDataCon
                 new Component[]{new UILabel(Inter.getLocText("FR-Chart_Bubble_Size")), bubbleSize},
         };
 
-        JPanel north = TableLayoutHelper.createTableLayoutPane(components_north,rowSize_north,columnSize_north);
+        JPanel north = TableLayout4VanChartHelper.createGapTableLayoutPane(components_north,rowSize_north,columnSize_north);
-        north.setBorder(BorderFactory.createEmptyBorder(0, 24, 0, 15));
+        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));
 
-        Component[][] components = new Component[][]{
-                     new Component[]{north},
-                     new Component[]{filterPane}
-             };
 
-
-        JPanel panel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
         this.setLayout(new BorderLayout());
-        this.add(panel, BorderLayout.CENTER);
+        this.add(getJSeparator(), BorderLayout.NORTH);
-        
+        this.add(north, BorderLayout.CENTER);
+        this.add(filterPane, BorderLayout.SOUTH);
+
         seriesName.addItemListener(tooltipListener);
         xCombox.addItemListener(tooltipListener);
         yCombox.addItemListener(tooltipListener);

designer_chart/src/com/fr/plugin/chart/gantt/designer/data/data/component/GanttReportDataContentPane.java

@@ -29,7 +29,8 @@ public class GanttReportDataContentPane extends AbstractReportDataContentPane{
         this.setLayout(new BorderLayout());
         initAllComponent();
         JPanel panel = getContentPane();
-        panel.setBorder(BorderFactory.createEmptyBorder(0,24,0,15));
+        panel.setBorder(BorderFactory.createEmptyBorder(10,24,0,15));
+        this.add(getJSeparator(), BorderLayout.NORTH);
         this.add(panel, BorderLayout.CENTER);
         this.setPreferredSize(new Dimension(246,(int)this.getPreferredSize().getHeight()));
 

designer_chart/src/com/fr/plugin/chart/multilayer/data/MultiPiePlotTableDataContentPane.java

@@ -11,12 +11,12 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.TableLayout;
-import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.CalculateComboBox;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
+import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.StringUtils;
 
@@ -32,7 +32,7 @@ import java.util.List;
  */
 public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPane implements UIObserver {
     private static final int HT = 20;
-    private static final int WD = 120;
+    private static final int WD = 100;
     private UISpinner levelNumEdit;
     private UITextField nameField;
     protected UIComboBox value;
@@ -103,7 +103,7 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa
         calculateCombox.reset();
         calculateCombox.setPreferredSize(new Dimension(WD, HT));
 
-        components_center[levelNum] = new Component[]{new JSeparator(), null};
+        components_center[levelNum] = new Component[]{getJSeparator(), null};
         components_center[levelNum+1] = new Component[]{new UILabel(Inter.getLocText("FR-Chart_Bubble_Size")), value};
         components_center[levelNum+2] = new Component[]{new UILabel(Inter.getLocText("Chart-Summary_Method")), calculateCombox};
 
@@ -112,7 +112,7 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa
         registerListener4Center();
 
 
-        return TableLayoutHelper.createTableLayoutPane(components_center,rowSize_center,columnSize_center);
+        return TableLayout4VanChartHelper.createGapTableLayoutPane(components_center,rowSize_center,columnSize_center);
 
 
     }
@@ -175,11 +175,11 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa
 
         Component[][] components_north = new Component[][]{
                 new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_MultiPie_Series_Name")), nameField},
-                new Component[]{new JSeparator(),null },
+                new Component[]{getJSeparator(),null },
                 new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Level_Number")), levelNumEdit},
         };
 
-        return TableLayoutHelper.createTableLayoutPane(components_north, rowSize_north, columnSize_north);
+        return TableLayout4VanChartHelper.createGapTableLayoutPane(components_north, rowSize_north, columnSize_north);
     }
 
     private void refreshCenterPane(){
@@ -357,4 +357,10 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa
         }
         return false;
     }
+
+    protected JSeparator getJSeparator() {
+        JSeparator jSeparator = new JSeparator();
+        jSeparator.setPreferredSize(new Dimension(220, 2));
+        return jSeparator;
+    }
 }