|
|
|
@ -1,24 +1,12 @@ |
|
|
|
package com.fr.van.chart.vanchart; |
|
|
|
package com.fr.van.chart.vanchart; |
|
|
|
|
|
|
|
|
|
|
|
import com.fr.chart.chartattr.ChartCollection; |
|
|
|
|
|
|
|
import com.fr.chart.chartattr.Plot; |
|
|
|
import com.fr.chart.chartattr.Plot; |
|
|
|
import com.fr.design.chartx.AbstractVanSingleDataPane; |
|
|
|
|
|
|
|
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.design.mainframe.chart.gui.ChartDataPane; |
|
|
|
import com.fr.design.mainframe.chart.gui.ChartDataPane; |
|
|
|
import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; |
|
|
|
import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; |
|
|
|
import com.fr.design.mainframe.chart.gui.data.report.CategoryPlotReportDataContentPane; |
|
|
|
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.AbstractTableDataContentPane; |
|
|
|
import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotTableDataContentPane; |
|
|
|
import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotTableDataContentPane; |
|
|
|
import com.fr.general.ComparatorUtils; |
|
|
|
|
|
|
|
import com.fr.plugin.chart.attr.axis.VanChartAxis; |
|
|
|
|
|
|
|
import com.fr.plugin.chart.attr.plot.VanChartPlot; |
|
|
|
import com.fr.plugin.chart.attr.plot.VanChartPlot; |
|
|
|
import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot; |
|
|
|
|
|
|
|
import com.fr.plugin.chart.column.VanChartColumnPlot; |
|
|
|
|
|
|
|
import com.fr.plugin.chart.type.AxisType; |
|
|
|
|
|
|
|
import com.fr.plugin.chart.vanchart.VanChart; |
|
|
|
|
|
|
|
import com.fr.van.chart.designer.data.VanChartMoreCateReportDataContentPane; |
|
|
|
import com.fr.van.chart.designer.data.VanChartMoreCateReportDataContentPane; |
|
|
|
import com.fr.van.chart.designer.data.VanChartMoreCateTableDataContentPane; |
|
|
|
import com.fr.van.chart.designer.data.VanChartMoreCateTableDataContentPane; |
|
|
|
|
|
|
|
|
|
|
|
@ -67,37 +55,38 @@ public abstract class AbstractMultiCategoryVanChartUI extends AbstractIndependen |
|
|
|
// return new AbstractChartAttrPane[]{stylePane, otherPane};
|
|
|
|
// return new AbstractChartAttrPane[]{stylePane, otherPane};
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
//图表数据结构 恢复用注释。取消注释。
|
|
|
|
public ChartDataPane getChartDataPane(AttributeChangeListener listener) { |
|
|
|
// @Override
|
|
|
|
return new AbstractVanSingleDataPane(listener) { |
|
|
|
// public ChartDataPane getChartDataPane(AttributeChangeListener listener) {
|
|
|
|
MultiCategoryDataSetFieldsPane multiCategoryDataSetFieldsPane; |
|
|
|
// return new AbstractVanSingleDataPane(listener) {
|
|
|
|
MultiCategoryCellDataFieldsPane multiCategoryCellDataFieldsPane; |
|
|
|
// MultiCategoryDataSetFieldsPane multiCategoryDataSetFieldsPane;
|
|
|
|
|
|
|
|
// MultiCategoryCellDataFieldsPane multiCategoryCellDataFieldsPane;
|
|
|
|
@Override |
|
|
|
//
|
|
|
|
protected SingleDataPane createSingleDataPane() { |
|
|
|
// @Override
|
|
|
|
multiCategoryDataSetFieldsPane = new MultiCategoryDataSetFieldsPane(); |
|
|
|
// protected SingleDataPane createSingleDataPane() {
|
|
|
|
multiCategoryCellDataFieldsPane = new MultiCategoryCellDataFieldsPane(); |
|
|
|
// multiCategoryDataSetFieldsPane = new MultiCategoryDataSetFieldsPane();
|
|
|
|
return new SingleDataPane(multiCategoryDataSetFieldsPane, multiCategoryCellDataFieldsPane); |
|
|
|
// multiCategoryCellDataFieldsPane = new MultiCategoryCellDataFieldsPane();
|
|
|
|
} |
|
|
|
// return new SingleDataPane(multiCategoryDataSetFieldsPane, multiCategoryCellDataFieldsPane);
|
|
|
|
|
|
|
|
// }
|
|
|
|
@Override |
|
|
|
//
|
|
|
|
public void populate(ChartCollection collection) { |
|
|
|
// @Override
|
|
|
|
super.populate(collection); |
|
|
|
// public void populate(ChartCollection collection) {
|
|
|
|
VanChart vanChart = this.getVanChart(); |
|
|
|
// super.populate(collection);
|
|
|
|
if (vanChart == null) { |
|
|
|
// VanChart vanChart = this.getVanChart();
|
|
|
|
return; |
|
|
|
// if (vanChart == null) {
|
|
|
|
} |
|
|
|
// return;
|
|
|
|
|
|
|
|
// }
|
|
|
|
VanChartRectanglePlot plot = vanChart.getPlot(); |
|
|
|
//
|
|
|
|
VanChartAxis axis = plot.getDefaultXAxis(); |
|
|
|
// VanChartRectanglePlot plot = vanChart.getPlot();
|
|
|
|
if (plot instanceof VanChartColumnPlot |
|
|
|
// VanChartAxis axis = plot.getDefaultXAxis();
|
|
|
|
&& ((VanChartColumnPlot) plot).isBar()) { |
|
|
|
// if (plot instanceof VanChartColumnPlot
|
|
|
|
axis = plot.getDefaultYAxis(); |
|
|
|
// && ((VanChartColumnPlot) plot).isBar()) {
|
|
|
|
} |
|
|
|
// axis = plot.getDefaultYAxis();
|
|
|
|
|
|
|
|
// }
|
|
|
|
multiCategoryDataSetFieldsPane.setCategoryAxis(ComparatorUtils.equals(axis.getAxisType(), AxisType.AXIS_CATEGORY)); |
|
|
|
//
|
|
|
|
multiCategoryCellDataFieldsPane.setCategoryAxis(ComparatorUtils.equals(axis.getAxisType(), AxisType.AXIS_CATEGORY)); |
|
|
|
// multiCategoryDataSetFieldsPane.setCategoryAxis(ComparatorUtils.equals(axis.getAxisType(), AxisType.AXIS_CATEGORY));
|
|
|
|
} |
|
|
|
// multiCategoryCellDataFieldsPane.setCategoryAxis(ComparatorUtils.equals(axis.getAxisType(), AxisType.AXIS_CATEGORY));
|
|
|
|
}; |
|
|
|
// }
|
|
|
|
} |
|
|
|
// };
|
|
|
|
|
|
|
|
// }
|
|
|
|
} |
|
|
|
} |
|
|
|
|
