|
|
|
@ -1,12 +1,13 @@
|
|
|
|
|
package com.fr.van.chart.custom.component; |
|
|
|
|
|
|
|
|
|
import com.fr.chart.base.ChartThemeStyleProvider; |
|
|
|
|
import com.fr.chart.chartattr.Chart; |
|
|
|
|
import com.fr.design.beans.BasicBeanPane; |
|
|
|
|
import com.fr.design.dialog.FineJOptionPane; |
|
|
|
|
import com.fr.design.layout.FRGUIPaneFactory; |
|
|
|
|
import com.fr.design.mainframe.chart.mode.ChartEditContext; |
|
|
|
|
import com.fr.general.ComparatorUtils; |
|
|
|
|
import com.fr.log.FineLoggerFactory; |
|
|
|
|
|
|
|
|
|
import com.fr.plugin.chart.attr.plot.VanChartPlot; |
|
|
|
|
import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot; |
|
|
|
|
import com.fr.plugin.chart.custom.CustomPlotFactory; |
|
|
|
@ -264,6 +265,13 @@ public class VanChartCustomPlotSelectPane extends BasicBeanPane<Chart> {
|
|
|
|
|
//设置公共属性
|
|
|
|
|
setCommonAttr(vanChartPlot, customPlot); |
|
|
|
|
|
|
|
|
|
if (!ChartEditContext.supportTheme()) { |
|
|
|
|
//主题中有的属性 界面上屏蔽不跟随主题 属性全部设置成自定义
|
|
|
|
|
setThemeCustom(vanChartPlot); |
|
|
|
|
// //主题中没有的 根据主题深浅色自动 的属性 默认自动
|
|
|
|
|
// ((VanChart) chart4Update).setAutoThemeCustom();
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
newCustomPlotList.add(vanChartPlot); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
@ -271,6 +279,14 @@ public class VanChartCustomPlotSelectPane extends BasicBeanPane<Chart> {
|
|
|
|
|
customPlot.setCustomPlotList(newCustomPlotList); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void setThemeCustom(VanChartPlot customPlot) { |
|
|
|
|
List<ChartThemeStyleProvider> chartThemeStyleProviders = new ArrayList<>(); |
|
|
|
|
customPlot.getChartPreStyleProvider(chartThemeStyleProviders); |
|
|
|
|
for (ChartThemeStyleProvider chartThemeStyleProvider : chartThemeStyleProviders) { |
|
|
|
|
chartThemeStyleProvider.setThemeCustom(); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void setCommonAttr(VanChartPlot vanChartPlot, VanChartCustomPlot customPlot) { |
|
|
|
|
//坐标轴公共属性
|
|
|
|
|
dealAxisAttr(vanChartPlot, customPlot); |
|
|
|
|