From 9de0784d64ccbb5bfb49f53698620be2867697a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Mon, 23 Sep 2019 11:24:13 +0800 Subject: [PATCH] =?UTF-8?q?CHART-10603=20=E6=97=A7=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E7=9A=84name=E5=92=8Cpath=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...bstractIndependentChartUIWithAPILevel.java | 11 ---- .../AreaIndependentChartInterface.java | 46 ++++++++++++--- .../BarIndependentChartInterface.java | 58 ++++++++++++++++--- .../BubbleIndependentChartInterface.java | 19 ++++++ .../ColumnIndependentChartInterface.java | 56 +++++++++++++++--- .../CustomIndependentChartInterface.java | 34 ++++++++--- .../DonutIndependentChartInterface.java | 38 +++++++++--- .../FunnelIndependentChartInterface.java | 19 ++++++ .../GanttIndependentChartInterface.java | 19 ++++++ .../GisMapIndependentChartInterface.java | 33 +++++++++-- .../LineIndependentChartInterface.java | 34 ++++++++--- .../MapIndependentChartInterface.java | 19 ++++++ .../MeterIndependentChartInterface.java | 36 ++++++++++-- .../PieIndependentChartInterface.java | 37 +++++++++--- .../RadarIndependentChartInterface.java | 19 ++++++ .../RangeIndependentChartInterface.java | 19 ++++++ .../StockIndependentChartInterface.java | 19 ++++++ .../XYScatterIndependentChartInterface.java | 34 ++++++++--- 18 files changed, 470 insertions(+), 80 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java b/designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java index f754a028e6..9a577a5ae6 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java +++ b/designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java @@ -37,22 +37,11 @@ public abstract class AbstractIndependentChartUIWithAPILevel implements ChartTyp return new ChartDataPane(listener); } - //todo@bjornrefactor 适配旧版本图表后 删掉下面两个方法 - @Override - public String getName() { - return null; - } - @Override public String[] getSubName() { return new String[0]; } - @Override - public String[] getDemoImagePath() { - return new String[0]; - } - /** * 是否使用默认的界面，为了避免界面来回切换 * @return 是否使用默认的界面 diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/AreaIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/AreaIndependentChartInterface.java index ff8a06ac76..61c36eaace 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/AreaIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/AreaIndependentChartInterface.java @@ -16,38 +16,70 @@ import com.fr.design.mainframe.chart.gui.style.series.Area3DSeriesPane; import com.fr.design.mainframe.chart.gui.style.series.AreaSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.AreaPlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. */ public class AreaIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - public AbstractChartTypePane getPlotTypePane(){ + public AbstractChartTypePane getPlotTypePane() { return new AreaPlotPane(); } - public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { return new CategoryPlotTableDataContentPane(parent); } - public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) { return new CategoryPlotReportDataContentPane(parent); } - public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot){ + public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot) { return plot.isSupport3D() ? new Area3DSeriesPane(parent, plot) : new AreaSeriesPane(parent, plot); } - public ConditionAttributesPane getPlotConditionPane(Plot plot){ + public ConditionAttributesPane getPlotConditionPane(Plot plot) { return plot.isSupport3D() ? new Area3DPlotDataSeriesConditionPane() : new AreaPlotDataSeriesCondtionPane(); } /** - *图标路径 + * 图标路径 + * * @return 图标路径 */ - public String getIconPath(){ + public String getIconPath() { return "com/fr/design/images/form/toolbar/ChartF-Area.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Area"); + } + + @Override + public String[] getSubName() { + String chartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Area"); + String stackChartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stacked") + chartName; + String perStackChartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Use_Percent") + stackChartName; + String stackChartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + stackChartName; + String perStackChartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + perStackChartName; + + return new String[]{ + stackChartName, + perStackChartName, + stackChartName3D, + perStackChartName3D + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/areastacked.png", + "com/fr/plugin/chart/demo/image/areastackedpercent.png", + "com/fr/plugin/chart/demo/image/areastacked3D.png", + "com/fr/plugin/chart/demo/image/areastackedpercent3D.png", + }; + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/BarIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/BarIndependentChartInterface.java index de1160b102..16ab82a217 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/BarIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/BarIndependentChartInterface.java @@ -17,39 +17,81 @@ 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; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. */ public class BarIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - public AbstractChartTypePane getPlotTypePane(){ + public AbstractChartTypePane getPlotTypePane() { return new BarPlotPane(); } - public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { return new CategoryPlotTableDataContentPane(parent); } - public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) { return new CategoryPlotReportDataContentPane(parent); } - public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot){ + public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot) { return plot.isSupport3D() ? new Bar3DSeriesPane(parent, plot) : new Bar2DSeriesPane(parent, plot); } - public ConditionAttributesPane getPlotConditionPane(Plot plot){ + public ConditionAttributesPane getPlotConditionPane(Plot plot) { return plot.isSupport3D() ? new Bar3DPlotDataSeriesConditionPane() - : (plot.isSupportTrendLine() ? new Bar2DTrendLineDSConditionPane() : new BarPlotDataSeriesConditionPane()); + : (plot.isSupportTrendLine() ? new Bar2DTrendLineDSConditionPane() : new BarPlotDataSeriesConditionPane()); } /** - *图标路径 + * 图标路径 + * * @return 图标路径 */ - public String getIconPath(){ + public String getIconPath() { return "com/fr/design/images/form/toolbar/ChartF-Bar.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Bar"); + } + + @Override + public String[] getSubName() { + String chartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Bar"); + String stackChartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stacked") + chartName; + String perStackChartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Use_Percent") + stackChartName; + String chartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + chartName; + String chartNameHoriz3D = chartName3D + "(" + InterProviderFactory.getProvider().getLocText("Fine-Engine_Report_Utils_Left_To_Right") + ")"; + String stackChartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + stackChartName; + String perStackChartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_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" + }; + } + } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/BubbleIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/BubbleIndependentChartInterface.java index b9d0b232ce..4b47ba5e2f 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/BubbleIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/BubbleIndependentChartInterface.java @@ -14,6 +14,7 @@ import com.fr.design.mainframe.chart.gui.data.table.BubblePlotTableDataContentPa import com.fr.design.mainframe.chart.gui.style.series.BubbleSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.BubblePlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -48,4 +49,22 @@ public class BubbleIndependentChartInterface extends AbstractIndependentChartUIW return new BubblePlotDataSeriesConditionPane(); } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Bubble_Chart"); + } + + @Override + public String[] getSubName() { + return new String[]{ + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Bubble_Chart") + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/bubble.png" + }; + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/ColumnIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/ColumnIndependentChartInterface.java index 8a9249274f..bb9c3ddb32 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/ColumnIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/ColumnIndependentChartInterface.java @@ -17,39 +17,81 @@ 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; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. */ public class ColumnIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - public AbstractChartTypePane getPlotTypePane(){ + public AbstractChartTypePane getPlotTypePane() { return new ColumnPlotPane(); } - public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { return new CategoryPlotMoreCateTableDataContentPane(parent); } - public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) { return new CategoryPlotMoreCateReportDataContentPane(parent); } - public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot){ + public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot) { return plot.isSupport3D() ? new Bar3DSeriesPane(parent, plot) : new Bar2DSeriesPane(parent, plot); } - public ConditionAttributesPane getPlotConditionPane(Plot plot){ + public ConditionAttributesPane getPlotConditionPane(Plot plot) { return plot.isSupport3D() ? new Bar3DPlotDataSeriesConditionPane() : (plot.isSupportTrendLine() ? new Bar2DTrendLineDSConditionPane() : new BarPlotDataSeriesConditionPane()); } /** - *图标路径 + * 图标路径 + * * @return 图标路径 */ - public String getIconPath(){ + public String getIconPath() { return "com/fr/design/images/form/toolbar/ChartF-Column.png"; } + + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Column"); + } + + @Override + public String[] getSubName() { + String chartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Column"); + String stackChartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stacked") + chartName; + String perStackChartName = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Use_Percent") + stackChartName; + String chartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D")+ chartName; + String chartNameHoriz3D = chartName3D + "(" + InterProviderFactory.getProvider().getLocText("Fine-Engine_Report_Utils_Left_To_Right") + ")"; + String stackChartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + stackChartName; + String perStackChartName3D = InterProviderFactory.getProvider().getLocText("Fine-Engine_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" + }; + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/CustomIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/CustomIndependentChartInterface.java index 584cdb5e1e..7e3520446b 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/CustomIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/CustomIndependentChartInterface.java @@ -14,6 +14,7 @@ import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotTableDataContent import com.fr.design.mainframe.chart.gui.style.series.CustomSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.CustomPlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -21,32 +22,51 @@ import com.fr.design.mainframe.chart.gui.type.CustomPlotPane; public class CustomIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - public AbstractChartTypePane getPlotTypePane(){ + public AbstractChartTypePane getPlotTypePane() { return new CustomPlotPane(); } - public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { return new CategoryPlotTableDataContentPane(parent); } - public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) { return new CategoryPlotReportDataContentPane(parent); } - public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot){ + public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot) { return new CustomSeriesPane(parent, plot); } - public ConditionAttributesPane getPlotConditionPane(Plot plot){ + public ConditionAttributesPane getPlotConditionPane(Plot plot) { return new DataSeriesCustomConditionPane(); } /** - *图标路径 + * 图标路径 + * * @return 图标路径 */ - public String getIconPath(){ + public String getIconPath() { return "com/fr/design/images/form/toolbar/ChartF-Comb_Chart.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Combine"); + } + + @Override + public String[] getSubName() { + return new String[]{ + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Combine") + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/custom.png" + }; + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/DonutIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/DonutIndependentChartInterface.java index 8b5894384a..d8df6a59be 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/DonutIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/DonutIndependentChartInterface.java @@ -16,6 +16,7 @@ import com.fr.design.mainframe.chart.gui.style.series.Donut2DSeriesPane; import com.fr.design.mainframe.chart.gui.style.series.Donut3DSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.DonutPlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -23,32 +24,53 @@ import com.fr.design.mainframe.chart.gui.type.DonutPlotPane; public class DonutIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - public AbstractChartTypePane getPlotTypePane(){ + public AbstractChartTypePane getPlotTypePane() { return new DonutPlotPane(); } - public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { return new CategoryPlotTableDataContentPane(parent); } - public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) { return new CategoryPlotReportDataContentPane(parent); } - public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot){ + public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot) { return plot.isSupport3D() ? new Donut3DSeriesPane(parent, plot) : new Donut2DSeriesPane(parent, plot); } - - public ConditionAttributesPane getPlotConditionPane(Plot plot){ + + public ConditionAttributesPane getPlotConditionPane(Plot plot) { return plot.isSupport3D() ? new DataSeriesConditionPane() : new Donut2DPlotDataSeriesConditionPane(); } /** - *图标路径 + * 图标路径 + * * @return 图标路径 */ - public String getIconPath(){ + public String getIconPath() { return "com/fr/design/images/form/toolbar/ChartF-Donut.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Donut"); + } + + @Override + public String[] getSubName() { + return new String[]{ + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Donut"), + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Donut") + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/donut2D.png", + "com/fr/plugin/chart/demo/image/donut3D.png" + }; + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/FunnelIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/FunnelIndependentChartInterface.java index 75ca4e6f82..267048706c 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/FunnelIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/FunnelIndependentChartInterface.java @@ -14,6 +14,7 @@ import com.fr.design.mainframe.chart.gui.data.table.PiePlotTableDataContentPane; import com.fr.design.mainframe.chart.gui.style.series.FunnelSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.FunnelPlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -49,4 +50,22 @@ public class FunnelIndependentChartInterface extends AbstractIndependentChartUIW return "com/fr/design/images/form/toolbar/ChartF-Funnel.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Funnel"); + } + + @Override + public String[] getSubName() { + return new String[]{ + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Funnel") + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/funnel.png" + }; + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/GanttIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/GanttIndependentChartInterface.java index b032b7ca25..33a0d8de2d 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/GanttIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/GanttIndependentChartInterface.java @@ -11,6 +11,7 @@ import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane import com.fr.design.mainframe.chart.gui.data.table.GanttPlotTableDataContentPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.GanttPlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -42,4 +43,22 @@ public class GanttIndependentChartInterface extends AbstractIndependentChartUIWi return "com/fr/design/images/form/toolbar/ChartF-Gantt.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Gantt"); + } + + @Override + public String[] getSubName() { + return new String[]{ + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Gantt") + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/gantt.png" + }; + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/GisMapIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/GisMapIndependentChartInterface.java index 04cdbd8b29..9fc6767405 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/GisMapIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/GisMapIndependentChartInterface.java @@ -7,6 +7,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.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.GisMapPlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -14,23 +15,45 @@ import com.fr.design.mainframe.chart.gui.type.GisMapPlotPane; public class GisMapIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - public AbstractChartTypePane getPlotTypePane(){ + public AbstractChartTypePane getPlotTypePane() { return new GisMapPlotPane(); } - public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { return null; } - public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) { return null; } + /** - *图标路径 + * 图标路径 + * * @return 图标路径 */ - public String getIconPath(){ + public String getIconPath() { return "com/fr/design/images/form/toolbar/ChartF-Gis.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_GIS_Map"); + } + + @Override + public String[] getSubName() { + return new String[]{ + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Map_BaiduMap"), + InterProviderFactory.getProvider().getLocText("Fine-Engine_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" + }; + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/LineIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/LineIndependentChartInterface.java index a133a200ac..2e9dbbceb4 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/LineIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/LineIndependentChartInterface.java @@ -15,6 +15,7 @@ import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotMoreCateTableDat import com.fr.design.mainframe.chart.gui.style.series.LineSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.LinePlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -22,32 +23,51 @@ import com.fr.design.mainframe.chart.gui.type.LinePlotPane; public class LineIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - public AbstractChartTypePane getPlotTypePane(){ + public AbstractChartTypePane getPlotTypePane() { return new LinePlotPane(); } - public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { return new CategoryPlotMoreCateTableDataContentPane(parent); } - public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) { return new CategoryPlotMoreCateReportDataContentPane(parent); } - public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot){ + public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot) { return new LineSeriesPane(parent, plot); } - public ConditionAttributesPane getPlotConditionPane(Plot plot){ + public ConditionAttributesPane getPlotConditionPane(Plot plot) { return plot.isSupportTrendLine() ? new LinePlotDataSeriesConditionPane() : new DataSeriesConditionPane(); } /** - *图标路径 + * 图标路径 + * * @return 图标路径 */ - public String getIconPath(){ + public String getIconPath() { return "com/fr/design/images/form/toolbar/ChartF-Line.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Line"); + } + + @Override + public String[] getSubName() { + return new String[]{ + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Line") + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/line.png" + }; + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/MapIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/MapIndependentChartInterface.java index 2fc17e1476..3189041df4 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/MapIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/MapIndependentChartInterface.java @@ -12,6 +12,7 @@ import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane import com.fr.design.mainframe.chart.gui.style.series.MapSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.MapPlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -47,4 +48,22 @@ public class MapIndependentChartInterface extends AbstractIndependentChartUIWith return "com/fr/design/images/form/toolbar/Chart-Map.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_SVG_MAP"); + } + + @Override + public String[] getSubName() { + return new String[]{ + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_SVG_MAP") + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/map.png" + }; + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/MeterIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/MeterIndependentChartInterface.java index ce1f5b07bf..2ace3c94ea 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/MeterIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/MeterIndependentChartInterface.java @@ -12,6 +12,7 @@ import com.fr.design.mainframe.chart.gui.data.table.MeterPlotTableDataContentPan import com.fr.design.mainframe.chart.gui.style.series.MeterSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.MeterPlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -19,28 +20,51 @@ import com.fr.design.mainframe.chart.gui.type.MeterPlotPane; public class MeterIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - public AbstractChartTypePane getPlotTypePane(){ + public AbstractChartTypePane getPlotTypePane() { return new MeterPlotPane(); } - public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { return new MeterPlotTableDataContentPane(parent); } - public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) { return new MeterPlotReportDataContentPane(parent); } - public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot){ + public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot) { return new MeterSeriesPane(parent, plot); } /** - *图标路径 + * 图标路径 + * * @return 图标路径 */ - public String getIconPath(){ + public String getIconPath() { return "com/fr/design/images/form/toolbar/ChartF-Meter.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Meter"); + } + + @Override + public String[] getSubName() { + return new String[]{ + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Meter"), + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Meter"), + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Meter") + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/meter.png", + "com/fr/plugin/chart/demo/image/meterblue.png", + "com/fr/plugin/chart/demo/image/metersimple.png" + }; + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/PieIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/PieIndependentChartInterface.java index 0583186ebf..d03cefeff5 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/PieIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/PieIndependentChartInterface.java @@ -16,6 +16,7 @@ import com.fr.design.mainframe.chart.gui.style.series.Pie2DSeriesPane; import com.fr.design.mainframe.chart.gui.style.series.Pie3DSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.PiePlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -23,32 +24,54 @@ import com.fr.design.mainframe.chart.gui.type.PiePlotPane; public class PieIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - public AbstractChartTypePane getPlotTypePane(){ + public AbstractChartTypePane getPlotTypePane() { return new PiePlotPane(); } - public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { return new PiePlotTableDataContentPane(parent); } - public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) { return new PiePlotReportDataContentPane(parent); } - public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot){ + public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot) { return plot.isSupport3D() ? new Pie3DSeriesPane(parent, plot) : new Pie2DSeriesPane(parent, plot); } - public ConditionAttributesPane getPlotConditionPane(Plot plot){ + public ConditionAttributesPane getPlotConditionPane(Plot plot) { return plot.isSupport3D() ? new Pie3DPlotDataSeriesConditionPane() : new PiePlotDataSeriesConditionPane(); } /** - *图标路径 + * 图标路径 + * * @return 图标路径 */ - public String getIconPath(){ + public String getIconPath() { return "com/fr/design/images/form/toolbar/ChartF-Pie.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Pie"); + } + + @Override + public String[] getSubName() { + return new String[]{ + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Pie"), + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_3D") + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Pie") + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/pie.png", + "com/fr/plugin/chart/demo/image/pie3D.png", + }; + } + } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/RadarIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/RadarIndependentChartInterface.java index 04ca36dcbc..5abd70b2f7 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/RadarIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/RadarIndependentChartInterface.java @@ -14,6 +14,7 @@ import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotTableDataContent import com.fr.design.mainframe.chart.gui.style.series.RadarSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.RadarPlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -50,4 +51,22 @@ public class RadarIndependentChartInterface extends AbstractIndependentChartUIWi return "com/fr/design/images/form/toolbar/ChartF-Radar.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Radar"); + } + + @Override + public String[] getSubName() { + return new String[]{ + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Radar") + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/radar.png" + }; + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/RangeIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/RangeIndependentChartInterface.java index 85866c339e..6b584271d0 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/RangeIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/RangeIndependentChartInterface.java @@ -12,6 +12,7 @@ import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotTableDataContent import com.fr.design.mainframe.chart.gui.style.series.RangeSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.RangePlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -43,4 +44,22 @@ public class RangeIndependentChartInterface extends AbstractIndependentChartUIWi return "com/fr/design/images/form/toolbar/ChartF-Range_Chart.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Range"); + } + + @Override + public String[] getSubName() { + return new String[]{ + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Range") + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/range.png" + }; + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/StockIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/StockIndependentChartInterface.java index 7d73d8594f..eaebb0084c 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/StockIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/StockIndependentChartInterface.java @@ -15,6 +15,7 @@ import com.fr.design.mainframe.chart.gui.data.table.StockPlotTableDataContentPan import com.fr.design.mainframe.chart.gui.style.series.StockSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.StockPlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -50,4 +51,22 @@ public class StockIndependentChartInterface extends AbstractIndependentChartUIWi return "com/fr/design/images/form/toolbar/ChartF-Stock.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stock"); + } + + @Override + public String[] getSubName() { + return new String[]{ + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_Stock") + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/stock.png" + }; + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chartinterface/XYScatterIndependentChartInterface.java b/designer-chart/src/main/java/com/fr/design/chartinterface/XYScatterIndependentChartInterface.java index 64de95eae1..d268998c6f 100644 --- a/designer-chart/src/main/java/com/fr/design/chartinterface/XYScatterIndependentChartInterface.java +++ b/designer-chart/src/main/java/com/fr/design/chartinterface/XYScatterIndependentChartInterface.java @@ -15,6 +15,7 @@ import com.fr.design.mainframe.chart.gui.data.table.XYScatterPlotTableDataConten import com.fr.design.mainframe.chart.gui.style.series.XYScatterSeriesPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.XYScatterPlotPane; +import com.fr.locale.InterProviderFactory; /** * Created by eason on 15/4/21. @@ -22,33 +23,52 @@ import com.fr.design.mainframe.chart.gui.type.XYScatterPlotPane; public class XYScatterIndependentChartInterface extends AbstractIndependentChartUIWithAPILevel { - public AbstractChartTypePane getPlotTypePane(){ + public AbstractChartTypePane getPlotTypePane() { return new XYScatterPlotPane(); } - public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { return new XYScatterPlotTableDataContentPane(parent); } - public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent){ + public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) { return new XYScatterPlotReportDataContentPane(parent); } - public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot){ + public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot) { return new XYScatterSeriesPane(parent, plot); } - public ConditionAttributesPane getPlotConditionPane(Plot plot){ + public ConditionAttributesPane getPlotConditionPane(Plot plot) { return plot.isSupportTrendLine() ? new XYScatterPlotDataSeriesConditionPane() : new DataSeriesConditionPane(); } /** - *图标路径 + * 图标路径 + * * @return 图标路径 */ - public String getIconPath(){ + public String getIconPath() { return "com/fr/design/images/form/toolbar/ChartF-XYScatter.png"; } + @Override + public String getName() { + return InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_XYScatter"); + } + + @Override + public String[] getSubName() { + return new String[]{ + InterProviderFactory.getProvider().getLocText("Fine-Engine_Chart_Type_XYScatter") + }; + } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/point.png" + }; + } } \ No newline at end of file