Browse Source

Merge pull request #767 in DESIGN/design from ~WIM.ZHAI/xdesign:release/10.0 to release/10.0

* commit '96e4fed723260d27ee71c02ee92f49a1b2dfcad7':
  CHART-3017 为区域段图例面板指定Parent 传FR10
bugfix/10.0
Wim.Zhai 6 years ago
parent
commit
e5d44d5d13
  1. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartRangeLegendPane.java
  2. 6
      designer-chart/src/main/java/com/fr/van/chart/range/component/SectionLegendPane.java

2
designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartRangeLegendPane.java

@ -4,7 +4,6 @@ package com.fr.van.chart.designer.style;
import com.fr.design.gui.ibutton.UIButtonGroup;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.plugin.chart.attr.VanChartLegend;
import com.fr.plugin.chart.range.VanChartRangeLegend;
import com.fr.plugin.chart.type.LegendType;
@ -53,6 +52,7 @@ public class VanChartRangeLegendPane extends VanChartPlotLegendPane {
gradualLegendPane.setParentPane(parent);
//区域段图例面板
sectionLegendPane = createSectionLegendPane();
sectionLegendPane.setParentPane(parent);
JPanel panel = new JPanel(new CardLayout()){
@Override

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

@ -4,9 +4,9 @@ import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.mainframe.chart.gui.style.series.MapColorPickerPaneWithFormula;
import com.fr.plugin.chart.range.SectionLegend;
import com.fr.van.chart.designer.TableLayout4VanChartHelper;
import com.fr.van.chart.designer.style.VanChartStylePane;
import javax.swing.JPanel;
import java.awt.BorderLayout;
@ -24,6 +24,10 @@ public class SectionLegendPane extends JPanel{
initComponents();
}
public void setParentPane(VanChartStylePane parent){
labelFormPane.setParentPane(parent);
}
private void initComponents() {
intervalConfigPane = createSectionIntervalConfigPane(this.parent);
JPanel intervalConfigPaneWithTitle = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Section_Config"), intervalConfigPane);

Loading…
Cancel
Save