Browse Source

Pull request #6166: CHART-20675 主题样式图表预览图调整

Merge in DESIGN/design from ~BJORN/design:feature/x to feature/x

* commit '555e1dcd183cd9d08320d2c1ab94850d74ac8b4e':
  解决冲突
  CHART-20675 主题样式图表预览图调整
  REPORT-58344 主题样式frm下的图表标题增加提示
research/11.0
Bjorn 3 years ago
parent
commit
34f06efcfd
  1. 9
      designer-base/src/main/java/com/fr/design/mainframe/theme/preview/FormThemePreviewPane.java

9
designer-base/src/main/java/com/fr/design/mainframe/theme/preview/FormThemePreviewPane.java

@ -14,6 +14,7 @@ import com.fr.design.mainframe.theme.preview.ecpreview.ECComponentPreviewPane;
import com.fr.general.Background; import com.fr.general.Background;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
import com.fr.plugin.chart.PiePlot4VanChart; import com.fr.plugin.chart.PiePlot4VanChart;
import com.fr.plugin.chart.attr.VanChartLegend;
import com.fr.plugin.chart.attr.axis.VanChartAxis; import com.fr.plugin.chart.attr.axis.VanChartAxis;
import com.fr.plugin.chart.base.AttrLabel; import com.fr.plugin.chart.base.AttrLabel;
import com.fr.plugin.chart.base.VanChartTools; import com.fr.plugin.chart.base.VanChartTools;
@ -34,7 +35,6 @@ import java.awt.Graphics2D;
import java.awt.geom.Rectangle2D; import java.awt.geom.Rectangle2D;
import static com.fr.design.i18n.Toolkit.i18nText; import static com.fr.design.i18n.Toolkit.i18nText;
/** /**
* @author Starryi * @author Starryi
* @version 1.0 * @version 1.0
@ -180,11 +180,14 @@ public class FormThemePreviewPane extends TemplateThemePreviewPane<FormTheme> {
vanChartTools.setFullScreen(false); vanChartTools.setFullScreen(false);
PiePlot4VanChart plot = chart.getPlot(); PiePlot4VanChart plot = chart.getPlot();
plot.getLegend().setPosition(Constants.BOTTOM); VanChartLegend legend = (VanChartLegend) plot.getLegend();
legend.setPosition(Constants.BOTTOM);
legend.setCustomSize(true);
legend.setMaxHeight(28);
plot.getGradientStyle().setGradientType(GradientType.NONE); plot.getGradientStyle().setGradientType(GradientType.NONE);
plot.setInnerRadiusPercent(75); plot.setInnerRadiusPercent(75);
plot.getRadius().setRadiusType(RadiusType.FIXED); plot.getRadius().setRadiusType(RadiusType.FIXED);
plot.getRadius().setRadius(80); plot.getRadius().setRadius(70);
Object[] category = {StringUtils.EMPTY}; Object[] category = {StringUtils.EMPTY};
Object[] series = {"A1", "B1", "C1", "D1", "E1", "F1", "G1", "H1"}; Object[] series = {"A1", "B1", "C1", "D1", "E1", "F1", "G1", "H1"};

Loading…
Cancel
Save