|
|
|
@ -5,7 +5,6 @@ import com.fr.base.chart.chartdata.model.LargeDataModel;
|
|
|
|
|
import com.fr.base.chart.chartdata.model.NormalDataModel; |
|
|
|
|
import com.fr.chart.base.AttrAlpha; |
|
|
|
|
import com.fr.chart.base.AttrBorder; |
|
|
|
|
import com.fr.chart.base.ChartConstants; |
|
|
|
|
import com.fr.chart.base.GradientStyle; |
|
|
|
|
import com.fr.chart.chartattr.Plot; |
|
|
|
|
import com.fr.chart.chartglyph.ConditionAttr; |
|
|
|
@ -90,7 +89,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
|
|
|
|
|
} |
|
|
|
|
JPanel panel = new JPanel(new BorderLayout()); |
|
|
|
|
JPanel colorPane = getColorPane(); |
|
|
|
|
if(colorPane != null) { |
|
|
|
|
if (colorPane != null) { |
|
|
|
|
panel.add(colorPane, BorderLayout.NORTH); |
|
|
|
|
} |
|
|
|
|
panel.add(getContentInPlotType(), BorderLayout.CENTER); |
|
|
|
@ -279,7 +278,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
|
|
|
|
|
|
|
|
|
|
checkoutMapType(plot); |
|
|
|
|
|
|
|
|
|
if(vanChartFillStylePane != null) { //配色
|
|
|
|
|
if (vanChartFillStylePane != null) { //配色
|
|
|
|
|
vanChartFillStylePane.populateBean(plot.getPlotFillStyle()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -310,7 +309,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
|
|
|
|
|
|
|
|
|
|
populateCondition(plot.getConditionCollection().getDefaultAttr()); |
|
|
|
|
|
|
|
|
|
checkAreaSeriesFillColorPane(plot.getPlotStyle()); |
|
|
|
|
checkAreaSeriesFillColorPane(((VanChartPlot) plot).getGradientStyle()); |
|
|
|
|
|
|
|
|
|
checkCompsEnabledWithLarge(plot); |
|
|
|
|
} |
|
|
|
@ -340,7 +339,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
|
|
|
|
|
//更新之前先更新界面的map类型属性
|
|
|
|
|
checkoutMapType(plot); |
|
|
|
|
|
|
|
|
|
if(vanChartFillStylePane != null) {//配色
|
|
|
|
|
if (vanChartFillStylePane != null) {//配色
|
|
|
|
|
plot.setPlotFillStyle(vanChartFillStylePane.updateBean()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -369,16 +368,16 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
|
|
|
|
|
|
|
|
|
|
updateCondition(plot.getConditionCollection().getDefaultAttr()); |
|
|
|
|
|
|
|
|
|
checkAreaSeriesFillColorPane(plot.getPlotStyle()); |
|
|
|
|
checkAreaSeriesFillColorPane(((VanChartPlot) plot).getGradientStyle()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
protected void checkoutMapType(Plot plot) { |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
protected void checkAreaSeriesFillColorPane(int plotStyle) { |
|
|
|
|
protected void checkAreaSeriesFillColorPane(GradientStyle gradientStyle) { |
|
|
|
|
if (areaSeriesFillColorPane != null) { |
|
|
|
|
areaSeriesFillColorPane.checkoutAlpha(plotStyle == ChartConstants.STYLE_NONE); |
|
|
|
|
areaSeriesFillColorPane.checkoutAlpha(gradientStyle.getGradientType() == GradientType.NONE); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|