Browse Source

CHART-13481 大数据模式下的高亮不显示

feature/big-screen
白岳 5 years ago
parent
commit
5fddc50cf8
  1. 1
      designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartLegendPane.java
  2. 11
      designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartPlotLegendPane.java

1
designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartLegendPane.java

@ -68,6 +68,7 @@ public class VanChartLegendPane extends AbstractVanChartScrollPane<VanChart> {
if (plot == null) { if (plot == null) {
return; return;
} }
legendContent.setPlot(plot);
VanChartLegend legend = (VanChartLegend) plot.getLegend(); VanChartLegend legend = (VanChartLegend) plot.getLegend();
if (legendContent != null) { if (legendContent != null) {
legendContent.populateBean(legend); legendContent.populateBean(legend);

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

@ -2,14 +2,15 @@ package com.fr.van.chart.designer.style;
import com.fr.base.BaseUtils; import com.fr.base.BaseUtils;
import com.fr.base.Style; import com.fr.base.Style;
import com.fr.chart.chartattr.Plot;
import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.BasicPane;
import com.fr.design.gui.frpane.UIBubbleFloatPane; import com.fr.design.gui.frpane.UIBubbleFloatPane;
import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.ibutton.UIButtonGroup;
import com.fr.design.gui.ibutton.UIToggleButton; import com.fr.design.gui.ibutton.UIToggleButton;
import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.i18n.Toolkit;
import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.gui.ispinner.UISpinner;
import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper; import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.mainframe.chart.PaneTitleConstants; import com.fr.design.mainframe.chart.PaneTitleConstants;
@ -18,6 +19,7 @@ import com.fr.design.utils.gui.UIComponentUtils;
import com.fr.plugin.chart.attr.VanChartLegend; import com.fr.plugin.chart.attr.VanChartLegend;
import com.fr.plugin.chart.type.LayoutType; import com.fr.plugin.chart.type.LayoutType;
import com.fr.stable.Constants; import com.fr.stable.Constants;
import com.fr.van.chart.designer.PlotFactory;
import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.designer.TableLayout4VanChartHelper;
import com.fr.van.chart.designer.component.VanChartFloatPositionPane; import com.fr.van.chart.designer.component.VanChartFloatPositionPane;
import com.fr.van.chart.designer.component.background.VanChartBackgroundWithOutImagePane; import com.fr.van.chart.designer.component.background.VanChartBackgroundWithOutImagePane;
@ -46,6 +48,8 @@ public class VanChartPlotLegendPane extends BasicPane {
private static final int HEIGHT = 100; private static final int HEIGHT = 100;
private static final int GAP = 20; private static final int GAP = 20;
private Plot plot;
private UICheckBox isLegendVisible; private UICheckBox isLegendVisible;
private JPanel legendPane; private JPanel legendPane;
@ -80,6 +84,10 @@ public class VanChartPlotLegendPane extends BasicPane {
initComponents(); initComponents();
} }
public void setPlot(Plot plot) {
this.plot = plot;
}
public JPanel getHighlightPane() { public JPanel getHighlightPane() {
return highlightPane; return highlightPane;
} }
@ -421,6 +429,7 @@ public class VanChartPlotLegendPane extends BasicPane {
//limitPane.populateBean(legend.getLimitAttribute()); //limitPane.populateBean(legend.getLimitAttribute());
if(highlightButton != null){ if(highlightButton != null){
highlightButton.setSelectedItem(legend.isHighlight()); highlightButton.setSelectedItem(legend.isHighlight());
highlightButton.setEnabled(!PlotFactory.largeDataModel(plot));
} }
} }

Loading…
Cancel
Save