Browse Source

修改format面板

master
mengao 7 years ago
parent
commit
15d034ed3d
  1. 11
      designer_chart/src/com/fr/plugin/chart/designer/component/format/FormatPaneWithNormalType.java
  2. 1
      designer_chart/src/com/fr/plugin/chart/designer/component/format/FormatPaneWithOutFont.java
  3. 5
      designer_chart/src/com/fr/plugin/chart/designer/style/datasheet/VanChartDataSheetPane.java

11
designer_chart/src/com/fr/plugin/chart/designer/component/format/DataSheetFormatPane.java → designer_chart/src/com/fr/plugin/chart/designer/component/format/FormatPaneWithNormalType.java

@ -2,7 +2,6 @@ package com.fr.plugin.chart.designer.component.format;
import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.style.FormatPane;
import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayout;
import com.fr.general.Inter; import com.fr.general.Inter;
import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
@ -12,8 +11,16 @@ import java.awt.*;
/** /**
* Created by mengao on 2017/8/14. * Created by mengao on 2017/8/14.
* 没有字体设置
* 类型下拉框中只有常规数字百分比货币科学计数选项没有时间型日期型文本型选项
*/ */
public class DataSheetFormatPane extends FormatPane { public class FormatPaneWithNormalType extends FormatPaneWithOutFont {
public FormatPaneWithNormalType() {
super();
setForDataSheet();
}
protected Component[][] getComponent(JPanel fontPane, JPanel centerPane, JPanel typePane) { protected Component[][] getComponent(JPanel fontPane, JPanel centerPane, JPanel typePane) {
return new Component[][]{ return new Component[][]{
new Component[]{null, centerPane}, new Component[]{null, centerPane},

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

@ -9,6 +9,7 @@ import java.awt.*;
/** /**
* Created by mengao on 2017/8/28. * Created by mengao on 2017/8/28.
* 只有文本格式设置没有字体设置
*/ */
public class FormatPaneWithOutFont extends FormatPane { public class FormatPaneWithOutFont extends FormatPane {
private static final int HEIGHT = 30; private static final int HEIGHT = 30;

5
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.AbstractVanChartScrollPane;
import com.fr.plugin.chart.designer.TableLayout4VanChartHelper; import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
import com.fr.plugin.chart.designer.component.border.VanChartBorderPane; import com.fr.plugin.chart.designer.component.border.VanChartBorderPane;
import com.fr.plugin.chart.designer.component.format.DataSheetFormatPane; import com.fr.plugin.chart.designer.component.format.FormatPaneWithNormalType;
import com.fr.plugin.chart.type.AxisType; import com.fr.plugin.chart.type.AxisType;
import javax.swing.*; import javax.swing.*;
@ -85,8 +85,7 @@ public class VanChartDataSheetPane extends AbstractVanChartScrollPane<Chart> {
private JPanel createDataSheetPane(){ private JPanel createDataSheetPane(){
textAttrPane = new ChartTextAttrPane(); textAttrPane = new ChartTextAttrPane();
formatPane = new DataSheetFormatPane(); formatPane = new FormatPaneWithNormalType();
formatPane.setForDataSheet();
borderPane = new VanChartBorderPane(); borderPane = new VanChartBorderPane();
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;

Loading…
Cancel
Save