diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java index cc8a7db137..32db1eab55 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java @@ -132,7 +132,7 @@ public class ChangeConfigPane extends BasicBeanPane { protected Component[][] getComponents(JPanel buttonPane) { return new Component[][]{ - new Component[]{text, fontNameComboBox}, + new Component[]{text, getFontNameComboBox()}, new Component[]{null, buttonPane} }; } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrNoColorPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrNoColorPane.java index 64d4526c8a..6cc12da41a 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrNoColorPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrNoColorPane.java @@ -4,19 +4,17 @@ package com.fr.design.mainframe.chart.gui.style; -import com.fr.base.BaseUtils; import com.fr.base.Utils; import com.fr.design.constants.LayoutConstants; -import com.fr.design.gui.ibutton.UIColorButton; -import com.fr.design.gui.ibutton.UIToggleButton; -import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.FRFont; import com.fr.design.utils.gui.GUICoreUtils; +import com.fr.general.FRFont; -import javax.swing.*; -import java.awt.*; +import javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.FlowLayout; /** * Created by IntelliJ IDEA. @@ -25,35 +23,27 @@ import java.awt.*; * Date: 14-9-11 * Time: 上午11:27 */ -public class ChartTextAttrNoColorPane extends ChartTextAttrPane{ +public class ChartTextAttrNoColorPane extends ChartTextAttrPane { - public ChartTextAttrNoColorPane() { - super(); + public ChartTextAttrNoColorPane() { + super(); } protected void initComponents() { - initFontSizes(); - fontColor = new UIColorButton(); - fontNameComboBox = new UIComboBox(Utils.getAvailableFontFamilyNames4Report()); - fontSizeComboBox = new UIComboBox(getFontSizes()); - bold = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold.png")); - italic = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic.png")); - double p = TableLayout.PREFERRED; double f = TableLayout.FILL; Component[] components1 = new Component[]{ - italic, bold + getItalic(), getBold() }; JPanel buttonPane = new JPanel(new BorderLayout()); - buttonPane.add(fontSizeComboBox, BorderLayout.CENTER); + buttonPane.add(getFontSizeComboBox(), BorderLayout.CENTER); buttonPane.add(GUICoreUtils.createFlowPane(components1, FlowLayout.LEFT, LayoutConstants.HGAP_LARGE), BorderLayout.EAST); - double[] columnSize = {f}; double[] rowSize = {p, p}; Component[][] components = new Component[][]{ - new Component[]{fontNameComboBox}, + new Component[]{getFontNameComboBox()}, new Component[]{buttonPane} }; @@ -63,20 +53,9 @@ public class ChartTextAttrNoColorPane extends ChartTextAttrPane{ populate(FRFont.getInstance()); } - /** - * 更新字体 - * @return 字体 - */ public FRFont updateFRFont() { - int style = Font.PLAIN; - if (bold.isSelected() && !italic.isSelected()) { - style = Font.BOLD; - } else if (!bold.isSelected() && italic.isSelected()) { - style = Font.ITALIC; - } else if (bold.isSelected() && italic.isSelected()) { - style = 3; - } - return FRFont.getInstance(Utils.objectToString(fontNameComboBox.getSelectedItem()), style, - Float.valueOf(Utils.objectToString(fontSizeComboBox.getSelectedItem()))); + String name = Utils.objectToString(getFontNameComboBox().getSelectedItem()); + + return FRFont.getInstance(name, getFontStyle(), getFontSize()); } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrNoFontSizePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrNoFontSizePane.java index 110b9d786b..d04df2f72a 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrNoFontSizePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrNoFontSizePane.java @@ -1,48 +1,36 @@ package com.fr.design.mainframe.chart.gui.style; -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.FlowLayout; - -import javax.swing.JPanel; - -import com.fr.base.BaseUtils; -import com.fr.base.Utils; import com.fr.design.constants.LayoutConstants; -import com.fr.design.gui.ibutton.UIColorButton; -import com.fr.design.gui.ibutton.UIToggleButton; -import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.FRFont; import com.fr.design.utils.gui.GUICoreUtils; +import com.fr.general.FRFont; + +import javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.FlowLayout; /** * 字体格式设置, 无字体大小设置. + * * @author kunsnat E-mail:kunsnat@gmail.com * @version 创建时间：2013-1-21 下午03:35:47 */ public class ChartTextAttrNoFontSizePane extends ChartTextAttrPane { - private static final long serialVersionUID = 4890526255627852602L; + private static final long serialVersionUID = 4890526255627852602L; - public ChartTextAttrNoFontSizePane() { - super(); - } + public ChartTextAttrNoFontSizePane() { + super(); + } protected void initComponents() { - initFontSizes(); - fontNameComboBox = new UIComboBox(Utils.getAvailableFontFamilyNames4Report()); - fontColor = new UIColorButton(); - fontSizeComboBox = new UIComboBox(getFontSizes()); - bold = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold.png")); - italic = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic.png")); - double p = TableLayout.PREFERRED; double f = TableLayout.FILL; Component[] components1 = new Component[]{ - fontColor, italic, bold + getFontColor(), getItalic(), getBold() }; JPanel buttonPane = new JPanel(new BorderLayout()); buttonPane.add(GUICoreUtils.createFlowPane(components1, FlowLayout.LEFT, LayoutConstants.HGAP_LARGE), BorderLayout.CENTER); @@ -50,7 +38,7 @@ public class ChartTextAttrNoFontSizePane extends ChartTextAttrPane { double[] columnSize = {f}; double[] rowSize = {p, p}; Component[][] components = new Component[][]{ - new Component[]{fontNameComboBox}, + new Component[]{getFontNameComboBox()}, new Component[]{buttonPane} }; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java index 5ffbfde87f..f3998be974 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java @@ -3,7 +3,6 @@ package com.fr.design.mainframe.chart.gui.style; import com.fr.base.BaseUtils; import com.fr.base.Utils; import com.fr.chart.base.TextAttr; -import com.fr.design.i18n.Toolkit; import com.fr.design.constants.LayoutConstants; import com.fr.design.dialog.BasicPane; import com.fr.design.event.UIObserverListener; @@ -13,7 +12,6 @@ import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.ComparatorUtils; import com.fr.general.FRFont; import com.fr.van.chart.designer.TableLayout4VanChartHelper; @@ -29,49 +27,51 @@ public class ChartTextAttrPane extends BasicPane { private static final long serialVersionUID = 6731679928019436869L; private static final int FONT_START = 6; private static final int FONT_END = 72; - private static final String auto = Toolkit.i18nText("Fine-Design_Basic_ChartF_Auto"); - private static final int autoSizeInt = 0; - private String[] fontSizes; - private boolean isFontSizeAuto; - protected UIComboBox fontNameComboBox; - protected UIComboBox fontSizeComboBox; - protected UIToggleButton bold; - protected UIToggleButton italic; - protected UIColorButton fontColor; + private UIComboBox fontNameComboBox; + private UIComboBox fontSizeComboBox; + private UIToggleButton bold; + private UIToggleButton italic; + private UIColorButton fontColor; + public static Integer[] Font_Sizes = new Integer[FONT_END - FONT_START + 1]; + + static { + for (int i = FONT_START; i <= FONT_END; i++) { + Font_Sizes[i - FONT_START] = new Integer(i); + } + } public ChartTextAttrPane() { - this.isFontSizeAuto = false; + initState(); initComponents(); } - public ChartTextAttrPane(boolean isFontSizeAuto) { - this.isFontSizeAuto = isFontSizeAuto; - initComponents(); + public UIComboBox getFontNameComboBox() { + return fontNameComboBox; } - public String[] getFontSizes() { - return fontSizes; + public UIComboBox getFontSizeComboBox() { + return fontSizeComboBox; } - protected void initFontSizes() { - if (isFontSizeAuto) { - fontSizes = new String[FONT_END - FONT_START + 2]; + public UIToggleButton getBold() { + return bold; + } - fontSizes[0] = auto; + public void setBold(UIToggleButton bold) { + this.bold = bold; + } - for (int i = 1; i < fontSizes.length; i++) { - fontSizes[i] = Utils.objectToString(i + FONT_START); - } - } else { - fontSizes = new String[FONT_END - FONT_START + 1]; + public UIToggleButton getItalic() { + return italic; + } - for (int i = 0; i < fontSizes.length; i++) { - fontSizes[i] = Utils.objectToString(i + FONT_START); - } - } + public UIColorButton getFontColor() { + return fontColor; } - /* 标题 + /** + * 标题 + * * @return 标题 */ public String title4PopupWindow() { @@ -112,13 +112,7 @@ public class ChartTextAttrPane extends BasicPane { fontNameComboBox.setSelectedItem(frFont.getFamily()); bold.setSelected(frFont.isBold()); italic.setSelected(frFont.isItalic()); - if (fontSizeComboBox != null) { - if (frFont.getSize() == autoSizeInt) { - fontSizeComboBox.setSelectedItem(auto); - } else { - fontSizeComboBox.setSelectedItem(frFont.getSize() + ""); - } - } + setFontSize(frFont); if (fontColor != null) { fontColor.setColor(frFont.getForeground()); } @@ -128,6 +122,12 @@ public class ChartTextAttrPane extends BasicPane { registerAllComboBoxListener(listener); } + protected void setFontSize(FRFont frFont) { + if (fontSizeComboBox != null) { + fontSizeComboBox.setSelectedItem(frFont.getSize()); + } + } + private void removeAllComboBoxListener() { fontNameComboBox.removeChangeListener(); fontSizeComboBox.removeChangeListener(); @@ -144,8 +144,13 @@ public class ChartTextAttrPane extends BasicPane { * @return 更新字 */ public FRFont updateFRFont() { + String name = Utils.objectToString(fontNameComboBox.getSelectedItem()); + + return FRFont.getInstance(name, getFontStyle(), getFontSize(), fontColor.getColor()); + } + + protected int getFontStyle() { int style = Font.PLAIN; - float size; if (bold.isSelected() && !italic.isSelected()) { style = Font.BOLD; } else if (!bold.isSelected() && italic.isSelected()) { @@ -153,13 +158,12 @@ public class ChartTextAttrPane extends BasicPane { } else if (bold.isSelected() && italic.isSelected()) { style = 3; } - if (ComparatorUtils.equals(fontSizeComboBox.getSelectedItem(), auto)) { - size = Float.parseFloat(Utils.objectToString(autoSizeInt)); - } else { - size = Float.parseFloat(Utils.objectToString(fontSizeComboBox.getSelectedItem())); - } - return FRFont.getInstance(Utils.objectToString(fontNameComboBox.getSelectedItem()), style, size, fontColor.getColor()); + return style; + } + + protected float getFontSize() { + return Float.parseFloat(Utils.objectToString(fontSizeComboBox.getSelectedItem())); } public void setEnabled(boolean enabled) { @@ -170,14 +174,19 @@ public class ChartTextAttrPane extends BasicPane { this.italic.setEnabled(enabled); } - protected void initComponents() { - initFontSizes(); + protected Object[] getFontSizeComboBoxModel() { + return Font_Sizes; + } + + protected void initState() { fontNameComboBox = new UIComboBox(Utils.getAvailableFontFamilyNames4Report()); - fontSizeComboBox = new UIComboBox(fontSizes); + fontSizeComboBox = new UIComboBox(getFontSizeComboBoxModel()); fontColor = new UIColorButton(); bold = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold.png")); italic = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic.png")); + } + protected void initComponents() { Component[] components1 = new Component[]{ fontColor, italic, bold }; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithAuto.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithAuto.java new file mode 100644 index 0000000000..35681ab41a --- /dev/null +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithAuto.java @@ -0,0 +1,68 @@ +package com.fr.design.mainframe.chart.gui.style; + +import com.fr.base.Utils; +import com.fr.design.i18n.Toolkit; +import com.fr.general.ComparatorUtils; +import com.fr.general.FRFont; + +public class ChartTextAttrPaneWithAuto extends ChartTextAttrPane { + + private static final String AUTO = Toolkit.i18nText("Fine-Design_Basic_ChartF_Auto"); + private static final int AUTO_SIZE_INT = 0; + private boolean isFontSizeAuto; + private boolean isColorAuto; + + public ChartTextAttrPaneWithAuto() { + this.isFontSizeAuto = false; + this.isColorAuto = false; + + initState(); + initComponents(); + } + + public ChartTextAttrPaneWithAuto(boolean isFontSizeAuto, boolean isColorAuto) { + this.isFontSizeAuto = isFontSizeAuto; + this.isColorAuto = isColorAuto; + + initState(); + initComponents(); + } + + protected Object[] getFontSizeComboBoxModel() { + if (isFontSizeAuto) { + String[] fontSizes = new String[Font_Sizes.length + 1]; + + fontSizes[0] = AUTO; + + for (int i = 1; i <= Font_Sizes.length; i++) { + fontSizes[i] = i + ""; + } + + return fontSizes; + } else { + return super.getFontSizeComboBoxModel(); + } + } + + protected float getFontSize() { + if (isFontSizeAuto && ComparatorUtils.equals(getFontSizeComboBox().getSelectedItem(), AUTO)) { + return AUTO_SIZE_INT; + } + + return Float.parseFloat(Utils.objectToString(getFontSizeComboBox().getSelectedItem())); + } + + protected void setFontSize(FRFont frFont) { + if (getFontSizeComboBox() != null && isFontSizeAuto) { + if (frFont.getSize() == AUTO_SIZE_INT) { + getFontSizeComboBox().setSelectedItem(AUTO); + } else { + getFontSizeComboBox().setSelectedItem(frFont.getSize() + ""); + } + } + + if (getFontSizeComboBox() != null && !isFontSizeAuto) { + getFontSizeComboBox().setSelectedItem(frFont.getSize()); + } + } +} diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeCateOrPercentLabelDetailPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeCateOrPercentLabelDetailPane.java index d96140a8f3..876da9bc69 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeCateOrPercentLabelDetailPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeCateOrPercentLabelDetailPane.java @@ -1,7 +1,7 @@ package com.fr.van.chart.designer.style.label; import com.fr.chart.chartattr.Plot; -import com.fr.general.ComparatorUtils; +import com.fr.plugin.chart.gauge.VanChartGaugePlot; import com.fr.plugin.chart.type.GaugeStyle; import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.designer.component.label.LabelContentPaneWithCate; @@ -35,7 +35,9 @@ public class VanChartGaugeCateOrPercentLabelDetailPane extends VanChartGaugeLabe } protected void initToolTipContentPane(Plot plot) { - switch (getGaugeStyle()) { + GaugeStyle gaugeStyle = ((VanChartGaugePlot) plot).getGaugeStyle(); + + switch (gaugeStyle) { case POINTER: case POINTER_SEMI: dataLabelContentPane = new LabelContentPaneWithCate(parent, VanChartGaugeCateOrPercentLabelDetailPane.this); @@ -47,11 +49,15 @@ public class VanChartGaugeCateOrPercentLabelDetailPane extends VanChartGaugeLabe } protected boolean getFontSizeAuto() { - return ComparatorUtils.equals(getGaugeStyle(), GaugeStyle.RING) || ComparatorUtils.equals(getGaugeStyle(), GaugeStyle.SLOT); + GaugeStyle gaugeStyle = ((VanChartGaugePlot) getPlot()).getGaugeStyle(); + + return gaugeStyle == GaugeStyle.RING || gaugeStyle == GaugeStyle.SLOT; } protected boolean hasLabelPosition(Plot plot) { - switch (getGaugeStyle()) { + GaugeStyle gaugeStyle = ((VanChartGaugePlot) plot).getGaugeStyle(); + + switch (gaugeStyle) { case RING: case SLOT: return false; diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeLabelDetailPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeLabelDetailPane.java index b08a53e8d4..9bfa8e82b4 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeLabelDetailPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeLabelDetailPane.java @@ -9,7 +9,9 @@ import com.fr.design.i18n.Toolkit; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane; +import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPaneWithAuto; import com.fr.general.ComparatorUtils; +import com.fr.plugin.chart.attr.GaugeDetailStyle; import com.fr.plugin.chart.base.AttrLabelDetail; import com.fr.plugin.chart.gauge.VanChartGaugePlot; import com.fr.plugin.chart.type.GaugeStyle; @@ -28,7 +30,6 @@ import java.awt.Dimension; */ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane { - private GaugeStyle gaugeStyle; private UIButtonGroup align; private JPanel alignPane; private Integer[] oldAlignValues; @@ -37,19 +38,6 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane { super(plot, parent); } - protected void initLabelDetailPane(Plot plot) { - setGaugeStyle(((VanChartGaugePlot) plot).getGaugeStyle()); - super.initLabelDetailPane(plot); - } - - public GaugeStyle getGaugeStyle() { - return gaugeStyle; - } - - public void setGaugeStyle(GaugeStyle gaugeStyle) { - this.gaugeStyle = gaugeStyle; - } - protected JPanel createLabelStylePane(double[] row, double[] col, Plot plot) { style = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Automatic"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom")}); @@ -66,7 +54,7 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane { protected ChartTextAttrPane initTextFontPane() { - return new ChartTextAttrPane(getFontSizeAuto()) { + return new ChartTextAttrPaneWithAuto(getFontSizeAuto(), false) { protected double[] getRowSize() { double p = TableLayout.PREFERRED; return new double[]{p, p}; @@ -75,7 +63,7 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane { protected Component[][] getComponents(JPanel buttonPane) { UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Character"), SwingConstants.LEFT); return new Component[][]{ - new Component[]{text, fontNameComboBox}, + new Component[]{text, getFontNameComboBox()}, new Component[]{null, buttonPane} }; } @@ -184,7 +172,10 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane { } protected boolean hasLabelAlign(Plot plot) { - return ComparatorUtils.equals(gaugeStyle, GaugeStyle.THERMOMETER) && !((VanChartGaugePlot) plot).getGaugeDetailStyle().isHorizontalLayout(); + GaugeStyle gaugeStyle = ((VanChartGaugePlot) plot).getGaugeStyle(); + GaugeDetailStyle gaugeDetailStyle = ((VanChartGaugePlot) plot).getGaugeDetailStyle(); + + return gaugeStyle == GaugeStyle.THERMOMETER && !gaugeDetailStyle.isHorizontalLayout(); } public void populate(AttrLabelDetail detail) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeValueLabelDetailPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeValueLabelDetailPane.java index 241a5fd76e..cfee6102be 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeValueLabelDetailPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeValueLabelDetailPane.java @@ -1,7 +1,7 @@ package com.fr.van.chart.designer.style.label; import com.fr.chart.chartattr.Plot; -import com.fr.general.ComparatorUtils; +import com.fr.plugin.chart.gauge.VanChartGaugePlot; import com.fr.plugin.chart.type.GaugeStyle; import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.designer.component.label.LabelContentPaneWithCateValue; @@ -22,7 +22,9 @@ public class VanChartGaugeValueLabelDetailPane extends VanChartGaugeLabelDetailP } protected void initToolTipContentPane(Plot plot) { - switch (getGaugeStyle()) { + GaugeStyle gaugeStyle = ((VanChartGaugePlot) plot).getGaugeStyle(); + + switch (gaugeStyle) { case POINTER: case POINTER_SEMI: dataLabelContentPane = new LabelContentPaneWithOutCate(parent, VanChartGaugeValueLabelDetailPane.this); @@ -34,7 +36,9 @@ public class VanChartGaugeValueLabelDetailPane extends VanChartGaugeLabelDetailP } protected Component[][] getLabelPaneComponents(Plot plot, double p, double[] columnSize) { - switch (getGaugeStyle()) { + GaugeStyle gaugeStyle = ((VanChartGaugePlot) plot).getGaugeStyle(); + + switch (gaugeStyle) { case POINTER: case POINTER_SEMI: return getLabelPaneComponentsWithBackground(plot, p, columnSize); @@ -52,7 +56,9 @@ public class VanChartGaugeValueLabelDetailPane extends VanChartGaugeLabelDetailP } protected double[] getLabelPaneRowSize(Plot plot, double p) { - switch (getGaugeStyle()) { + GaugeStyle gaugeStyle = ((VanChartGaugePlot) plot).getGaugeStyle(); + + switch (gaugeStyle) { case POINTER: case POINTER_SEMI: return new double[]{p, p, p, p, p}; @@ -62,11 +68,11 @@ public class VanChartGaugeValueLabelDetailPane extends VanChartGaugeLabelDetailP } protected boolean getFontSizeAuto() { - return !ComparatorUtils.equals(getGaugeStyle(), GaugeStyle.THERMOMETER); + return ((VanChartGaugePlot) getPlot()).getGaugeStyle() != GaugeStyle.THERMOMETER; } protected boolean hasLabelPosition(Plot plot) { - return getGaugeStyle() == GaugeStyle.THERMOMETER; + return ((VanChartGaugePlot) plot).getGaugeStyle() == GaugeStyle.THERMOMETER; } protected JPanel createTableLayoutPaneWithTitle(String title, Component component) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java index adb36e4dd4..a9fc5c008c 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java @@ -230,7 +230,7 @@ public class VanChartPlotLabelDetailPane extends BasicPane { protected Component[][] getComponents(JPanel buttonPane) { return new Component[][]{ new Component[]{null, null}, - new Component[]{null, fontNameComboBox}, + new Component[]{null, getFontNameComboBox()}, new Component[]{null, buttonPane} }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipPane.java index e3f45a9c0a..5dfc50ec47 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipPane.java @@ -114,7 +114,7 @@ public class VanChartPlotTooltipPane extends BasicPane { protected Component[][] getComponents(JPanel buttonPane) { return new Component[][]{ new Component[]{null, null}, - new Component[]{null, fontNameComboBox}, + new Component[]{null, getFontNameComboBox()}, new Component[]{null, buttonPane} }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/other/VanChartDrillMapInteractivePane.java b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/other/VanChartDrillMapInteractivePane.java index 1f705c9c94..c0195070aa 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/other/VanChartDrillMapInteractivePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/other/VanChartDrillMapInteractivePane.java @@ -68,7 +68,7 @@ public class VanChartDrillMapInteractivePane extends VanChartInteractivePaneWith @Override protected Component[][] getComponents(JPanel buttonPane) { return new Component[][]{ - new Component[]{fontNameComboBox}, + new Component[]{getFontNameComboBox()}, new Component[]{buttonPane} }; }