Browse Source

Merge pull request #422 in BA/design from ~ZHENG/design:dev to dev

* commit '10f4be45070fd5233c3c062431621b105bb4d147':
  地图标签 区域名和区域值
master
superman 8 years ago
parent
commit
91e5529f05
  1. 29
      designer_chart/src/com/fr/design/chart/series/SeriesCondition/TooltipContentsPane.java
  2. 15
      designer_chart/src/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java
  3. 18
      designer_chart/src/com/fr/design/chart/series/SeriesCondition/dlp/MapDataLabelPane.java

29
designer_chart/src/com/fr/design/chart/series/SeriesCondition/TooltipContentsPane.java

@ -1,28 +1,23 @@
package com.fr.design.chart.series.SeriesCondition;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.text.Format;
import javax.swing.JPanel;
import javax.swing.SwingUtilities;
import com.fr.chart.base.AttrContents;
import com.fr.chart.base.ChartConstants;
import com.fr.design.dialog.BasicPane;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.dialog.BasicPane;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.style.FormatPane;
import com.fr.general.Inter;
import com.fr.stable.StringUtils;
import com.fr.design.style.FormatPane;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.text.Format;
/**
* 数据点提示内容面板包含系列值系列百分比
@ -58,7 +53,7 @@ public class TooltipContentsPane extends BasicPane{
protected JPanel createJPanel4Value() {
if (showValueCB == null) {
showValueCB = new UICheckBox(Inter.getLocText("Value"));
showValueCB = new UICheckBox(getValueString());
}
showValueCB.setSelected(true);
@ -75,7 +70,9 @@ public class TooltipContentsPane extends BasicPane{
return valuePane;
}
protected String getValueString() {
return Inter.getLocText("Value");
}
protected Component[] createComponents4PercentValue() {
if (showPercent == null) {

15
designer_chart/src/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java

@ -1,12 +1,5 @@
package com.fr.design.chart.series.SeriesCondition.dlp;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Dimension;
import javax.swing.ButtonGroup;
import javax.swing.JPanel;
import com.fr.base.Utils;
import com.fr.chart.base.AttrContents;
import com.fr.chart.base.ChartConstants;
@ -21,6 +14,9 @@ import com.fr.general.Inter;
import com.fr.stable.Constants;
import com.fr.stable.StringUtils;
import javax.swing.*;
import java.awt.*;
/**
* Created by IntelliJ IDEA.
* Author : Richer
@ -80,11 +76,14 @@ public class DataLabelPane extends TooltipContentsPane {
protected Component[] createComponents4ShowCategoryName() {
if (showCategoryNameCB == null) {
showCategoryNameCB = new UICheckBox(Inter.getLocText(new String[]{"StyleFormat-Category", "WF-Name"}));
showCategoryNameCB = new UICheckBox(getCategoryString());
}
return new Component[]{null, showCategoryNameCB};
}
protected String getCategoryString(){
return Inter.getLocText(new String[]{"StyleFormat-Category", "WF-Name"});
}
protected Component[] createComponents4ShowGuidLine() {

18
designer_chart/src/com/fr/design/chart/series/SeriesCondition/dlp/MapDataLabelPane.java

@ -1,6 +1,9 @@
package com.fr.design.chart.series.SeriesCondition.dlp;
import com.fr.general.Inter;
import javax.swing.*;
import java.awt.*;
/**
@ -13,6 +16,21 @@ import javax.swing.*;
*/
public class MapDataLabelPane extends DataLabelPane {
@Override
protected Component[] createComponents4ShowSeriesName() {
return new Component[0];
}
@Override
protected String getCategoryString() {
return Inter.getLocText("FR-Chart-Area_Name");
}
@Override
protected String getValueString() {
return Inter.getLocText("FR-Chart-Area_Value");
}
protected JPanel createJPanel4Position() {
return null;
}

Loading…
Cancel
Save