Browse Source

CHART-12124

feature/big-screen
白岳 4 years ago
parent
commit
842c346496
  1. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartHeatValueColorPane.java
  2. 6
      designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartValueColorPane.java
  3. 11
      designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartColorValueSeriesPane.java
  4. 8
      designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/style/VanChartHeatMapSeriesPane.java

2
designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartHeatValueColorPane.java

@ -46,7 +46,7 @@ public class VanChartHeatValueColorPane extends VanChartValueColorPane {
} }
protected SectionLegendPane createSectionLegendPane() { protected SectionLegendPane createSectionLegendPane() {
return new SectionLegendPane(parent) { return new SectionLegendPane(getVanChartStylePane()) {
@Override @Override
protected MapColorPickerPaneWithFormula createSectionIntervalConfigPane(AbstractAttrNoScrollPane parent) { protected MapColorPickerPaneWithFormula createSectionIntervalConfigPane(AbstractAttrNoScrollPane parent) {
return new SectionIntervalConfigPaneWithOutNum(parent) { return new SectionIntervalConfigPaneWithOutNum(parent) {

6
designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartValueColorPane.java

@ -38,7 +38,7 @@ public class VanChartValueColorPane extends BasicPane {
//区域渐变面板 //区域渐变面板
private SectionLegendPane sectionLegendPane; private SectionLegendPane sectionLegendPane;
public VanChartStylePane parent; private VanChartStylePane parent;
private JPanel rangeLegendPane; private JPanel rangeLegendPane;
@ -47,6 +47,10 @@ public class VanChartValueColorPane extends BasicPane {
initComponents(); initComponents();
} }
public VanChartStylePane getVanChartStylePane() {
return parent;
}
public void initComponents() { public void initComponents() {
valueColorTypeButton = createLegendTypeButton(); valueColorTypeButton = createLegendTypeButton();
valueColorTypeButton.addActionListener(new ActionListener() { valueColorTypeButton.addActionListener(new ActionListener() {

11
designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartColorValueSeriesPane.java

@ -34,7 +34,7 @@ public abstract class VanChartColorValueSeriesPane extends VanChartAbstractPlotS
//颜色划分切换 //颜色划分切换
private UIButtonGroup<String> colorDivideButton; private UIButtonGroup<String> colorDivideButton;
public VanChartValueColorPane vanChartValueColorPane; private VanChartValueColorPane vanChartValueColorPane;
private JPanel colorDividePane; private JPanel colorDividePane;
@ -42,6 +42,15 @@ public abstract class VanChartColorValueSeriesPane extends VanChartAbstractPlotS
super(parent, plot); super(parent, plot);
} }
public VanChartValueColorPane getVanChartValueColorPane() {
return vanChartValueColorPane;
}
public void setVanChartValueColorPane(VanChartValueColorPane vanChartValueColorPane) {
this.vanChartValueColorPane = vanChartValueColorPane;
}
//获取颜色面板 //获取颜色面板
protected JPanel getColorPane() { protected JPanel getColorPane() {
JPanel panel = new JPanel(new BorderLayout()); JPanel panel = new JPanel(new BorderLayout());

8
designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/style/VanChartHeatMapSeriesPane.java

@ -104,14 +104,14 @@ public class VanChartHeatMapSeriesPane extends VanChartMapSeriesPane {
} }
private JPanel createHeatColorPane() { private JPanel createHeatColorPane() {
vanChartValueColorPane = new VanChartHeatValueColorPane((VanChartStylePane) parentPane); setVanChartValueColorPane(new VanChartHeatValueColorPane((VanChartStylePane) parentPane));
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
double f = TableLayout.FILL; double f = TableLayout.FILL;
double[] row = {p}; double[] row = {p};
double[] col = {f}; double[] col = {f};
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{vanChartValueColorPane}, new Component[]{getVanChartFillStylePane()},
}; };
JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);
@ -172,7 +172,7 @@ public class VanChartHeatMapSeriesPane extends VanChartMapSeriesPane {
blur.setValue(heatMapPlot.getBlur()); blur.setValue(heatMapPlot.getBlur());
maxOpacity.populateBean(heatMapPlot.getMaxOpacity()); maxOpacity.populateBean(heatMapPlot.getMaxOpacity());
minOpacity.populateBean(heatMapPlot.getMinOpacity()); minOpacity.populateBean(heatMapPlot.getMinOpacity());
vanChartValueColorPane.populateBean((VanChartRangeLegend) plot.getLegend()); getVanChartValueColorPane().populateBean((VanChartRangeLegend) plot.getLegend());
} }
} }
@ -190,7 +190,7 @@ public class VanChartHeatMapSeriesPane extends VanChartMapSeriesPane {
heatMapPlot.setBlur(blur.getValue()); heatMapPlot.setBlur(blur.getValue());
heatMapPlot.setMaxOpacity(maxOpacity.updateBean()); heatMapPlot.setMaxOpacity(maxOpacity.updateBean());
heatMapPlot.setMinOpacity(minOpacity.updateBean()); heatMapPlot.setMinOpacity(minOpacity.updateBean());
vanChartValueColorPane.updateBean((VanChartRangeLegend) plot.getLegend()); getVanChartValueColorPane().updateBean((VanChartRangeLegend) plot.getLegend());
} }
} }

Loading…
Cancel
Save