Browse Source

Merge pull request #1319 in DESIGN/design from ~NEIL/design:feature/10.0 to feature/10.0

* commit 'e062e49a6eb67f61f861024dbd4779a62979b9ed':
  无jira任务, sonar问题
research/11.0
neil 5 years ago
parent
commit
f49e7d0655
  1. 13
      designer-chart/src/main/java/com/fr/design/chartx/CustomChartDataPane.java

13
designer-chart/src/main/java/com/fr/design/chartx/CustomChartDataPane.java

@ -41,6 +41,9 @@ import java.util.Map;
*/
public class CustomChartDataPane extends ChartDataPane {
private static final int HGAP = 0;
private static final int VGAP = 6;
public CustomChartDataPane(AttributeChangeListener listener) {
super(listener);
}
@ -93,9 +96,11 @@ public class CustomChartDataPane extends ChartDataPane {
case BUBBLE:
return new SingleDataPane(new ScatterDataSetFieldsPane(), new ScatterCellDataFieldsPane());
default:
return StringUtils.equals(CustomStyle.CUSTOM.toString(), plot.getCustomType()) ?
new SingleDataPane(new SingleCategoryDataSetFieldsPane(), new SingleCategoryCellDataFieldsPane()) :
new SingleDataPane(new MultiCategoryDataSetFieldsPane(), new MultiCategoryCellDataFieldsPane());
if (StringUtils.equals(CustomStyle.CUSTOM.toString(), plot.getCustomType())){
return new SingleDataPane(new SingleCategoryDataSetFieldsPane(), new SingleCategoryCellDataFieldsPane());
} else {
return new SingleDataPane(new MultiCategoryDataSetFieldsPane(), new MultiCategoryCellDataFieldsPane());
}
}
}
@ -147,7 +152,7 @@ public class CustomChartDataPane extends ChartDataPane {
JPanel tabPanel = new JPanel(new BorderLayout());
tabPanel.setBorder(BorderFactory.createMatteBorder(0, 0, 0, 0, getBackground()));
tabPanel.add(tabPane, BorderLayout.CENTER);
this.setLayout(new BorderLayout(0, 6));
this.setLayout(new BorderLayout(HGAP, VGAP));
this.add(tabPanel, BorderLayout.NORTH);
this.add(centerPane, BorderLayout.CENTER);
}

Loading…
Cancel
Save