Browse Source

refactor:散点图气泡图数据面板 CHART-4248

research/11.0
Wim.Zhai 5 years ago
parent
commit
c5926c4a0b
  1. 2
      designer-chart/src/main/java/com/fr/design/chartx/AbstractChartDataPane.java
  2. 7
      designer-chart/src/main/java/com/fr/design/chartx/AbstractVanSingleDataPane.java
  3. 7
      designer-chart/src/main/java/com/fr/design/chartx/CustomChartDataPane.java
  4. 5
      designer-chart/src/main/java/com/fr/design/chartx/GanttChartDataPane.java
  5. 66
      designer-chart/src/main/java/com/fr/design/chartx/component/CellDataSeriesXYValueCorrelationPane.java
  6. 86
      designer-chart/src/main/java/com/fr/design/chartx/fields/diff/ScatterCellDataFieldsPane.java
  7. 95
      designer-chart/src/main/java/com/fr/design/chartx/fields/diff/ScatterDataSetFieldsPane.java
  8. 5
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartDataPane.java
  9. 22
      designer-chart/src/main/java/com/fr/van/chart/bubble/BubbleIndependentVanChartInterface.java
  10. 3
      designer-chart/src/main/java/com/fr/van/chart/funnel/designer/FunnelIndependentVanChartInterface.java
  11. 3
      designer-chart/src/main/java/com/fr/van/chart/multilayer/MultiPieIndependentVanChartInterface.java
  12. 15
      designer-chart/src/main/java/com/fr/van/chart/scatter/ScatterIndependentVanChartInterface.java
  13. 3
      designer-chart/src/main/java/com/fr/van/chart/structure/desinger/VanStructureChartTypeUI.java
  14. 3
      designer-chart/src/main/java/com/fr/van/chart/vanchart/AbstractIndependentVanChartUI.java
  15. 3
      designer-chart/src/main/java/com/fr/van/chart/vanchart/AbstractMultiCategoryVanChartUI.java
  16. 3
      designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java

2
designer-chart/src/main/java/com/fr/design/chartx/AbstractChartDataPane.java

@ -32,7 +32,7 @@ public abstract class AbstractChartDataPane<T extends ChartDataDefinitionProvide
}
this.removeAll();
this.add(createContentPane(), BorderLayout.CENTER);
this.add(createContentPane(chart), BorderLayout.CENTER);
ChartDataDefinitionProvider dataSetCollection = chart.getChartDataDefinition();

7
designer-chart/src/main/java/com/fr/design/chartx/AbstractVanSingleDataPane.java

@ -3,6 +3,7 @@ package com.fr.design.chartx;
import com.fr.chartx.data.AbstractDataDefinition;
import com.fr.design.chartx.single.SingleDataPane;
import com.fr.design.gui.frpane.AttributeChangeListener;
import com.fr.plugin.chart.vanchart.VanChart;
import javax.swing.JPanel;
@ -18,12 +19,12 @@ public abstract class AbstractVanSingleDataPane extends AbstractChartDataPane<Ab
}
@Override
protected JPanel createContentPane() {
singleDataPane = createSingleDataPane();
protected JPanel createContentPane(VanChart vanChart) {
singleDataPane = createSingleDataPane(vanChart);
return singleDataPane;
}
protected abstract SingleDataPane createSingleDataPane();
protected abstract SingleDataPane createSingleDataPane(VanChart vanChart);
@Override
protected void populate(AbstractDataDefinition dataDefinition) {

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

@ -5,6 +5,8 @@ import com.fr.chartx.data.AbstractDataDefinition;
import com.fr.chartx.data.CustomChartDataDefinition;
import com.fr.design.chartx.fields.diff.MultiCategoryCellDataFieldsPane;
import com.fr.design.chartx.fields.diff.MultiCategoryDataSetFieldsPane;
import com.fr.design.chartx.fields.diff.ScatterCellDataFieldsPane;
import com.fr.design.chartx.fields.diff.ScatterDataSetFieldsPane;
import com.fr.design.chartx.fields.diff.SingleCategoryCellDataFieldsPane;
import com.fr.design.chartx.fields.diff.SingleCategoryDataSetFieldsPane;
import com.fr.design.chartx.single.SingleDataPane;
@ -71,7 +73,7 @@ public class CustomChartDataPane extends ChartDataPane {
final VanChartPlot vanChartPlot = customPlotList.get(i);
paneList.add(new AbstractVanSingleDataPane(listener) {
@Override
protected SingleDataPane createSingleDataPane() {
protected SingleDataPane createSingleDataPane(VanChart vanChart) {
return createSingleDataPaneByPlot(vanChartPlot);
}
});
@ -88,8 +90,7 @@ public class CustomChartDataPane extends ChartDataPane {
return new SingleDataPane(new SingleCategoryDataSetFieldsPane(), new SingleCategoryCellDataFieldsPane());
case SCATTER:
case BUBBLE:
//todo 散点图没写好
return new SingleDataPane(new SingleCategoryDataSetFieldsPane(), new SingleCategoryCellDataFieldsPane());
return new SingleDataPane(new ScatterDataSetFieldsPane(), new ScatterCellDataFieldsPane());
default:
return StringUtils.equals(CustomStyle.CUSTOM.toString(), plot.getCustomType()) ?
new SingleDataPane(new SingleCategoryDataSetFieldsPane(), new SingleCategoryCellDataFieldsPane()) :

5
designer-chart/src/main/java/com/fr/design/chartx/GanttChartDataPane.java

@ -5,6 +5,7 @@ import com.fr.design.chartx.fields.diff.MultiCategoryCellDataFieldsPane;
import com.fr.design.chartx.fields.diff.MultiCategoryDataSetFieldsPane;
import com.fr.design.chartx.single.SingleDataPane;
import com.fr.design.gui.frpane.AttributeChangeListener;
import com.fr.plugin.chart.vanchart.VanChart;
import com.fr.van.chart.map.designer.VanChartGroupPane;
import javax.swing.JPanel;
@ -21,13 +22,13 @@ public class GanttChartDataPane extends AbstractChartDataPane<GanttChartDataDefi
protected JPanel createContentPane() {
dataPane = new AbstractVanSingleDataPane(listener) {
@Override
protected SingleDataPane createSingleDataPane() {
protected SingleDataPane createSingleDataPane(VanChart vanChart) {
return new SingleDataPane(new MultiCategoryDataSetFieldsPane(), new MultiCategoryCellDataFieldsPane());
}
};
linkPane = new AbstractVanSingleDataPane(listener) {
@Override
protected SingleDataPane createSingleDataPane() {
protected SingleDataPane createSingleDataPane(VanChart vanChart) {
return new SingleDataPane(new MultiCategoryDataSetFieldsPane(), new MultiCategoryCellDataFieldsPane());
}
};

66
designer-chart/src/main/java/com/fr/design/chartx/component/CellDataSeriesXYValueCorrelationPane.java

@ -0,0 +1,66 @@
package com.fr.design.chartx.component;
import com.fr.base.Utils;
import com.fr.chartx.data.field.ColumnField;
import com.fr.chartx.data.field.diff.BubbleColumnField;
import com.fr.chartx.data.field.diff.BubbleColumnFieldCollection;
import com.fr.design.chartx.component.correlation.AbstractCorrelationPane;
import com.fr.design.chartx.component.correlation.FieldEditorComponentWrapper;
import com.fr.design.chartx.component.correlation.TinyFormulaPaneEditorComponent;
import com.fr.design.i18n.Toolkit;
import java.util.ArrayList;
import java.util.List;
/**
* Created by Wim on 2019/11/04.
*/
public class CellDataSeriesXYValueCorrelationPane extends AbstractCorrelationPane<BubbleColumnFieldCollection> {
@Override
protected FieldEditorComponentWrapper[] createFieldEditorComponentWrappers() {
return new FieldEditorComponentWrapper[]{
new TinyFormulaPaneEditorComponent(Toolkit.i18nText("Fine-Design_Chart_Series_Name")),
new TinyFormulaPaneEditorComponent(Toolkit.i18nText("Fine-Design_Chart_X_Axis")),
new TinyFormulaPaneEditorComponent(Toolkit.i18nText("Fine-Design_Chart_Y_Axis")),
new TinyFormulaPaneEditorComponent(Toolkit.i18nText("Fine-Design_Chart_Series_Value"))
};
}
@Override
protected List<Object[]> covertTBeanToTableModelList(BubbleColumnFieldCollection bubbleColumnFieldCollection) {
List<Object[]> result = new ArrayList<>();
List<BubbleColumnField> bubbleColumnFieldList = bubbleColumnFieldCollection.getList();
for (BubbleColumnField field : bubbleColumnFieldList) {
Object[] array = new Object[]{
field.getSeriesName().getFieldName(),
field.getXField().getFieldName(),
field.getYField().getFieldName(),
field.getValueField().getFieldName()
};
result.add(array);
}
return result;
}
@Override
protected void setTableModelListToTBean(List<Object[]> tableValues, BubbleColumnFieldCollection bubbleColumnFieldCollection) {
List<BubbleColumnField> bubbleColumnFieldList = new ArrayList<>();
for (Object[] oneLine : tableValues) {
BubbleColumnField bubbleColumnField = new BubbleColumnField();
ColumnField series = new ColumnField(Utils.objectToString(oneLine[0]));
ColumnField xField = new ColumnField(Utils.objectToString(oneLine[1]));
ColumnField yField = new ColumnField(Utils.objectToString(oneLine[2]));
ColumnField value = new ColumnField(Utils.objectToString(oneLine[3]));
bubbleColumnField.setSeriesName(series);
bubbleColumnField.setXField(xField);
bubbleColumnField.setYField(yField);
bubbleColumnField.setValueField(value);
bubbleColumnFieldList.add(bubbleColumnField);
}
bubbleColumnFieldCollection.setList(bubbleColumnFieldList);
}
}

86
designer-chart/src/main/java/com/fr/design/chartx/fields/diff/ScatterCellDataFieldsPane.java

@ -0,0 +1,86 @@
package com.fr.design.chartx.fields.diff;
import com.fr.chartx.data.field.diff.BubbleColumnFieldCollection;
import com.fr.design.chartx.component.AbstractSingleFilterPane;
import com.fr.design.chartx.component.CellDataSeriesXYValueCorrelationPane;
import com.fr.design.chartx.fields.AbstractCellDataFieldsPane;
import com.fr.design.formula.TinyFormulaPane;
import com.fr.design.i18n.Toolkit;
import com.fr.van.chart.designer.TableLayout4VanChartHelper;
import javax.swing.JPanel;
import java.awt.BorderLayout;
/**
* Created by Wim on 2019/11/04.
*/
public class ScatterCellDataFieldsPane extends AbstractCellDataFieldsPane<BubbleColumnFieldCollection> {
private CellDataSeriesXYValueCorrelationPane seriesXYValueCorrelationPane;
private AbstractSingleFilterPane filterPane;
public CellDataSeriesXYValueCorrelationPane getSeriesXYValueCorrelationPane() {
return seriesXYValueCorrelationPane;
}
public void setSeriesXYValueCorrelationPane(CellDataSeriesXYValueCorrelationPane seriesXYValueCorrelationPane) {
this.seriesXYValueCorrelationPane = seriesXYValueCorrelationPane;
}
@Override
protected void initComponents() {
filterPane = new AbstractSingleFilterPane() {
@Override
public String title4PopupWindow() {
return Toolkit.i18nText("Fine-Design_Chart_Series");
}
};
this.setLayout(new BorderLayout(0, 6));
this.add(createCenterPane(), BorderLayout.NORTH);
JPanel contentPane = new JPanel(new BorderLayout());
contentPane.add(new JPanel(), BorderLayout.NORTH);
contentPane.add(filterPane, BorderLayout.CENTER);
this.add(TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Data_Filter"), contentPane), BorderLayout.CENTER);
}
@Override
protected JPanel createCenterPane() {
JPanel normalCenter = super.createCenterPane();
seriesXYValueCorrelationPane = new CellDataSeriesXYValueCorrelationPane();
if (normalCenter != null) {
JPanel panel = new JPanel(new BorderLayout(0, 6));
panel.add(normalCenter, BorderLayout.NORTH);
panel.add(seriesXYValueCorrelationPane, BorderLayout.CENTER);
return panel;
} else {
return seriesXYValueCorrelationPane;
}
}
@Override
protected String[] fieldLabels() {
return new String[0];
}
@Override
protected TinyFormulaPane[] formulaPanes() {
return new TinyFormulaPane[0];
}
@Override
public BubbleColumnFieldCollection updateBean() {
BubbleColumnFieldCollection collection = new BubbleColumnFieldCollection();
seriesXYValueCorrelationPane.updateBean(collection);
return collection;
}
@Override
public void populateBean(BubbleColumnFieldCollection ob) {
seriesXYValueCorrelationPane.populateBean(ob);
}
}

95
designer-chart/src/main/java/com/fr/design/chartx/fields/diff/ScatterDataSetFieldsPane.java

@ -0,0 +1,95 @@
package com.fr.design.chartx.fields.diff;
import com.fr.chartx.data.field.diff.BubbleColumnField;
import com.fr.chartx.data.field.diff.BubbleColumnFieldCollection;
import com.fr.design.chartx.component.AbstractSingleFilterPane;
import com.fr.design.chartx.fields.AbstractDataSetFieldsPane;
import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.i18n.Toolkit;
import com.fr.extended.chart.UIComboBoxWithNone;
import com.fr.van.chart.designer.TableLayout4VanChartHelper;
import javax.swing.BorderFactory;
import javax.swing.JPanel;
import javax.swing.JSeparator;
import java.awt.BorderLayout;
/**
* Created by Wim on 2019/10/29.
*/
public class ScatterDataSetFieldsPane extends AbstractDataSetFieldsPane<BubbleColumnFieldCollection> {
private UIComboBoxWithNone series;
private UIComboBox xField;
private UIComboBox yField;
private UIComboBoxWithNone value;
//todo 数据筛选
private AbstractSingleFilterPane filterPane;
@Override
protected void initComponents() {
series = new UIComboBoxWithNone();
xField = new UIComboBox();
yField = new UIComboBox();
value = new UIComboBoxWithNone();
filterPane = new AbstractSingleFilterPane() {
@Override
public String title4PopupWindow() {
return Toolkit.i18nText("Fine-Design_Chart_Series");
}
};
JPanel northPane = new JPanel(new BorderLayout(0, 6));
northPane.add(new JSeparator(), BorderLayout.CENTER);
northPane.add(createCenterPane(), BorderLayout.SOUTH);
northPane.setBorder(BorderFactory.createEmptyBorder(4, 24, 0, 15));
this.setLayout(new BorderLayout(0, 6));
this.add(northPane, BorderLayout.NORTH);
JPanel contentPane = new JPanel(new BorderLayout());
contentPane.add(new JPanel(), BorderLayout.NORTH);
contentPane.add(filterPane, BorderLayout.CENTER);
this.add(TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Data_Filter"), contentPane), BorderLayout.CENTER);
}
@Override
protected UIComboBox[] filedComboBoxes() {
return new UIComboBox[]{
series, xField, yField, value
};
}
@Override
protected String[] fieldLabels() {
return new String[]{
Toolkit.i18nText("Fine-Design_Chart_Series_Name"),
"x",
"y",
Toolkit.i18nText("Fine-Design_Chart_Use_Value")
};
}
@Override
public BubbleColumnFieldCollection updateBean() {
BubbleColumnFieldCollection collection = new BubbleColumnFieldCollection();
BubbleColumnField field = collection.getBubbleColumnField(0);
updateField(series, field.getSeriesName());
updateField(xField, field.getXField());
updateField(yField, field.getYField());
updateField(value, field.getValueField());
return collection;
}
@Override
public void populateBean(BubbleColumnFieldCollection ob) {
BubbleColumnField field = ob.getBubbleColumnField(0);
populateField(series, field.getSeriesName());
populateField(xField, field.getXField());
populateField(yField, field.getYField());
populateField(value, field.getValueField());
}
}

5
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartDataPane.java

@ -10,6 +10,7 @@ import com.fr.design.mainframe.chart.AbstractChartAttrPane;
import com.fr.design.mainframe.chart.PaneTitleConstants;
import com.fr.design.mainframe.chart.gui.data.DataContentsPane;
import com.fr.design.mainframe.chart.gui.data.NormalChartDataPane;
import com.fr.plugin.chart.vanchart.VanChart;
import javax.swing.*;
import java.awt.*;
@ -35,6 +36,10 @@ public class ChartDataPane extends AbstractChartAttrPane {
return contentsPane;
}
protected JPanel createContentPane(VanChart vanChart){
return createContentPane();
}
/**
* 界面标题
*/

22
designer-chart/src/main/java/com/fr/van/chart/bubble/BubbleIndependentVanChartInterface.java

@ -3,6 +3,12 @@ package com.fr.van.chart.bubble;
import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.Plot;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.chartx.AbstractVanSingleDataPane;
import com.fr.design.chartx.fields.diff.ScatterCellDataFieldsPane;
import com.fr.design.chartx.fields.diff.ScatterDataSetFieldsPane;
import com.fr.design.chartx.fields.diff.SingleCategoryCellDataFieldsPane;
import com.fr.design.chartx.fields.diff.SingleCategoryDataSetFieldsPane;
import com.fr.design.chartx.single.SingleDataPane;
import com.fr.design.condition.ConditionAttributesPane;
import com.fr.design.gui.frpane.AttributeChangeListener;
import com.fr.design.i18n.Toolkit;
@ -14,6 +20,7 @@ import com.fr.design.mainframe.chart.gui.data.report.BubblePlotReportDataContent
import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
import com.fr.plugin.chart.bubble.VanChartBubblePlot;
import com.fr.plugin.chart.vanchart.VanChart;
import com.fr.van.chart.bubble.data.VanChartBubblePlotTableDataContentPane;
import com.fr.van.chart.designer.other.VanChartInteractivePaneWithOutSort;
import com.fr.van.chart.designer.other.VanChartOtherPane;
@ -115,4 +122,19 @@ public class BubbleIndependentVanChartInterface extends AbstractIndependentVanCh
public ConditionAttributesPane getPlotConditionPane(Plot plot) {
return new VanChartBubbleConditionPane(plot);
}
@Override
public ChartDataPane getChartDataPane(AttributeChangeListener listener) {
return new AbstractVanSingleDataPane(listener) {
@Override
protected SingleDataPane createSingleDataPane(VanChart vanChart) {
VanChartBubblePlot bubblePlot = vanChart.getPlot();
if (bubblePlot.isForceBubble()) {
return new SingleDataPane(new SingleCategoryDataSetFieldsPane(), new SingleCategoryCellDataFieldsPane());
} else {
return new SingleDataPane(new ScatterDataSetFieldsPane(), new ScatterCellDataFieldsPane());
}
}
};
}
}

3
designer-chart/src/main/java/com/fr/van/chart/funnel/designer/FunnelIndependentVanChartInterface.java

@ -17,6 +17,7 @@ import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPa
import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
import com.fr.design.mainframe.chart.gui.data.table.PiePlotTableDataContentPane;
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
import com.fr.plugin.chart.vanchart.VanChart;
import com.fr.van.chart.designer.data.OneDimensionalPlotReportDataContentPane;
import com.fr.van.chart.designer.other.VanChartInteractivePaneWithOutSort;
import com.fr.van.chart.designer.other.VanChartOtherPane;
@ -98,7 +99,7 @@ public class FunnelIndependentVanChartInterface extends AbstractIndependentVanCh
public ChartDataPane getChartDataPane(AttributeChangeListener listener) {
return new AbstractVanSingleDataPane(listener) {
@Override
protected SingleDataPane createSingleDataPane() {
protected SingleDataPane createSingleDataPane(VanChart vanChart) {
return new SingleDataPane(new FunnelDataSetFieldsPane(), new FunnelCellDataFieldsPane());
}
};

3
designer-chart/src/main/java/com/fr/van/chart/multilayer/MultiPieIndependentVanChartInterface.java

@ -12,6 +12,7 @@ import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.chart.gui.ChartDataPane;
import com.fr.design.mainframe.chart.gui.ChartStylePane;
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
import com.fr.plugin.chart.vanchart.VanChart;
import com.fr.van.chart.multilayer.other.VanChartMultiPieConditionPane;
import com.fr.van.chart.multilayer.style.VanChartMultiPieSeriesPane;
import com.fr.van.chart.vanchart.AbstractIndependentVanChartUI;
@ -46,7 +47,7 @@ public class MultiPieIndependentVanChartInterface extends AbstractIndependentVan
public ChartDataPane getChartDataPane(AttributeChangeListener listener) {
return new AbstractVanSingleDataPane(listener) {
@Override
protected SingleDataPane createSingleDataPane() {
protected SingleDataPane createSingleDataPane(VanChart vanChart) {
return new SingleDataPane(new MultiPieDataSetFieldsPane(), new MultiPieCellDataFieldsPane());
}
};

15
designer-chart/src/main/java/com/fr/van/chart/scatter/ScatterIndependentVanChartInterface.java

@ -4,6 +4,10 @@ package com.fr.van.chart.scatter;
import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.Plot;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.chartx.AbstractVanSingleDataPane;
import com.fr.design.chartx.fields.diff.ScatterCellDataFieldsPane;
import com.fr.design.chartx.fields.diff.ScatterDataSetFieldsPane;
import com.fr.design.chartx.single.SingleDataPane;
import com.fr.design.condition.ConditionAttributesPane;
import com.fr.design.gui.frpane.AttributeChangeListener;
import com.fr.design.i18n.Toolkit;
@ -14,6 +18,7 @@ import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPa
import com.fr.design.mainframe.chart.gui.data.report.BubblePlotReportDataContentPane;
import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
import com.fr.plugin.chart.vanchart.VanChart;
import com.fr.van.chart.designer.other.VanChartInteractivePaneWithOutSort;
import com.fr.van.chart.designer.other.VanChartOtherPane;
import com.fr.van.chart.designer.other.zoom.ZoomPane;
@ -103,4 +108,14 @@ public class ScatterIndependentVanChartInterface extends AbstractIndependentVanC
public ConditionAttributesPane getPlotConditionPane(Plot plot) {
return new VanChartScatterConditionPane(plot);
}
@Override
public ChartDataPane getChartDataPane(AttributeChangeListener listener) {
return new AbstractVanSingleDataPane(listener) {
@Override
protected SingleDataPane createSingleDataPane(VanChart vanChart) {
return new SingleDataPane(new ScatterDataSetFieldsPane(), new ScatterCellDataFieldsPane());
}
};
}
}

3
designer-chart/src/main/java/com/fr/van/chart/structure/desinger/VanStructureChartTypeUI.java

@ -16,6 +16,7 @@ import com.fr.design.mainframe.chart.gui.ChartStylePane;
import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
import com.fr.plugin.chart.vanchart.VanChart;
import com.fr.van.chart.designer.other.VanChartInteractivePaneWithOutSort;
import com.fr.van.chart.designer.other.VanChartOtherPane;
import com.fr.van.chart.designer.other.zoom.ZoomPane;
@ -107,7 +108,7 @@ public class VanStructureChartTypeUI extends AbstractIndependentVanChartUI {
public ChartDataPane getChartDataPane(AttributeChangeListener listener) {
return new AbstractVanSingleDataPane(listener) {
@Override
protected SingleDataPane createSingleDataPane() {
protected SingleDataPane createSingleDataPane(VanChart vanChart) {
return new SingleDataPane(new StructureDataSetFieldsPane(), new StructureCellDataFieldsPane());
}
};

3
designer-chart/src/main/java/com/fr/van/chart/vanchart/AbstractIndependentVanChartUI.java

@ -13,6 +13,7 @@ import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPa
import com.fr.design.mainframe.chart.gui.data.report.CategoryPlotReportDataContentPane;
import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotTableDataContentPane;
import com.fr.plugin.chart.vanchart.VanChart;
import com.fr.van.chart.designer.other.VanChartOtherPane;
import com.fr.van.chart.designer.style.VanChartStylePane;
@ -55,7 +56,7 @@ public abstract class AbstractIndependentVanChartUI extends AbstractIndependentC
public ChartDataPane getChartDataPane(AttributeChangeListener listener) {
return new AbstractVanSingleDataPane(listener) {
@Override
protected SingleDataPane createSingleDataPane() {
protected SingleDataPane createSingleDataPane(VanChart vanChart) {
return new SingleDataPane(new SingleCategoryDataSetFieldsPane(), new SingleCategoryCellDataFieldsPane());
}
};

3
designer-chart/src/main/java/com/fr/van/chart/vanchart/AbstractMultiCategoryVanChartUI.java

@ -15,6 +15,7 @@ import com.fr.design.mainframe.chart.gui.data.report.CategoryPlotReportDataConte
import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotTableDataContentPane;
import com.fr.plugin.chart.attr.plot.VanChartPlot;
import com.fr.plugin.chart.vanchart.VanChart;
import com.fr.van.chart.designer.data.VanChartMoreCateReportDataContentPane;
import com.fr.van.chart.designer.data.VanChartMoreCateTableDataContentPane;
import com.fr.van.chart.designer.other.VanChartInteractivePane;
@ -69,7 +70,7 @@ public abstract class AbstractMultiCategoryVanChartUI extends AbstractIndependen
public ChartDataPane getChartDataPane(AttributeChangeListener listener) {
return new AbstractVanSingleDataPane(listener) {
@Override
protected SingleDataPane createSingleDataPane() {
protected SingleDataPane createSingleDataPane(VanChart vanChart) {
return new SingleDataPane(new MultiCategoryDataSetFieldsPane(), new MultiCategoryCellDataFieldsPane());
}
};

3
designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java

@ -15,6 +15,7 @@ import com.fr.design.mainframe.chart.AbstractChartAttrPane;
import com.fr.design.mainframe.chart.gui.ChartDataPane;
import com.fr.design.mainframe.chart.gui.ChartStylePane;
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
import com.fr.plugin.chart.vanchart.VanChart;
import com.fr.van.chart.designer.other.VanChartInteractivePaneWithOutSort;
import com.fr.van.chart.designer.other.VanChartOtherPane;
import com.fr.van.chart.designer.other.zoom.ZoomPane;
@ -102,7 +103,7 @@ public class WordCloudIndependentVanChartInterface extends AbstractIndependentVa
public ChartDataPane getChartDataPane(AttributeChangeListener listener) {
return new AbstractVanSingleDataPane(listener) {
@Override
protected SingleDataPane createSingleDataPane() {
protected SingleDataPane createSingleDataPane(VanChart vanChart) {
return new SingleDataPane(new WordCloudDataSetFieldsPane(), new WordCloudCellDataFieldsPane());
}
};

Loading…
Cancel
Save