Browse Source
* commit '894fd9f4adffccf516892642bd57942cf512318e': CHART-10603 包名和类型修改 CHART-10603 getSubName方法修改 CHART-10603 国际化方法修改 CHART-10603 旧版本图表的name和path处理research/11.0
39 changed files with 730 additions and 340 deletions
@ -1,55 +0,0 @@
|
||||
package com.fr.design.chartinterface; |
||||
|
||||
import com.fr.chart.chartattr.Plot; |
||||
import com.fr.design.beans.BasicBeanPane; |
||||
import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel; |
||||
import com.fr.design.chart.series.SeriesCondition.impl.Bar2DTrendLineDSConditionPane; |
||||
import com.fr.design.chart.series.SeriesCondition.impl.Bar3DPlotDataSeriesConditionPane; |
||||
import com.fr.design.chart.series.SeriesCondition.impl.BarPlotDataSeriesConditionPane; |
||||
import com.fr.design.condition.ConditionAttributesPane; |
||||
import com.fr.design.mainframe.chart.gui.ChartDataPane; |
||||
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.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.design.mainframe.chart.gui.style.series.Bar2DSeriesPane; |
||||
import com.fr.design.mainframe.chart.gui.style.series.Bar3DSeriesPane; |
||||
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; |
||||
import com.fr.design.mainframe.chart.gui.type.BarPlotPane; |
||||
|
||||
/** |
||||
* Created by eason on 15/4/21. |
||||
*/ |
||||
public class BarIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { |
||||
|
||||
public AbstractChartTypePane getPlotTypePane(){ |
||||
return new BarPlotPane(); |
||||
} |
||||
|
||||
public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){ |
||||
return new CategoryPlotTableDataContentPane(parent); |
||||
} |
||||
|
||||
public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){ |
||||
return new CategoryPlotReportDataContentPane(parent); |
||||
} |
||||
|
||||
public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot){ |
||||
return plot.isSupport3D() ? new Bar3DSeriesPane(parent, plot) : new Bar2DSeriesPane(parent, plot); |
||||
} |
||||
|
||||
public ConditionAttributesPane getPlotConditionPane(Plot plot){ |
||||
return plot.isSupport3D() ? new Bar3DPlotDataSeriesConditionPane() |
||||
: (plot.isSupportTrendLine() ? new Bar2DTrendLineDSConditionPane() : new BarPlotDataSeriesConditionPane()); |
||||
} |
||||
|
||||
/** |
||||
*图标路径 |
||||
* @return 图标路径 |
||||
*/ |
||||
public String getIconPath(){ |
||||
return "com/fr/design/images/form/toolbar/ChartF-Bar.png"; |
||||
} |
||||
|
||||
} |
||||
@ -1,55 +0,0 @@
|
||||
package com.fr.design.chartinterface; |
||||
|
||||
import com.fr.chart.chartattr.Plot; |
||||
import com.fr.design.beans.BasicBeanPane; |
||||
import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel; |
||||
import com.fr.design.chart.series.SeriesCondition.impl.Bar2DTrendLineDSConditionPane; |
||||
import com.fr.design.chart.series.SeriesCondition.impl.Bar3DPlotDataSeriesConditionPane; |
||||
import com.fr.design.chart.series.SeriesCondition.impl.BarPlotDataSeriesConditionPane; |
||||
import com.fr.design.condition.ConditionAttributesPane; |
||||
import com.fr.design.mainframe.chart.gui.ChartDataPane; |
||||
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.report.CategoryPlotMoreCateReportDataContentPane; |
||||
import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; |
||||
import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotMoreCateTableDataContentPane; |
||||
import com.fr.design.mainframe.chart.gui.style.series.Bar2DSeriesPane; |
||||
import com.fr.design.mainframe.chart.gui.style.series.Bar3DSeriesPane; |
||||
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; |
||||
import com.fr.design.mainframe.chart.gui.type.ColumnPlotPane; |
||||
|
||||
/** |
||||
* Created by eason on 15/4/21. |
||||
*/ |
||||
public class ColumnIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { |
||||
|
||||
public AbstractChartTypePane getPlotTypePane(){ |
||||
return new ColumnPlotPane(); |
||||
} |
||||
|
||||
|
||||
public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){ |
||||
return new CategoryPlotMoreCateTableDataContentPane(parent); |
||||
} |
||||
|
||||
public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){ |
||||
return new CategoryPlotMoreCateReportDataContentPane(parent); |
||||
} |
||||
|
||||
public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot){ |
||||
return plot.isSupport3D() ? new Bar3DSeriesPane(parent, plot) : new Bar2DSeriesPane(parent, plot); |
||||
} |
||||
|
||||
public ConditionAttributesPane getPlotConditionPane(Plot plot){ |
||||
return plot.isSupport3D() ? new Bar3DPlotDataSeriesConditionPane() |
||||
: (plot.isSupportTrendLine() ? new Bar2DTrendLineDSConditionPane() : new BarPlotDataSeriesConditionPane()); |
||||
} |
||||
|
||||
/** |
||||
*图标路径 |
||||
* @return 图标路径 |
||||
*/ |
||||
public String getIconPath(){ |
||||
return "com/fr/design/images/form/toolbar/ChartF-Column.png"; |
||||
} |
||||
} |
||||
@ -1,36 +0,0 @@
|
||||
package com.fr.design.chartinterface; |
||||
|
||||
import com.fr.chart.chartattr.Plot; |
||||
import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel; |
||||
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.table.AbstractTableDataContentPane; |
||||
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; |
||||
import com.fr.design.mainframe.chart.gui.type.GisMapPlotPane; |
||||
|
||||
/** |
||||
* Created by eason on 15/4/21. |
||||
*/ |
||||
public class GisMapIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { |
||||
|
||||
|
||||
public AbstractChartTypePane getPlotTypePane(){ |
||||
return new GisMapPlotPane(); |
||||
} |
||||
|
||||
public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){ |
||||
return null; |
||||
} |
||||
|
||||
public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){ |
||||
return null; |
||||
} |
||||
/** |
||||
*图标路径 |
||||
* @return 图标路径 |
||||
*/ |
||||
public String getIconPath(){ |
||||
return "com/fr/design/images/form/toolbar/ChartF-Gis.png"; |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,97 @@
|
||||
package com.fr.design.type.ui; |
||||
|
||||
import com.fr.chart.chartattr.Plot; |
||||
import com.fr.design.beans.BasicBeanPane; |
||||
import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel; |
||||
import com.fr.design.chart.series.SeriesCondition.impl.Bar2DTrendLineDSConditionPane; |
||||
import com.fr.design.chart.series.SeriesCondition.impl.Bar3DPlotDataSeriesConditionPane; |
||||
import com.fr.design.chart.series.SeriesCondition.impl.BarPlotDataSeriesConditionPane; |
||||
import com.fr.design.condition.ConditionAttributesPane; |
||||
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.data.report.AbstractReportDataContentPane; |
||||
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.design.mainframe.chart.gui.style.series.Bar2DSeriesPane; |
||||
import com.fr.design.mainframe.chart.gui.style.series.Bar3DSeriesPane; |
||||
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; |
||||
import com.fr.design.mainframe.chart.gui.type.BarPlotPane; |
||||
|
||||
/** |
||||
* Created by eason on 15/4/21. |
||||
*/ |
||||
public class BarChartTypeUI extends AbstractIndependentChartUIWithAPILevel { |
||||
|
||||
public AbstractChartTypePane getPlotTypePane() { |
||||
return new BarPlotPane(); |
||||
} |
||||
|
||||
public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { |
||||
return new CategoryPlotTableDataContentPane(parent); |
||||
} |
||||
|
||||
public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) { |
||||
return new CategoryPlotReportDataContentPane(parent); |
||||
} |
||||
|
||||
public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot) { |
||||
return plot.isSupport3D() ? new Bar3DSeriesPane(parent, plot) : new Bar2DSeriesPane(parent, plot); |
||||
} |
||||
|
||||
public ConditionAttributesPane getPlotConditionPane(Plot plot) { |
||||
return plot.isSupport3D() ? new Bar3DPlotDataSeriesConditionPane() |
||||
: (plot.isSupportTrendLine() ? new Bar2DTrendLineDSConditionPane() : new BarPlotDataSeriesConditionPane()); |
||||
} |
||||
|
||||
/** |
||||
* 图标路径 |
||||
* |
||||
* @return 图标路径 |
||||
*/ |
||||
public String getIconPath() { |
||||
return "com/fr/design/images/form/toolbar/ChartF-Bar.png"; |
||||
} |
||||
|
||||
@Override |
||||
public String getName() { |
||||
return Toolkit.i18nText("Fine-Design_Chart_Type_Bar"); |
||||
} |
||||
|
||||
@Override |
||||
public String[] getSubName() { |
||||
String chartName = Toolkit.i18nText("Fine-Design_Chart_Type_Bar"); |
||||
String stackChartName = Toolkit.i18nText("Fine-Design_Chart_Type_Stacked") + chartName; |
||||
String perStackChartName = Toolkit.i18nText("Fine-Design_Chart_Use_Percent") + stackChartName; |
||||
String chartName3D = Toolkit.i18nText("Fine-Design_Chart_3D") + chartName; |
||||
String chartNameHoriz3D = chartName3D + "(" + Toolkit.i18nText("Fine-Design_Report_Utils_Left_To_Right") + ")"; |
||||
String stackChartName3D = Toolkit.i18nText("Fine-Design_Chart_3D") + stackChartName; |
||||
String perStackChartName3D = Toolkit.i18nText("Fine-Design_Chart_3D") + perStackChartName; |
||||
|
||||
//依次，条形图-旧版本、堆积条形图-旧版本、百分比堆积条形图-旧版本、三维条形图-旧版本、三维条形图-旧版本(横向)、三维堆积条形图-旧版本、三维百分比堆积条形图-旧版本
|
||||
return new String[]{ |
||||
chartName, |
||||
stackChartName, |
||||
perStackChartName, |
||||
chartName3D, |
||||
chartNameHoriz3D, |
||||
stackChartName3D, |
||||
perStackChartName3D |
||||
}; |
||||
} |
||||
|
||||
@Override |
||||
public String[] getDemoImagePath() { |
||||
return new String[]{ |
||||
"com/fr/plugin/chart/demo/image/bar.png", |
||||
"com/fr/plugin/chart/demo/image/barstacked.png", |
||||
"com/fr/plugin/chart/demo/image/barstackedpercent.png", |
||||
"com/fr/plugin/chart/demo/image/bar3D.png", |
||||
"com/fr/plugin/chart/demo/image/bar3D(cross).png", |
||||
"com/fr/plugin/chart/demo/image/barstacked3D.png", |
||||
"com/fr/plugin/chart/demo/image/barstackedpercent3D.png" |
||||
}; |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,97 @@
|
||||
package com.fr.design.type.ui; |
||||
|
||||
import com.fr.chart.chartattr.Plot; |
||||
import com.fr.design.beans.BasicBeanPane; |
||||
import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel; |
||||
import com.fr.design.chart.series.SeriesCondition.impl.Bar2DTrendLineDSConditionPane; |
||||
import com.fr.design.chart.series.SeriesCondition.impl.Bar3DPlotDataSeriesConditionPane; |
||||
import com.fr.design.chart.series.SeriesCondition.impl.BarPlotDataSeriesConditionPane; |
||||
import com.fr.design.condition.ConditionAttributesPane; |
||||
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.data.report.AbstractReportDataContentPane; |
||||
import com.fr.design.mainframe.chart.gui.data.report.CategoryPlotMoreCateReportDataContentPane; |
||||
import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; |
||||
import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotMoreCateTableDataContentPane; |
||||
import com.fr.design.mainframe.chart.gui.style.series.Bar2DSeriesPane; |
||||
import com.fr.design.mainframe.chart.gui.style.series.Bar3DSeriesPane; |
||||
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; |
||||
import com.fr.design.mainframe.chart.gui.type.ColumnPlotPane; |
||||
|
||||
/** |
||||
* Created by eason on 15/4/21. |
||||
*/ |
||||
public class ColumnChartTypeUI extends AbstractIndependentChartUIWithAPILevel { |
||||
|
||||
public AbstractChartTypePane getPlotTypePane() { |
||||
return new ColumnPlotPane(); |
||||
} |
||||
|
||||
|
||||
public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { |
||||
return new CategoryPlotMoreCateTableDataContentPane(parent); |
||||
} |
||||
|
||||
public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) { |
||||
return new CategoryPlotMoreCateReportDataContentPane(parent); |
||||
} |
||||
|
||||
public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot) { |
||||
return plot.isSupport3D() ? new Bar3DSeriesPane(parent, plot) : new Bar2DSeriesPane(parent, plot); |
||||
} |
||||
|
||||
public ConditionAttributesPane getPlotConditionPane(Plot plot) { |
||||
return plot.isSupport3D() ? new Bar3DPlotDataSeriesConditionPane() |
||||
: (plot.isSupportTrendLine() ? new Bar2DTrendLineDSConditionPane() : new BarPlotDataSeriesConditionPane()); |
||||
} |
||||
|
||||
/** |
||||
* 图标路径 |
||||
* |
||||
* @return 图标路径 |
||||
*/ |
||||
public String getIconPath() { |
||||
return "com/fr/design/images/form/toolbar/ChartF-Column.png"; |
||||
} |
||||
|
||||
@Override |
||||
public String getName() { |
||||
return Toolkit.i18nText("Fine-Design_Chart_Type_Column"); |
||||
} |
||||
|
||||
@Override |
||||
public String[] getSubName() { |
||||
String chartName = Toolkit.i18nText("Fine-Design_Chart_Type_Column"); |
||||
String stackChartName = Toolkit.i18nText("Fine-Design_Chart_Type_Stacked") + chartName; |
||||
String perStackChartName = Toolkit.i18nText("Fine-Design_Chart_Use_Percent") + stackChartName; |
||||
String chartName3D = Toolkit.i18nText("Fine-Design_Chart_3D")+ chartName; |
||||
String chartNameHoriz3D = chartName3D + "(" + Toolkit.i18nText("Fine-Design_Report_Utils_Left_To_Right") + ")"; |
||||
String stackChartName3D = Toolkit.i18nText("Fine-Design_Chart_3D") + stackChartName; |
||||
String perStackChartName3D = Toolkit.i18nText("Fine-Design_Chart_3D") + perStackChartName; |
||||
|
||||
//依次，柱形图-旧版本、堆积柱形图-旧版本、百分比堆积柱形图-旧版本、三维柱形图-旧版本、三维柱形图-旧版本(横向)、三维堆积柱形图-旧版本、三维百分比堆积柱形图-旧版本
|
||||
return new String[]{ |
||||
chartName, |
||||
stackChartName, |
||||
perStackChartName, |
||||
chartName3D, |
||||
chartNameHoriz3D, |
||||
stackChartName3D, |
||||
perStackChartName3D |
||||
}; |
||||
} |
||||
|
||||
@Override |
||||
public String[] getDemoImagePath() { |
||||
return new String[]{ |
||||
"com/fr/plugin/chart/demo/image/column.png", |
||||
"com/fr/plugin/chart/demo/image/columnstacked.png", |
||||
"com/fr/plugin/chart/demo/image/columnstackedpercent.png", |
||||
"com/fr/plugin/chart/demo/image/column3D.png", |
||||
"com/fr/plugin/chart/demo/image/column3D(cross).png", |
||||
"com/fr/plugin/chart/demo/image/columnstacked3D.png", |
||||
"com/fr/plugin/chart/demo/image/columnstackedpercent3D.png" |
||||
}; |
||||
} |
||||
} |
||||
@ -0,0 +1,59 @@
|
||||
package com.fr.design.type.ui; |
||||
|
||||
import com.fr.chart.chartattr.Plot; |
||||
import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel; |
||||
import com.fr.design.i18n.Toolkit; |
||||
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.table.AbstractTableDataContentPane; |
||||
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; |
||||
import com.fr.design.mainframe.chart.gui.type.GisMapPlotPane; |
||||
|
||||
/** |
||||
* Created by eason on 15/4/21. |
||||
*/ |
||||
public class GisMapChartTypeUI extends AbstractIndependentChartUIWithAPILevel { |
||||
|
||||
|
||||
public AbstractChartTypePane getPlotTypePane() { |
||||
return new GisMapPlotPane(); |
||||
} |
||||
|
||||
public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { |
||||
return null; |
||||
} |
||||
|
||||
public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) { |
||||
return null; |
||||
} |
||||
|
||||
/** |
||||
* 图标路径 |
||||
* |
||||
* @return 图标路径 |
||||
*/ |
||||
public String getIconPath() { |
||||
return "com/fr/design/images/form/toolbar/ChartF-Gis.png"; |
||||
} |
||||
|
||||
@Override |
||||
public String getName() { |
||||
return Toolkit.i18nText("Fine-Design_Chart_GIS_Map_OLD"); |
||||
} |
||||
|
||||
@Override |
||||
public String[] getSubName() { |
||||
return new String[]{ |
||||
Toolkit.i18nText("Fine-Design_Chart_Map_BaiduMap"), |
||||
Toolkit.i18nText("Fine-Design_Chart_Map_GoogleMap") |
||||
}; |
||||
} |
||||
|
||||
@Override |
||||
public String[] getDemoImagePath() { |
||||
return new String[]{ |
||||
"com/fr/plugin/chart/demo/image/gismap.png", |
||||
"com/fr/plugin/chart/demo/image/gismap.png" |
||||
}; |
||||
} |
||||
} |
||||
Loading…
Reference in new issue