|
|
|
@ -54,11 +54,13 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> { |
|
|
|
|
|
|
|
|
|
|
|
private static final long serialVersionUID = -5717246802333308973L; |
|
|
|
private static final long serialVersionUID = -5717246802333308973L; |
|
|
|
private static final double ROTATION_MAX = 90.0; |
|
|
|
private static final double ROTATION_MAX = 90.0; |
|
|
|
|
|
|
|
protected UIButtonGroup showTitle; |
|
|
|
protected TinyFormulaPane titleContent; |
|
|
|
protected TinyFormulaPane titleContent; |
|
|
|
protected UIButtonGroup<Integer> titleAlignPane; |
|
|
|
protected UIButtonGroup<Integer> titleAlignPane; |
|
|
|
protected UIToggleButton titleUseHtml; |
|
|
|
protected UIToggleButton titleUseHtml; |
|
|
|
protected ChartTextAttrPane titleTextAttrPane; |
|
|
|
protected ChartTextAttrPane titleTextAttrPane; |
|
|
|
protected UINumberDragPane titleTextRotation; |
|
|
|
protected UINumberDragPane titleTextRotation; |
|
|
|
|
|
|
|
protected JPanel titlePane; |
|
|
|
|
|
|
|
|
|
|
|
protected UIButtonGroup showLabel; |
|
|
|
protected UIButtonGroup showLabel; |
|
|
|
protected ChartTextAttrPane labelTextAttrPane; |
|
|
|
protected ChartTextAttrPane labelTextAttrPane; |
|
|
|
@ -96,11 +98,11 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> { |
|
|
|
protected JPanel centerPane; |
|
|
|
protected JPanel centerPane; |
|
|
|
private VanChartHtmlLabelPane htmlLabelPane; |
|
|
|
private VanChartHtmlLabelPane htmlLabelPane; |
|
|
|
|
|
|
|
|
|
|
|
public VanChartBaseAxisPane(){ |
|
|
|
public VanChartBaseAxisPane() { |
|
|
|
this(true); |
|
|
|
this(true); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public VanChartBaseAxisPane(boolean isXAxis){ |
|
|
|
public VanChartBaseAxisPane(boolean isXAxis) { |
|
|
|
this.setLayout(new BorderLayout()); |
|
|
|
this.setLayout(new BorderLayout()); |
|
|
|
this.add(createContentPane(isXAxis), BorderLayout.CENTER); |
|
|
|
this.add(createContentPane(isXAxis), BorderLayout.CENTER); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -108,12 +110,13 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> { |
|
|
|
public void setParentPane(VanChartStylePane parent) { |
|
|
|
public void setParentPane(VanChartStylePane parent) { |
|
|
|
htmlLabelPane.setParent(parent); |
|
|
|
htmlLabelPane.setParent(parent); |
|
|
|
} |
|
|
|
} |
|
|
|
protected void reLayoutPane(boolean isXAxis){ |
|
|
|
|
|
|
|
|
|
|
|
protected void reLayoutPane(boolean isXAxis) { |
|
|
|
this.removeAll(); |
|
|
|
this.removeAll(); |
|
|
|
this.add(createContentPane(isXAxis), BorderLayout.CENTER); |
|
|
|
this.add(createContentPane(isXAxis), BorderLayout.CENTER); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
protected JPanel createContentPane(boolean isXAxis){ |
|
|
|
protected JPanel createContentPane(boolean isXAxis) { |
|
|
|
|
|
|
|
|
|
|
|
double p = TableLayout.PREFERRED; |
|
|
|
double p = TableLayout.PREFERRED; |
|
|
|
double f = TableLayout.FILL; |
|
|
|
double f = TableLayout.FILL; |
|
|
|
@ -121,9 +124,9 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> { |
|
|
|
double s = TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH; |
|
|
|
double s = TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH; |
|
|
|
double[] columnSize = {f, e}; |
|
|
|
double[] columnSize = {f, e}; |
|
|
|
double[] column = {f, s}; |
|
|
|
double[] column = {f, s}; |
|
|
|
double[] rowSize = {p, p, p, p, p, p, p,p}; |
|
|
|
double[] rowSize = {p, p, p, p, p, p, p, p}; |
|
|
|
Component[][] components = new Component[][]{ |
|
|
|
Component[][] components = new Component[][]{ |
|
|
|
new Component[]{createTitlePane(new double[]{p, p, p, p, p, p}, columnSize, isXAxis), null}, |
|
|
|
new Component[]{createTitlePane(new double[]{p, p, p, p, p, p}, column, isXAxis), null}, |
|
|
|
new Component[]{createLabelPane(new double[]{p, p}, column), null}, |
|
|
|
new Component[]{createLabelPane(new double[]{p, p}, column), null}, |
|
|
|
new Component[]{createLineStylePane(new double[]{p, p, p, p, p}, columnSize), null}, |
|
|
|
new Component[]{createLineStylePane(new double[]{p, p, p, p, p}, columnSize), null}, |
|
|
|
new Component[]{createAxisPositionPane(new double[]{p, p, p}, columnSize, isXAxis), null}, |
|
|
|
new Component[]{createAxisPositionPane(new double[]{p, p, p}, columnSize, isXAxis), null}, |
|
|
|
@ -131,39 +134,53 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> { |
|
|
|
new Component[]{createValueStylePane(), null}, |
|
|
|
new Component[]{createValueStylePane(), null}, |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); |
|
|
|
return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
protected JPanel createTitlePane(double[] row, double[] col, boolean isXAxis){ |
|
|
|
protected JPanel createTitlePane(double[] row, double[] col, boolean isXAxis) { |
|
|
|
|
|
|
|
showTitle = new UIButtonGroup(new String[]{Toolkit.i18nText("Fine-Design_Chart_Use_Show"), Toolkit.i18nText("Fine-Design_Chart_Hidden")}); |
|
|
|
titleAlignPane = isXAxis ? getXAxisTitleAlignPane() : getYAxisTitleAlignPane(); |
|
|
|
titleAlignPane = isXAxis ? getXAxisTitleAlignPane() : getYAxisTitleAlignPane(); |
|
|
|
titleAlignPane.setSelectedItem(Constants.CENTER); |
|
|
|
titleAlignPane.setSelectedItem(Constants.CENTER); |
|
|
|
titleContent = new TinyFormulaPane(); |
|
|
|
titleContent = new TinyFormulaPane(); |
|
|
|
titleUseHtml = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Html")); |
|
|
|
titleUseHtml = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Html")); |
|
|
|
UIComponentUtils.setLineWrap(titleUseHtml); |
|
|
|
UIComponentUtils.setLineWrap(titleUseHtml); |
|
|
|
titleTextAttrPane = new ChartTextAttrPane(); |
|
|
|
titleTextAttrPane = getChartTextAttrPane(); |
|
|
|
titleTextRotation = new UINumberDragPane(-ROTATION_MAX,ROTATION_MAX); |
|
|
|
titleTextRotation = new UINumberDragPane(-ROTATION_MAX, ROTATION_MAX); |
|
|
|
if(isXAxis){ |
|
|
|
if (isXAxis) { |
|
|
|
titleTextRotation.populateBean(0.0); |
|
|
|
titleTextRotation.populateBean(0.0); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
titleTextRotation.populateBean(-ROTATION_MAX); |
|
|
|
titleTextRotation.populateBean(-ROTATION_MAX); |
|
|
|
} |
|
|
|
} |
|
|
|
Component[][] components = new Component[][]{ |
|
|
|
Component[][] components = new Component[][]{ |
|
|
|
new Component[]{null,null}, |
|
|
|
new Component[]{null, null}, |
|
|
|
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content")),titleContent}, |
|
|
|
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content")), titleContent}, |
|
|
|
new Component[]{null,titleUseHtml}, |
|
|
|
new Component[]{null, titleUseHtml}, |
|
|
|
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Position")),titleAlignPane}, |
|
|
|
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Position")), titleAlignPane}, |
|
|
|
new Component[]{titleTextAttrPane,null}, |
|
|
|
new Component[]{titleTextAttrPane, null}, |
|
|
|
new Component[]{ |
|
|
|
new Component[]{ |
|
|
|
FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TextRotation")), |
|
|
|
FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TextRotation")), |
|
|
|
UIComponentUtils.wrapWithBorderLayoutPane(titleTextRotation) |
|
|
|
UIComponentUtils.wrapWithBorderLayoutPane(titleTextRotation) |
|
|
|
}, |
|
|
|
}, |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
titlePane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); |
|
|
|
|
|
|
|
titlePane.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0)); |
|
|
|
|
|
|
|
|
|
|
|
JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); |
|
|
|
JPanel showTitlePane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Axis_Title"), showTitle); |
|
|
|
return TableLayout4VanChartHelper.createExpandablePaneWithTitle(PaneTitleConstants.CHART_STYLE_TITLE_TITLE, panel); |
|
|
|
showTitle.addActionListener(new ActionListener() { |
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
|
|
public void actionPerformed(ActionEvent e) { |
|
|
|
|
|
|
|
checkTitlePane(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
JPanel jPanel = new JPanel(new BorderLayout()); |
|
|
|
|
|
|
|
jPanel.add(showTitlePane, BorderLayout.NORTH); |
|
|
|
|
|
|
|
jPanel.add(titlePane, BorderLayout.CENTER); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return TableLayout4VanChartHelper.createExpandablePaneWithTitle(PaneTitleConstants.CHART_STYLE_TITLE_TITLE, jPanel); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private UIButtonGroup<Integer> getXAxisTitleAlignPane(){ |
|
|
|
private UIButtonGroup<Integer> getXAxisTitleAlignPane() { |
|
|
|
Icon[] alignmentIconArray = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal.png"), |
|
|
|
Icon[] alignmentIconArray = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal.png"), |
|
|
|
BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.png"), |
|
|
|
BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.png"), |
|
|
|
BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png")}; |
|
|
|
BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png")}; |
|
|
|
@ -171,7 +188,8 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> { |
|
|
|
|
|
|
|
|
|
|
|
return new UIButtonGroup<Integer>(alignmentIconArray, alignment); |
|
|
|
return new UIButtonGroup<Integer>(alignmentIconArray, alignment); |
|
|
|
} |
|
|
|
} |
|
|
|
private UIButtonGroup<Integer> getYAxisTitleAlignPane(){ |
|
|
|
|
|
|
|
|
|
|
|
private UIButtonGroup<Integer> getYAxisTitleAlignPane() { |
|
|
|
Icon[] alignmentIconArray = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_top_normal.png"), |
|
|
|
Icon[] alignmentIconArray = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_top_normal.png"), |
|
|
|
BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_center_normal.png"), |
|
|
|
BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_center_normal.png"), |
|
|
|
BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_down_normal.png")}; |
|
|
|
BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_down_normal.png")}; |
|
|
|
@ -180,7 +198,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> { |
|
|
|
return new UIButtonGroup<Integer>(alignmentIconArray, alignment); |
|
|
|
return new UIButtonGroup<Integer>(alignmentIconArray, alignment); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
protected JPanel createLabelPane(double[] row, double[] col){ |
|
|
|
protected JPanel createLabelPane(double[] row, double[] col) { |
|
|
|
showLabel = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Show"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hidden")}); |
|
|
|
showLabel = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Show"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hidden")}); |
|
|
|
labelTextAttrPane = getChartTextAttrPane(); |
|
|
|
labelTextAttrPane = getChartTextAttrPane(); |
|
|
|
|
|
|
|
|
|
|
|
@ -205,9 +223,9 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> { |
|
|
|
new Component[]{gapPanel, null}, |
|
|
|
new Component[]{gapPanel, null}, |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
JPanel showLabelPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label"),showLabel); |
|
|
|
JPanel showLabelPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label"), showLabel); |
|
|
|
labelPanel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); |
|
|
|
labelPanel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); |
|
|
|
labelPanel.setBorder(BorderFactory.createEmptyBorder(0,10,0,0)); |
|
|
|
labelPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0)); |
|
|
|
showLabel.addActionListener(new ActionListener() { |
|
|
|
showLabel.addActionListener(new ActionListener() { |
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public void actionPerformed(ActionEvent e) { |
|
|
|
public void actionPerformed(ActionEvent e) { |
|
|
|
@ -308,11 +326,11 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> { |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
protected ChartTextAttrPane getChartTextAttrPane(){ |
|
|
|
protected ChartTextAttrPane getChartTextAttrPane() { |
|
|
|
return new ChartTextAttrPane(){ |
|
|
|
return new ChartTextAttrPane() { |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
protected JPanel getContentPane (JPanel buttonPane) { |
|
|
|
protected JPanel getContentPane(JPanel buttonPane) { |
|
|
|
double p = TableLayout.PREFERRED; |
|
|
|
double p = TableLayout.PREFERRED; |
|
|
|
double f = TableLayout.FILL; |
|
|
|
double f = TableLayout.FILL; |
|
|
|
double e = TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH; |
|
|
|
double e = TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH; |
|
|
|
@ -324,10 +342,10 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> { |
|
|
|
}; |
|
|
|
}; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
protected JPanel createLineStylePane(double[] row, double[] col){ |
|
|
|
protected JPanel createLineStylePane(double[] row, double[] col) { |
|
|
|
axisLineStyle = createLineComboBox(); |
|
|
|
axisLineStyle = createLineComboBox(); |
|
|
|
axisLineColor = new ColorSelectBox(100); |
|
|
|
axisLineColor = new ColorSelectBox(100); |
|
|
|
String[] strings = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")}; |
|
|
|
String[] strings = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")}; |
|
|
|
AxisTickLineType[] values = new AxisTickLineType[]{AxisTickLineType.TICK_LINE_OUTSIDE, AxisTickLineType.TICK_LINE_NONE}; |
|
|
|
AxisTickLineType[] values = new AxisTickLineType[]{AxisTickLineType.TICK_LINE_OUTSIDE, AxisTickLineType.TICK_LINE_NONE}; |
|
|
|
mainTick = new UIButtonGroup<AxisTickLineType>(strings, values); |
|
|
|
mainTick = new UIButtonGroup<AxisTickLineType>(strings, values); |
|
|
|
secondTick = new UIButtonGroup<AxisTickLineType>(strings, values); |
|
|
|
secondTick = new UIButtonGroup<AxisTickLineType>(strings, values); |
|
|
|
@ -342,15 +360,15 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> { |
|
|
|
|
|
|
|
|
|
|
|
protected Component[][] getLineStylePaneComponents() { |
|
|
|
protected Component[][] getLineStylePaneComponents() { |
|
|
|
return new Component[][]{ |
|
|
|
return new Component[][]{ |
|
|
|
new Component[]{null,null} , |
|
|
|
new Component[]{null, null}, |
|
|
|
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Type")),axisLineStyle} , |
|
|
|
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Type")), axisLineStyle}, |
|
|
|
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")),axisLineColor}, |
|
|
|
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")), axisLineColor}, |
|
|
|
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Graduation_Line")),mainTick}, |
|
|
|
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Graduation_Line")), mainTick}, |
|
|
|
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Graduation_Line")),secondTick}, |
|
|
|
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Graduation_Line")), secondTick}, |
|
|
|
}; |
|
|
|
}; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
protected JPanel createAxisPositionPane(double[] row, double[] col, boolean isXAxis){ |
|
|
|
protected JPanel createAxisPositionPane(double[] row, double[] col, boolean isXAxis) { |
|
|
|
position = new UIButtonGroup<Integer>(getAxisPositionNameArray(isXAxis), getAxisPositionValueArray(isXAxis)); |
|
|
|
position = new UIButtonGroup<Integer>(getAxisPositionNameArray(isXAxis), getAxisPositionValueArray(isXAxis)); |
|
|
|
reversed = new UIButtonGroup<Boolean>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_On"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Off")}, new Boolean[]{true, false}); |
|
|
|
reversed = new UIButtonGroup<Boolean>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_On"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Off")}, new Boolean[]{true, false}); |
|
|
|
Component[][] components = new Component[][]{ |
|
|
|
Component[][] components = new Component[][]{ |
|
|
|
@ -359,30 +377,30 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> { |
|
|
|
FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Position")), |
|
|
|
FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Position")), |
|
|
|
UIComponentUtils.wrapWithBorderLayoutPane(position) |
|
|
|
UIComponentUtils.wrapWithBorderLayoutPane(position) |
|
|
|
}, |
|
|
|
}, |
|
|
|
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_AxisReversed")),reversed}, |
|
|
|
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_AxisReversed")), reversed}, |
|
|
|
} ; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); |
|
|
|
JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); |
|
|
|
return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Position"), panel); |
|
|
|
return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Position"), panel); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private String[] getAxisPositionNameArray(boolean isXAxis){ |
|
|
|
private String[] getAxisPositionNameArray(boolean isXAxis) { |
|
|
|
if(isXAxis){ |
|
|
|
if (isXAxis) { |
|
|
|
return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Top"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Bottom"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Vertical_Zero")}; |
|
|
|
return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Top"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Bottom"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Vertical_Zero")}; |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Left"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Right"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Vertical_Zero")}; |
|
|
|
return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Left"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Right"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Vertical_Zero")}; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private Integer[] getAxisPositionValueArray(boolean isXAxis){ |
|
|
|
private Integer[] getAxisPositionValueArray(boolean isXAxis) { |
|
|
|
if(isXAxis){ |
|
|
|
if (isXAxis) { |
|
|
|
return new Integer[]{VanChartConstants.AXIS_TOP, VanChartConstants.AXIS_BOTTOM, VanChartConstants.AXIS_VERTICAL_ZERO}; |
|
|
|
return new Integer[]{VanChartConstants.AXIS_TOP, VanChartConstants.AXIS_BOTTOM, VanChartConstants.AXIS_VERTICAL_ZERO}; |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
return new Integer[]{VanChartConstants.AXIS_LEFT, VanChartConstants.AXIS_RIGHT, VanChartConstants.AXIS_VERTICAL_ZERO}; |
|
|
|
return new Integer[]{VanChartConstants.AXIS_LEFT, VanChartConstants.AXIS_RIGHT, VanChartConstants.AXIS_VERTICAL_ZERO}; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
protected JPanel createDisplayStrategy(){ |
|
|
|
protected JPanel createDisplayStrategy() { |
|
|
|
//区域显示策略 恢复用注释。删除到return，即除了注释的代码都删除。
|
|
|
|
//区域显示策略 恢复用注释。删除到return，即除了注释的代码都删除。
|
|
|
|
maxProportion = new UISpinner(0, 100, 1, 30); |
|
|
|
maxProportion = new UISpinner(0, 100, 1, 30); |
|
|
|
axisLimitSize = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Limit"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Not_Limit")}); |
|
|
|
axisLimitSize = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Limit"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Not_Limit")}); |
|
|
|
@ -408,7 +426,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> { |
|
|
|
// return limitPane;
|
|
|
|
// return limitPane;
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
protected JPanel createValueStylePane(){ |
|
|
|
protected JPanel createValueStylePane() { |
|
|
|
valueFormatStyle = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Common"), |
|
|
|
valueFormatStyle = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Common"), |
|
|
|
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom")}); |
|
|
|
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom")}); |
|
|
|
|
|
|
|
|
|
|
|
@ -418,19 +436,19 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> { |
|
|
|
htmlLabelPane = new VanChartHtmlLabelPane(); |
|
|
|
htmlLabelPane = new VanChartHtmlLabelPane(); |
|
|
|
|
|
|
|
|
|
|
|
centerPane = new JPanel(new CardLayout()); |
|
|
|
centerPane = new JPanel(new CardLayout()); |
|
|
|
centerPane.add(valueFormat,com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Common")); |
|
|
|
centerPane.add(valueFormat, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Common")); |
|
|
|
centerPane.add(htmlLabelPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom")); |
|
|
|
centerPane.add(htmlLabelPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom")); |
|
|
|
|
|
|
|
|
|
|
|
double p = TableLayout.PREFERRED; |
|
|
|
double p = TableLayout.PREFERRED; |
|
|
|
double f = TableLayout.FILL; |
|
|
|
double f = TableLayout.FILL; |
|
|
|
double[] columnSize = {p,f}; |
|
|
|
double[] columnSize = {p, f}; |
|
|
|
double[] rowSize = {p,p,p}; |
|
|
|
double[] rowSize = {p, p, p}; |
|
|
|
Component[][] components = new Component[][]{ |
|
|
|
Component[][] components = new Component[][]{ |
|
|
|
new Component[]{null,null}, |
|
|
|
new Component[]{null, null}, |
|
|
|
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Format"), SwingConstants.LEFT), valueFormatStyle}, |
|
|
|
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Format"), SwingConstants.LEFT), valueFormatStyle}, |
|
|
|
new Component[]{null, centerPane}, |
|
|
|
new Component[]{null, centerPane}, |
|
|
|
}; |
|
|
|
}; |
|
|
|
JPanel contentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components,rowSize,columnSize); |
|
|
|
JPanel contentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
valueFormatStyle.addActionListener(new ActionListener() { |
|
|
|
valueFormatStyle.addActionListener(new ActionListener() { |
|
|
|
@ -443,12 +461,12 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> { |
|
|
|
return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format"), contentPane); |
|
|
|
return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format"), contentPane); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
protected FormatPane createFormatPane(){ |
|
|
|
protected FormatPane createFormatPane() { |
|
|
|
return new FormatPane(){ |
|
|
|
return new FormatPane() { |
|
|
|
protected Component[][] getComponent (JPanel fontPane, JPanel centerPane, JPanel typePane) { |
|
|
|
protected Component[][] getComponent(JPanel fontPane, JPanel centerPane, JPanel typePane) { |
|
|
|
typePane.setBorder(BorderFactory.createEmptyBorder()); |
|
|
|
typePane.setBorder(BorderFactory.createEmptyBorder()); |
|
|
|
return new Component[][]{ |
|
|
|
return new Component[][]{ |
|
|
|
new Component[]{typePane,null}, |
|
|
|
new Component[]{typePane, null}, |
|
|
|
new Component[]{centerPane, null}, |
|
|
|
new Component[]{centerPane, null}, |
|
|
|
}; |
|
|
|
}; |
|
|
|
} |
|
|
|
} |
|
|
|
@ -462,6 +480,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> { |
|
|
|
protected void checkAllUse() { |
|
|
|
protected void checkAllUse() { |
|
|
|
checkCardPane(); |
|
|
|
checkCardPane(); |
|
|
|
checkLabelPane(); |
|
|
|
checkLabelPane(); |
|
|
|
|
|
|
|
checkTitlePane(); |
|
|
|
//区域显示策略 恢复用注释。删除下面一行。
|
|
|
|
//区域显示策略 恢复用注释。删除下面一行。
|
|
|
|
checkMaxProPortionUse(); |
|
|
|
checkMaxProPortionUse(); |
|
|
|
|
|
|
|
|
|
|
|
@ -480,10 +499,10 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
protected void checkCardPane() { |
|
|
|
protected void checkCardPane() { |
|
|
|
if(centerPane != null && valueFormatStyle != null){ |
|
|
|
if (centerPane != null && valueFormatStyle != null) { |
|
|
|
CardLayout cardLayout = (CardLayout) centerPane.getLayout(); |
|
|
|
CardLayout cardLayout = (CardLayout) centerPane.getLayout(); |
|
|
|
if (valueFormatStyle.getSelectedIndex() == 1) { |
|
|
|
if (valueFormatStyle.getSelectedIndex() == 1) { |
|
|
|
cardLayout.show(centerPane,com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom")); |
|
|
|
cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom")); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Common")); |
|
|
|
cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Common")); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -491,12 +510,12 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
protected void checkLabelPane() { |
|
|
|
protected void checkLabelPane() { |
|
|
|
if(showLabel != null){ |
|
|
|
if (showLabel != null) { |
|
|
|
boolean enabled = showLabel.getSelectedIndex() == 0; |
|
|
|
boolean enabled = showLabel.getSelectedIndex() == 0; |
|
|
|
if(labelPanel != null){ |
|
|
|
if (labelPanel != null) { |
|
|
|
labelPanel.setVisible(enabled); |
|
|
|
labelPanel.setVisible(enabled); |
|
|
|
} |
|
|
|
} |
|
|
|
if(enabled){ |
|
|
|
if (enabled) { |
|
|
|
//轴标签缩略间隔显示 恢复用注释。下面1行删除。
|
|
|
|
//轴标签缩略间隔显示 恢复用注释。下面1行删除。
|
|
|
|
checkLabelGapValuePane(); |
|
|
|
checkLabelGapValuePane(); |
|
|
|
//轴标签缩略间隔显示 恢复用注释。取消注释。
|
|
|
|
//轴标签缩略间隔显示 恢复用注释。取消注释。
|
|
|
|
@ -505,6 +524,12 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
protected void checkTitlePane() { |
|
|
|
|
|
|
|
if (showTitle != null && titlePane != null) { |
|
|
|
|
|
|
|
titlePane.setVisible(showTitle.getSelectedIndex() == 0); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private void checkLabelGapAndStylePane() { |
|
|
|
private void checkLabelGapAndStylePane() { |
|
|
|
if (overlapHandleTypeGroup != null && labelGapStylePane != null) { |
|
|
|
if (overlapHandleTypeGroup != null && labelGapStylePane != null) { |
|
|
|
boolean visible = overlapHandleTypeGroup.getSelectedItem() == OverlapHandleType.INTERVAL; |
|
|
|
boolean visible = overlapHandleTypeGroup.getSelectedItem() == OverlapHandleType.INTERVAL; |
|
|
|
@ -528,28 +553,31 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> { |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* 是否是指定类型 |
|
|
|
* 是否是指定类型 |
|
|
|
|
|
|
|
* |
|
|
|
* @param ob 对象 |
|
|
|
* @param ob 对象 |
|
|
|
* @return 是否是指定类型 |
|
|
|
* @return 是否是指定类型 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public boolean accept(Object ob){ |
|
|
|
public boolean accept(Object ob) { |
|
|
|
return false; |
|
|
|
return false; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* title应该是一个属性，不只是对话框的标题时用到，与其他组件结合时，也会用得到 |
|
|
|
* title应该是一个属性，不只是对话框的标题时用到，与其他组件结合时，也会用得到 |
|
|
|
|
|
|
|
* |
|
|
|
* @return 绥化狂标题 |
|
|
|
* @return 绥化狂标题 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public String title4PopupWindow(){ |
|
|
|
public String title4PopupWindow() { |
|
|
|
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Axis"); |
|
|
|
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Axis"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* 重置 |
|
|
|
* 重置 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public void reset(){ |
|
|
|
public void reset() { |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public void populateBean(VanChartAxis axis) { |
|
|
|
public void populateBean(VanChartAxis axis) { |
|
|
|
populateTitle(axis); |
|
|
|
populateTitle(axis); |
|
|
|
@ -568,50 +596,53 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//标题
|
|
|
|
//标题
|
|
|
|
private void populateTitle(VanChartAxis axis){ |
|
|
|
private void populateTitle(VanChartAxis axis) { |
|
|
|
|
|
|
|
if (showTitle != null) { |
|
|
|
|
|
|
|
showTitle.setSelectedIndex(axis.isShowAxisTitle() ? 0 : 1); |
|
|
|
|
|
|
|
} |
|
|
|
Title axisTitle = axis.getTitle(); |
|
|
|
Title axisTitle = axis.getTitle(); |
|
|
|
if(axisTitle != null){ |
|
|
|
if (axisTitle != null) { |
|
|
|
if (axisTitle.getTextObject() instanceof BaseFormula && titleContent != null) { |
|
|
|
if (axisTitle.getTextObject() instanceof BaseFormula && titleContent != null) { |
|
|
|
titleContent.populateBean(((BaseFormula) axisTitle.getTextObject()).getContent()); |
|
|
|
titleContent.populateBean(((BaseFormula) axisTitle.getTextObject()).getContent()); |
|
|
|
} else if(titleContent != null){ |
|
|
|
} else if (titleContent != null) { |
|
|
|
titleContent.populateBean(Utils.objectToString(axisTitle.getTextObject())); |
|
|
|
titleContent.populateBean(Utils.objectToString(axisTitle.getTextObject())); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if(titleAlignPane != null){ |
|
|
|
if (titleAlignPane != null) { |
|
|
|
titleAlignPane.setSelectedItem(axisTitle.getPosition()); |
|
|
|
titleAlignPane.setSelectedItem(axisTitle.getPosition()); |
|
|
|
} |
|
|
|
} |
|
|
|
if(titleTextAttrPane != null){ |
|
|
|
if (titleTextAttrPane != null) { |
|
|
|
titleTextAttrPane.populate(axisTitle.getTextAttr()); |
|
|
|
titleTextAttrPane.populate(axisTitle.getTextAttr()); |
|
|
|
} |
|
|
|
} |
|
|
|
if(titleUseHtml != null){ |
|
|
|
if (titleUseHtml != null) { |
|
|
|
titleUseHtml.setSelected(axis.isTitleUseHtml()); |
|
|
|
titleUseHtml.setSelected(axis.isTitleUseHtml()); |
|
|
|
} |
|
|
|
} |
|
|
|
if(titleTextRotation != null){ |
|
|
|
if (titleTextRotation != null) { |
|
|
|
titleTextRotation.populateBean((double)axisTitle.getTextAttr().getRotation()); |
|
|
|
titleTextRotation.populateBean((double) axisTitle.getTextAttr().getRotation()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//标签
|
|
|
|
//标签
|
|
|
|
private void populateLabel(VanChartAxis axis){ |
|
|
|
private void populateLabel(VanChartAxis axis) { |
|
|
|
if(showLabel != null){ |
|
|
|
if (showLabel != null) { |
|
|
|
showLabel.setSelectedIndex(axis.isShowAxisLabel() ? 0 : 1); |
|
|
|
showLabel.setSelectedIndex(axis.isShowAxisLabel() ? 0 : 1); |
|
|
|
} |
|
|
|
} |
|
|
|
TextAttr labelTextAttr = axis.getTextAttr(); |
|
|
|
TextAttr labelTextAttr = axis.getTextAttr(); |
|
|
|
if(labelTextAttrPane != null){ |
|
|
|
if (labelTextAttrPane != null) { |
|
|
|
labelTextAttrPane.populate(labelTextAttr); |
|
|
|
labelTextAttrPane.populate(labelTextAttr); |
|
|
|
} |
|
|
|
} |
|
|
|
if(labelTextRotation != null){ |
|
|
|
if (labelTextRotation != null) { |
|
|
|
labelTextRotation.populateBean((double)labelTextAttr.getRotation()); |
|
|
|
labelTextRotation.populateBean((double) labelTextAttr.getRotation()); |
|
|
|
} |
|
|
|
} |
|
|
|
//轴标签缩略间隔显示 恢复用注释。取消注释。
|
|
|
|
//轴标签缩略间隔显示 恢复用注释。取消注释。
|
|
|
|
// if (overlapHandleTypeGroup != null) {
|
|
|
|
// if (overlapHandleTypeGroup != null) {
|
|
|
|
// overlapHandleTypeGroup.setSelectedItem(axis.getOverlapHandleType());
|
|
|
|
// overlapHandleTypeGroup.setSelectedItem(axis.getOverlapHandleType());
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
if(labelGapStyle != null){ |
|
|
|
if (labelGapStyle != null) { |
|
|
|
labelGapStyle.setSelectedIndex(axis.isAutoLabelGap() ? 0 : 1); |
|
|
|
labelGapStyle.setSelectedIndex(axis.isAutoLabelGap() ? 0 : 1); |
|
|
|
} |
|
|
|
} |
|
|
|
if(labelGapValue != null){ |
|
|
|
if (labelGapValue != null) { |
|
|
|
//轴标签缩略间隔显示 恢复用注释。下面1行删除。
|
|
|
|
//轴标签缩略间隔显示 恢复用注释。下面1行删除。
|
|
|
|
labelGapValue.setText(axis.getLabelNumber().getContent()); |
|
|
|
labelGapValue.setText(axis.getLabelNumber().getContent()); |
|
|
|
//轴标签缩略间隔显示 恢复用注释。取消注释。
|
|
|
|
//轴标签缩略间隔显示 恢复用注释。取消注释。
|
|
|
|
@ -620,30 +651,30 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//轴线样式
|
|
|
|
//轴线样式
|
|
|
|
private void populateLineStyle(VanChartAxis axis){ |
|
|
|
private void populateLineStyle(VanChartAxis axis) { |
|
|
|
if(axisLineStyle != null){ |
|
|
|
if (axisLineStyle != null) { |
|
|
|
axisLineStyle.setSelectedLineStyle(axis.getAxisStyle()); |
|
|
|
axisLineStyle.setSelectedLineStyle(axis.getAxisStyle()); |
|
|
|
} |
|
|
|
} |
|
|
|
if(axisLineColor != null){ |
|
|
|
if (axisLineColor != null) { |
|
|
|
axisLineColor.setSelectObject(axis.getAxisColor()); |
|
|
|
axisLineColor.setSelectObject(axis.getAxisColor()); |
|
|
|
} |
|
|
|
} |
|
|
|
if(mainTick != null){ |
|
|
|
if (mainTick != null) { |
|
|
|
mainTick.setSelectedItem(axis.getMainTickLine()); |
|
|
|
mainTick.setSelectedItem(axis.getMainTickLine()); |
|
|
|
} |
|
|
|
} |
|
|
|
if(secondTick != null){ |
|
|
|
if (secondTick != null) { |
|
|
|
secondTick.setSelectedItem(axis.getSecTickLine()); |
|
|
|
secondTick.setSelectedItem(axis.getSecTickLine()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//位置
|
|
|
|
//位置
|
|
|
|
private void populatePosition(VanChartAxis axis){ |
|
|
|
private void populatePosition(VanChartAxis axis) { |
|
|
|
if(position != null){ |
|
|
|
if (position != null) { |
|
|
|
position.setSelectedItem(axis.getPosition()); |
|
|
|
position.setSelectedItem(axis.getPosition()); |
|
|
|
if(position.getSelectedItem() == null){ |
|
|
|
if (position.getSelectedItem() == null) { |
|
|
|
position.setSelectedIndex(1); |
|
|
|
position.setSelectedIndex(1); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if(reversed != null){ |
|
|
|
if (reversed != null) { |
|
|
|
reversed.setSelectedIndex(axis.hasAxisReversed() == true ? 0 : 1); |
|
|
|
reversed.setSelectedIndex(axis.hasAxisReversed() == true ? 0 : 1); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -666,13 +697,13 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> { |
|
|
|
|
|
|
|
|
|
|
|
//格式
|
|
|
|
//格式
|
|
|
|
protected void populateFormat(VanChartAxis axis) { |
|
|
|
protected void populateFormat(VanChartAxis axis) { |
|
|
|
if(valueFormatStyle != null){ |
|
|
|
if (valueFormatStyle != null) { |
|
|
|
valueFormatStyle.setSelectedIndex(axis.isCommonValueFormat() ? 0 : 1); |
|
|
|
valueFormatStyle.setSelectedIndex(axis.isCommonValueFormat() ? 0 : 1); |
|
|
|
} |
|
|
|
} |
|
|
|
if(valueFormat != null){ |
|
|
|
if (valueFormat != null) { |
|
|
|
valueFormat.populateBean(axis.getFormat()); |
|
|
|
valueFormat.populateBean(axis.getFormat()); |
|
|
|
} |
|
|
|
} |
|
|
|
if(htmlLabelPane != null){ |
|
|
|
if (htmlLabelPane != null) { |
|
|
|
htmlLabelPane.populate(axis.getHtmlLabel()); |
|
|
|
htmlLabelPane.populate(axis.getHtmlLabel()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -690,15 +721,19 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> { |
|
|
|
|
|
|
|
|
|
|
|
updateFormat(axis); |
|
|
|
updateFormat(axis); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//标题
|
|
|
|
//标题
|
|
|
|
private void updateTitle(VanChartAxis axis){ |
|
|
|
private void updateTitle(VanChartAxis axis) { |
|
|
|
|
|
|
|
if (showTitle != null) { |
|
|
|
|
|
|
|
axis.setShowAxisTitle(showTitle.getSelectedIndex() == 0); |
|
|
|
|
|
|
|
} |
|
|
|
Title axisTitle = axis.getTitle(); |
|
|
|
Title axisTitle = axis.getTitle(); |
|
|
|
if(axisTitle == null){ |
|
|
|
if (axisTitle == null) { |
|
|
|
axisTitle = new Title(); |
|
|
|
axisTitle = new Title(); |
|
|
|
axis.setTitle(axisTitle); |
|
|
|
axis.setTitle(axisTitle); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if(titleContent != null){ |
|
|
|
if (titleContent != null) { |
|
|
|
String titleString = titleContent.updateBean(); |
|
|
|
String titleString = titleContent.updateBean(); |
|
|
|
Object titleObj; |
|
|
|
Object titleObj; |
|
|
|
if (StableUtils.maybeFormula(titleString)) { |
|
|
|
if (StableUtils.maybeFormula(titleString)) { |
|
|
|
@ -708,42 +743,42 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> { |
|
|
|
} |
|
|
|
} |
|
|
|
axisTitle.setTextObject(titleObj); |
|
|
|
axisTitle.setTextObject(titleObj); |
|
|
|
} |
|
|
|
} |
|
|
|
if(titleAlignPane != null){ |
|
|
|
if (titleAlignPane != null) { |
|
|
|
axisTitle.setPosition(titleAlignPane.getSelectedItem()); |
|
|
|
axisTitle.setPosition(titleAlignPane.getSelectedItem()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
TextAttr textAttr = axisTitle.getTextAttr(); |
|
|
|
TextAttr textAttr = axisTitle.getTextAttr(); |
|
|
|
if(titleTextAttrPane != null){ |
|
|
|
if (titleTextAttrPane != null) { |
|
|
|
titleTextAttrPane.update(textAttr); |
|
|
|
titleTextAttrPane.update(textAttr); |
|
|
|
} |
|
|
|
} |
|
|
|
if(titleUseHtml != null){ |
|
|
|
if (titleUseHtml != null) { |
|
|
|
axis.setTitleUseHtml(titleUseHtml.isSelected()); |
|
|
|
axis.setTitleUseHtml(titleUseHtml.isSelected()); |
|
|
|
} |
|
|
|
} |
|
|
|
if(titleTextRotation != null){ |
|
|
|
if (titleTextRotation != null) { |
|
|
|
textAttr.setRotation(titleTextRotation.updateBean().intValue()); |
|
|
|
textAttr.setRotation(titleTextRotation.updateBean().intValue()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//标签
|
|
|
|
//标签
|
|
|
|
private void updateLabel(VanChartAxis axis){ |
|
|
|
private void updateLabel(VanChartAxis axis) { |
|
|
|
if(showLabel != null){ |
|
|
|
if (showLabel != null) { |
|
|
|
axis.setShowAxisLabel(showLabel.getSelectedIndex() == 0); |
|
|
|
axis.setShowAxisLabel(showLabel.getSelectedIndex() == 0); |
|
|
|
} |
|
|
|
} |
|
|
|
TextAttr labelTextAttr = axis.getTextAttr(); |
|
|
|
TextAttr labelTextAttr = axis.getTextAttr(); |
|
|
|
if(labelTextAttrPane != null){ |
|
|
|
if (labelTextAttrPane != null) { |
|
|
|
labelTextAttrPane.update(labelTextAttr); |
|
|
|
labelTextAttrPane.update(labelTextAttr); |
|
|
|
} |
|
|
|
} |
|
|
|
if(labelTextRotation != null){ |
|
|
|
if (labelTextRotation != null) { |
|
|
|
labelTextAttr.setRotation(labelTextRotation.updateBean().intValue()); |
|
|
|
labelTextAttr.setRotation(labelTextRotation.updateBean().intValue()); |
|
|
|
} |
|
|
|
} |
|
|
|
//轴标签缩略间隔显示 恢复用注释。取消注释。
|
|
|
|
//轴标签缩略间隔显示 恢复用注释。取消注释。
|
|
|
|
// if (overlapHandleTypeGroup != null) {
|
|
|
|
// if (overlapHandleTypeGroup != null) {
|
|
|
|
// axis.setOverlapHandleType(overlapHandleTypeGroup.getSelectedItem());
|
|
|
|
// axis.setOverlapHandleType(overlapHandleTypeGroup.getSelectedItem());
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
if(labelGapStyle != null){ |
|
|
|
if (labelGapStyle != null) { |
|
|
|
axis.setAutoLabelGap(labelGapStyle.getSelectedIndex() == 0); |
|
|
|
axis.setAutoLabelGap(labelGapStyle.getSelectedIndex() == 0); |
|
|
|
} |
|
|
|
} |
|
|
|
if(labelGapValue != null){ |
|
|
|
if (labelGapValue != null) { |
|
|
|
//轴标签缩略间隔显示 恢复用注释。下面5行删除。
|
|
|
|
//轴标签缩略间隔显示 恢复用注释。下面5行删除。
|
|
|
|
if (axis.isAutoLabelGap()) { |
|
|
|
if (axis.isAutoLabelGap()) { |
|
|
|
axis.setLabelIntervalNumber(BaseFormula.createFormulaBuilder().build("1")); |
|
|
|
axis.setLabelIntervalNumber(BaseFormula.createFormulaBuilder().build("1")); |
|
|
|
@ -756,33 +791,33 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//轴线样式
|
|
|
|
//轴线样式
|
|
|
|
private void updateLineStyle(VanChartAxis axis){ |
|
|
|
private void updateLineStyle(VanChartAxis axis) { |
|
|
|
if(axisLineStyle != null){ |
|
|
|
if (axisLineStyle != null) { |
|
|
|
axis.setAxisStyle(axisLineStyle.getSelectedLineStyle()); |
|
|
|
axis.setAxisStyle(axisLineStyle.getSelectedLineStyle()); |
|
|
|
} |
|
|
|
} |
|
|
|
if(axisLineColor != null){ |
|
|
|
if (axisLineColor != null) { |
|
|
|
axis.setAxisColor(axisLineColor.getSelectObject()); |
|
|
|
axis.setAxisColor(axisLineColor.getSelectObject()); |
|
|
|
} |
|
|
|
} |
|
|
|
if(mainTick != null){ |
|
|
|
if (mainTick != null) { |
|
|
|
axis.setMainTickLine(mainTick.getSelectedItem()); |
|
|
|
axis.setMainTickLine(mainTick.getSelectedItem()); |
|
|
|
} |
|
|
|
} |
|
|
|
if(secondTick != null){ |
|
|
|
if (secondTick != null) { |
|
|
|
axis.setSecTickLine(secondTick.getSelectedItem()); |
|
|
|
axis.setSecTickLine(secondTick.getSelectedItem()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//位置
|
|
|
|
//位置
|
|
|
|
private void updatePosition(VanChartAxis axis){ |
|
|
|
private void updatePosition(VanChartAxis axis) { |
|
|
|
if(position != null){ |
|
|
|
if (position != null) { |
|
|
|
axis.setPosition(position.getSelectedItem()); |
|
|
|
axis.setPosition(position.getSelectedItem()); |
|
|
|
} |
|
|
|
} |
|
|
|
if(reversed != null){ |
|
|
|
if (reversed != null) { |
|
|
|
axis.setAxisReversed(reversed.getSelectedItem()); |
|
|
|
axis.setAxisReversed(reversed.getSelectedItem()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//显示策略
|
|
|
|
//显示策略
|
|
|
|
private void updateDisplayStrategy(VanChartAxis axis){ |
|
|
|
private void updateDisplayStrategy(VanChartAxis axis) { |
|
|
|
//区域显示策略 恢复用注释。下面6行删除。
|
|
|
|
//区域显示策略 恢复用注释。下面6行删除。
|
|
|
|
if (axisLimitSize != null) { |
|
|
|
if (axisLimitSize != null) { |
|
|
|
axis.setLimitSize(axisLimitSize.getSelectedIndex() == 0); |
|
|
|
axis.setLimitSize(axisLimitSize.getSelectedIndex() == 0); |
|
|
|
@ -797,29 +832,30 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
protected void updateFormat(VanChartAxis axis) { |
|
|
|
protected void updateFormat(VanChartAxis axis) { |
|
|
|
if(valueFormatStyle != null){ |
|
|
|
if (valueFormatStyle != null) { |
|
|
|
axis.setCommonValueFormat(valueFormatStyle.getSelectedIndex() == 0); |
|
|
|
axis.setCommonValueFormat(valueFormatStyle.getSelectedIndex() == 0); |
|
|
|
} |
|
|
|
} |
|
|
|
if(valueFormat != null){ |
|
|
|
if (valueFormat != null) { |
|
|
|
axis.setFormat(valueFormat.update()); |
|
|
|
axis.setFormat(valueFormat.update()); |
|
|
|
} |
|
|
|
} |
|
|
|
if(htmlLabelPane != null){ |
|
|
|
if (htmlLabelPane != null) { |
|
|
|
htmlLabelPane.update(axis.getHtmlLabel()); |
|
|
|
htmlLabelPane.update(axis.getHtmlLabel()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* X坐标轴不同类型切换,new一个新的 |
|
|
|
* X坐标轴不同类型切换,new一个新的 |
|
|
|
|
|
|
|
* |
|
|
|
* @param axisName 坐标轴名称 |
|
|
|
* @param axisName 坐标轴名称 |
|
|
|
* @return 新的axis |
|
|
|
* @return 新的axis |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public VanChartAxis updateBean(String axisName, int position){ |
|
|
|
public VanChartAxis updateBean(String axisName, int position) { |
|
|
|
VanChartAxis axis = new VanChartAxis(axisName, position); |
|
|
|
VanChartAxis axis = new VanChartAxis(axisName, position); |
|
|
|
this.updateBean(axis); |
|
|
|
this.updateBean(axis); |
|
|
|
return axis; |
|
|
|
return axis; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public VanChartAxis updateBean(){ |
|
|
|
public VanChartAxis updateBean() { |
|
|
|
return null; |
|
|
|
return null; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
