9.0新图表配置面板调整

designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPane.java

@@ -14,7 +14,7 @@ import java.awt.*;
 /**
  * Created by mengao on 2017/8/14.
  */
-public class FormatPane4VanChart extends FormatPane {
+public class VanChartFormatPane extends FormatPane {
     protected Component[][] getComponent(JPanel fontPane, JPanel centerPane, FRFontPane frFontPane) {
         return new Component[][]{
                 new Component[]{null, centerPane},

designer_chart/src/com/fr/plugin/chart/designer/component/label/GaugeLabelContentPane.java

@@ -0,0 +1,25 @@
+package com.fr.plugin.chart.designer.component.label;
+
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.general.Inter;
+import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
+import com.fr.plugin.chart.designer.component.VanChartLabelContentPane;
+import com.fr.plugin.chart.designer.style.VanChartStylePane;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+ * Created by mengao on 2017/8/13.
+ */
+public class GaugeLabelContentPane extends VanChartLabelContentPane {
+
+    public GaugeLabelContentPane(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected JPanel getContentPane(Component[][] components, double[] column, double[] row, UILabel text) {
+        text.setText(Inter.getLocText("Plugin-ChartF_Content"));
+        return TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, column);
+    }
+}

designer_chart/src/com/fr/plugin/chart/designer/component/label/LabelContentPane4Gauge.java

@@ -1,36 +0,0 @@
-package com.fr.plugin.chart.designer.component.label;
-
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.layout.TableLayout;
-import com.fr.general.Inter;
-import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
-import com.fr.plugin.chart.designer.component.VanChartLabelContentPane;
-import com.fr.plugin.chart.designer.style.VanChartStylePane;
-
-import javax.swing.*;
-import java.awt.*;
-
-/**
- * Created by mengao on 2017/8/13.
- */
-public class LabelContentPane4Gauge extends VanChartLabelContentPane {
-
-    public LabelContentPane4Gauge(VanChartStylePane parent, JPanel showOnPane) {
-        super(parent, showOnPane);
-    }
-
-    protected JPanel getContentPane (){
-        double p = TableLayout.PREFERRED;
-        double f = TableLayout.FILL;
-        double[] column = {p, f};
-        double[] row = {p,p,p};
-        Component[][] components = new Component[][]{
-                new Component[]{null,null},
-                new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Content")),content},
-                new Component[]{null,getCenterPane()},
-
-        };
-
-        return TableLayout4VanChartHelper.createGapTableLayoutPane(components,row,column);
-    }
-}

designer_chart/src/com/fr/plugin/chart/designer/component/label/LabelContentPaneWithCateLabelContentPane.java

@@ -9,11 +9,11 @@ import java.awt.*;
 /**
  * 只有分类（仪表盘的分类标签）
  */
-public class LabelContentPaneWithCate extends LabelContentPane4Gauge {
+public class LabelContentPaneWithCateLabelContentPane extends GaugeLabelContentPane {
 
     private static final long serialVersionUID = 1238530475858471304L;
 
-    public LabelContentPaneWithCate(VanChartStylePane parent, JPanel showOnPane){
+    public LabelContentPaneWithCateLabelContentPane(VanChartStylePane parent, JPanel showOnPane){
         super(parent, showOnPane);
     }
 

designer_chart/src/com/fr/plugin/chart/designer/component/label/LabelContentPaneWithCateValueLabelContentPane.java

@@ -9,11 +9,11 @@ import java.awt.*;
 /**
  * 分类和值（仪表盘的值标签）
  */
-public class LabelContentPaneWithCateValue extends LabelContentPane4Gauge {
+public class LabelContentPaneWithCateValueLabelContentPane extends GaugeLabelContentPane {
 
     private static final long serialVersionUID = -8286902939543416431L;
 
-    public LabelContentPaneWithCateValue(VanChartStylePane parent, JPanel showOnPane){
+    public LabelContentPaneWithCateValueLabelContentPane(VanChartStylePane parent, JPanel showOnPane){
         super(parent, showOnPane);
     }
 

designer_chart/src/com/fr/plugin/chart/designer/component/label/LabelContentPaneWithOutCateLabelContentPane.java

@@ -9,11 +9,11 @@ import java.awt.*;
 /**
  * 系列、值、值所占比例。（仪表盘的值标签）
  */
-public class LabelContentPaneWithOutCate extends LabelContentPane4Gauge {
+public class LabelContentPaneWithOutCateLabelContentPane extends GaugeLabelContentPane {
 
     private static final long serialVersionUID = 1198062632979554467L;
 
-    public LabelContentPaneWithOutCate(VanChartStylePane parent, JPanel showOnPane){
+    public LabelContentPaneWithOutCateLabelContentPane(VanChartStylePane parent, JPanel showOnPane){
         super(parent, showOnPane);
     }
 

designer_chart/src/com/fr/plugin/chart/designer/component/label/LabelContentPaneWithPercentLabelContentPane.java

@@ -9,10 +9,10 @@ import java.awt.*;
 /**
  * 只有百分比（仪表盘的百分比标签）
  */
-public class LabelContentPaneWithPercent extends LabelContentPane4Gauge {
+public class LabelContentPaneWithPercentLabelContentPane extends GaugeLabelContentPane {
     private static final long serialVersionUID = -3739217668948747606L;
 
-    public LabelContentPaneWithPercent(VanChartStylePane parent, JPanel showOnPane){
+    public LabelContentPaneWithPercentLabelContentPane(VanChartStylePane parent, JPanel showOnPane){
         super(parent, showOnPane);
     }
 

designer_chart/src/com/fr/plugin/chart/designer/style/datasheet/VanChartDataSheetPane.java

@@ -20,7 +20,7 @@ import com.fr.plugin.chart.base.VanChartConstants;
 import com.fr.plugin.chart.designer.AbstractVanChartScrollPane;
 import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
 import com.fr.plugin.chart.designer.component.border.VanChartBorderPane;
-import com.fr.plugin.chart.designer.component.format.FormatPane4VanChart;
+import com.fr.plugin.chart.designer.component.format.VanChartFormatPane;
 import com.fr.plugin.chart.type.AxisType;
 
 import javax.swing.*;
@@ -85,7 +85,7 @@ public class VanChartDataSheetPane extends AbstractVanChartScrollPane<Chart> {
 
     private JPanel createDataSheetPane(){
         textAttrPane = new ChartTextAttrPane();
-        formatPane = new FormatPane4VanChart();
+        formatPane = new VanChartFormatPane();
         formatPane.setForDataSheet();
         borderPane = new VanChartBorderPane();