From a7c7f062d11573c1fb46176de670d77c6c686764 Mon Sep 17 00:00:00 2001 From: zheng Date: Mon, 9 Sep 2019 18:06:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=AF=84=E5=AE=A1=E5=87=BA?= =?UTF-8?q?=E7=9A=84=E4=B8=A4=E4=B8=AA=E9=97=AE=E9=A2=98=201.demopath?= =?UTF-8?q?=E6=94=BE=E5=88=B0typeUI=E6=8E=A5=E5=8F=A3=E4=B8=AD=202.typepan?= =?UTF-8?q?e.tipPath=20=E9=BB=98=E8=AE=A4=E8=B0=83=E7=94=A81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/ChartTypeInterfaceManager.java | 107 ++++++++++++++---- .../com/fr/design/chart/ChartTypePane.java | 2 +- .../design/chart/fun/ChartTypeUIProvider.java | 16 ++- .../chart/fun/impl/AbstractChartTypeUI.java | 27 +++-- ...bstractIndependentChartUIWithAPILevel.java | 5 + ...mmonTypePane.java => DefaultTypePane.java} | 4 +- .../AreaIndependentVanChartInterface.java | 10 ++ .../bar/BarIndependentVanChartInterface.java | 10 ++ .../BubbleIndependentVanChartInterface.java | 9 ++ .../ColumnIndependentVanChartInterface.java | 10 ++ .../CustomIndependentVanChartInterface.java | 10 ++ .../DrillMapIndependentVanChartInterface.java | 9 ++ .../FunnelIndependentVanChartInterface.java | 7 ++ .../GanttIndependentVanChartInterface.java | 7 ++ .../GaugeIndependentVanChartInterface.java | 11 ++ .../HeatMapIndependentVanChartInterface.java | 7 ++ .../LineIndependentVanChartInterface.java | 9 ++ .../map/MapIndependentVanChartInterface.java | 12 ++ .../MultiPieIndependentVanChartInterface.java | 7 ++ .../pie/PieIndependentVanChartInterface.java | 10 ++ .../RadarIndependentVanChartInterface.java | 8 ++ .../ScatterIndependentVanChartInterface.java | 7 ++ ...StructureIndependentVanChartInterface.java | 9 ++ .../TreeMapIndependentVanChartInterface.java | 7 ++ ...WordCloudIndependentVanChartInterface.java | 7 ++ 25 files changed, 291 insertions(+), 36 deletions(-) rename designer-chart/src/main/java/com/fr/design/chartx/impl/{CommonTypePane.java => DefaultTypePane.java} (90%) diff --git a/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java b/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java index f0d012544..b931aa991 100644 --- a/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java @@ -4,6 +4,7 @@ import com.fr.chart.base.ChartConstants; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; import com.fr.chart.charttypes.ChartTypeManager; +import com.fr.chart.fun.ChartTypeProvider; import com.fr.chartx.attr.ChartProvider; import com.fr.common.annotations.Compatible; import com.fr.design.beans.BasicBeanPane; @@ -39,10 +40,12 @@ 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.module.DesignModuleFactory; +import com.fr.extended.chart.AbstractChart; import com.fr.form.ui.ChartEditor; import com.fr.general.GeneralContext; import com.fr.general.IOUtils; import com.fr.invoke.Reflect; +import com.fr.locale.InterProviderFactory; import com.fr.log.FineLoggerFactory; import com.fr.plugin.chart.PiePlot4VanChart; import com.fr.plugin.chart.area.VanChartAreaPlot; @@ -325,9 +328,62 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr return StringUtils.EMPTY; } - public String[] getSubName(String id) { + public String[] getDemoImagePath(String chartID) { + + if (chartTypeInterfaces != null) { + ChartTypeUIProvider provider = getChartTypeInterface(chartID); + if (provider != null) { + String[] result = null; + try { + result = provider.getDemoImagePath(); + } catch (Throwable e) { + //do nothing + } + return ArrayUtils.isEmpty(result) ? getCompatibleDemoImagePath(chartID) : result; + } + } + + return new String[0]; + } + + private String[] getCompatibleDemoImagePath(String chartID) { + String[] result = null; + try { + //AbstractIndependentChartsProvider + ChartTypeProvider chartTypeProvider = Reflect.on(ChartTypeManager.getInstanceWithCheck()).call("getChartType", chartID).get(); + result = new String[]{ + Reflect.on(chartTypeProvider).call("getChartImagePath").get() + }; + + if (ArrayUtils.isNotEmpty(result)) { + return result; + } + } catch (Exception e) { + //do nothing + } + + try { + //兼容 图表类型选择界面会调到这边 + ChartProvider[] charts = ChartTypeManager.getInstanceWithCheck().getChartTypes(chartID); + result = new String[charts.length]; + for (int i = 0; i < charts.length; i++) { + //Chart && AbstractChart + ChartProvider chart = charts[i]; + if (!(chart instanceof AbstractChart)) {//扩展图表 + chart = Reflect.on(chart).field("subChart").get(); + } + result[i] = Reflect.on(chart).call("demoImagePath").get(); + } + } catch (Exception e) { + //do nothing + } + + return new String[0]; + } + + public String[] getSubName(String chartID) { if (chartTypeInterfaces != null) { - ChartTypeUIProvider provider = getChartTypeInterface(id); + ChartTypeUIProvider provider = getChartTypeInterface(chartID); if (provider != null) { String[] subNames = null; try { @@ -335,31 +391,32 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr } catch (Throwable throwable) { //do nothing } - return ArrayUtils.isEmpty(subNames) ? getCompatibleSubName(id, provider) : subNames; + return ArrayUtils.isEmpty(subNames) ? getCompatibleSubName(chartID, provider) : subNames; } } return new String[0]; } //兼容 - private String[] getCompatibleSubName(String id, ChartTypeUIProvider provider) { - ChartProvider[] chartProviders = ChartTypeManager.getInstanceWithCheck().getChartTypes(id); + private String[] getCompatibleSubName(String chartID, ChartTypeUIProvider provider) { + ChartProvider[] chartProviders = ChartTypeManager.getInstanceWithCheck().getChartTypes(chartID); if (chartProviders.length == 1) { - return new String[]{getName(id)}; + return new String[]{getName(chartID)}; } String[] result = new String[chartProviders.length]; for (int i = 0; i < chartProviders.length; i++) { if (chartProviders[i] instanceof Chart) { + //Chart && AbstractChart result[i] = ((Chart) chartProviders[i]).getChartName(); } } return result; } - public String getName(String id) { + public String getName(String chartID) { if (chartTypeInterfaces != null) { - ChartTypeUIProvider provider = getChartTypeInterface(id); + ChartTypeUIProvider provider = getChartTypeInterface(chartID); if (provider != null) { String name = null; try { @@ -368,31 +425,41 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr //do nothing } - return StringUtils.isEmpty(name) ? getCompatibleName(id, provider) : name; + return StringUtils.isEmpty(name) ? getCompatibleName(chartID, provider) : name; } } return StringUtils.EMPTY; } //兼容 - private static String getCompatibleName(String id, ChartTypeUIProvider provider) { + private static String getCompatibleName(String chartID, ChartTypeUIProvider provider) { String result = null; try { - result = Reflect.on(provider).call("getPlotTypeTitle4PopupWindow").get(); + //AbstractIndependentChartsProvider + ChartTypeProvider chartTypeProvider = Reflect.on(ChartTypeManager.getInstanceWithCheck()).call("getChartType", chartID).get(); + result = Reflect.on(chartTypeProvider).call("getChartName").get();//国际化的key + result = InterProviderFactory.getProvider().getLocText(result); + if (StringUtils.isNotEmpty(result)) { + return result; + } } catch (Exception e) { //do nothing } - if (StringUtils.isNotEmpty(result)) { - return result; - } - ChartProvider chartProvider = ChartTypeManager.getInstanceWithCheck().getChartTypes(id)[0]; - if (chartProvider instanceof Chart) { - result = ((Chart) chartProvider).getChartName(); - } - if (StringUtils.isNotEmpty(result)) { - return result; + + try { + ChartProvider chartProvider = ChartTypeManager.getInstanceWithCheck().getChartTypes(chartID)[0]; + if (chartProvider instanceof Chart) { + //AbstractExtendedChartUIProvider + result = ((Chart) chartProvider).getChartName(); + } + if (StringUtils.isNotEmpty(result) && !"Charts".equals(result)) { + return result; + } + + } catch (Exception e) { + //do nothing } return provider.getPlotTypePane().title4PopupWindow(); diff --git a/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java b/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java index d349b3967..eb17cc41f 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java @@ -94,7 +94,7 @@ public class ChartTypePane extends ChartCommonWizardPane { int main_index = mainTypeList.getSelectedIndex(); String id = ChartTypePane.this.chartIDs[main_index]; - String[] demoImagePath = ChartTypeManager.getInstanceWithCheck().getDemoImagePath(id); + String[] demoImagePath = ChartTypeInterfaceManager.getInstance().getDemoImagePath(id); String[] subName = ChartTypeInterfaceManager.getInstance().getSubName(id); ChartTypePane.this.iconListModel.clear(); diff --git a/designer-chart/src/main/java/com/fr/design/chart/fun/ChartTypeUIProvider.java b/designer-chart/src/main/java/com/fr/design/chart/fun/ChartTypeUIProvider.java index 80256b617..586b3fc6a 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/fun/ChartTypeUIProvider.java +++ b/designer-chart/src/main/java/com/fr/design/chart/fun/ChartTypeUIProvider.java @@ -19,7 +19,7 @@ import com.fr.stable.fun.Level; * Created by eason on 14/12/29. * * @since 8.0 - * 自定义图表类型设设计界面接口 + * 自定义 图表类型 界面接口 */ public interface ChartTypeUIProvider extends Level { @@ -66,8 +66,18 @@ public interface ChartTypeUIProvider extends Level { String[] getSubName(); /** - * 图标路径 - * 表单 工具栏 拖拽图表小图标 + * 图表 demo图片路径 + * 400*225 + * 1.图表选择界面的图的路径 原样渲染 + * 2.图表属性第一个界面 类型界面 缩放渲染 + * + * @return demo图片路径 + */ + String[] getDemoImagePath(); + + /** + * 小图标路径 + * 表单 工具栏 图表小图标 * 16*16 * * @return 图标路径 diff --git a/designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractChartTypeUI.java index a4a7b5611..86d7ee9fa 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractChartTypeUI.java @@ -5,6 +5,7 @@ import com.fr.design.beans.BasicBeanPane; import com.fr.design.chart.fun.ChartTypeUIProvider; import com.fr.design.chartx.impl.AbstractDataPane; import com.fr.design.chartx.impl.AbstractOtherPane; +import com.fr.design.chartx.impl.DefaultTypePane; import com.fr.design.condition.ConditionAttributesPane; import com.fr.design.gui.frpane.AttributeChangeListener; import com.fr.design.mainframe.chart.ChartEditPane; @@ -13,6 +14,7 @@ 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.table.AbstractTableDataContentPane; +import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.stable.fun.impl.AbstractProvider; /** @@ -20,6 +22,11 @@ import com.fr.stable.fun.impl.AbstractProvider; */ public abstract class AbstractChartTypeUI extends AbstractProvider implements ChartTypeUIProvider { + @Override + public AbstractChartTypePane getPlotTypePane() { + return new DefaultTypePane(); + } + @Override public abstract AbstractDataPane getChartDataPane(AttributeChangeListener listener); @@ -31,6 +38,16 @@ public abstract class AbstractChartTypeUI extends AbstractProvider implements Ch return new String[]{getName()}; } + @Override + public int currentAPILevel() { + return CURRENT_API_LEVEL; + } + + @Override + public String mark4Provider() { + return getClass().getName(); + } + @Override public boolean needChartChangePane() { return false; @@ -51,16 +68,6 @@ public abstract class AbstractChartTypeUI extends AbstractProvider implements Ch return false; } - @Override - public int currentAPILevel() { - return CURRENT_API_LEVEL; - } - - @Override - public String mark4Provider() { - return getClass().getName(); - } - @Override public ChartEditPane getChartEditPane(String plotID) { return new ChartEditPane(); 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 38f4ab0a6..f754a028e 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 @@ -48,6 +48,11 @@ public abstract class AbstractIndependentChartUIWithAPILevel implements ChartTyp return new String[0]; } + @Override + public String[] getDemoImagePath() { + return new String[0]; + } + /** * 是否使用默认的界面，为了避免界面来回切换 * @return 是否使用默认的界面 diff --git a/designer-chart/src/main/java/com/fr/design/chartx/impl/CommonTypePane.java b/designer-chart/src/main/java/com/fr/design/chartx/impl/DefaultTypePane.java similarity index 90% rename from designer-chart/src/main/java/com/fr/design/chartx/impl/CommonTypePane.java rename to designer-chart/src/main/java/com/fr/design/chartx/impl/DefaultTypePane.java index 24d9bf95d..07db589a9 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/impl/CommonTypePane.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/impl/DefaultTypePane.java @@ -10,11 +10,11 @@ import com.fr.design.mainframe.chart.gui.type.ChartImagePane; /** * Created by shine on 2019/09/04. */ -public class CommonTypePane extends AbstractChartTypePane { +public class DefaultTypePane extends AbstractChartTypePane { @Override protected String[] getTypeIconPath() { - return new String[0]; + return ChartTypeInterfaceManager.getInstance().getDemoImagePath(getPlotID()); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/area/AreaIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/area/AreaIndependentVanChartInterface.java index 79d12301e..23bd47004 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/area/AreaIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/area/AreaIndependentVanChartInterface.java @@ -35,6 +35,16 @@ public class AreaIndependentVanChartInterface extends AbstractMultiCategoryVanCh }; } + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/14.png", + "com/fr/plugin/chart/demo/image/15.png", + "com/fr/plugin/chart/demo/image/16.png", + "com/fr/plugin/chart/demo/image/17.png" + }; + } + @Override public AbstractChartTypePane getPlotTypePane() { return new VanChartAreaPlotPane(); diff --git a/designer-chart/src/main/java/com/fr/van/chart/bar/BarIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/bar/BarIndependentVanChartInterface.java index 813698c19..0321132b3 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/bar/BarIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/bar/BarIndependentVanChartInterface.java @@ -37,6 +37,16 @@ public class BarIndependentVanChartInterface extends AbstractMultiCategoryVanCha }; } + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/7.png", + "com/fr/plugin/chart/demo/image/8.png", + "com/fr/plugin/chart/demo/image/9.png", + "com/fr/plugin/chart/demo/image/10.png", + }; + } + @Override public String getIconPath() { return "com/fr/design/images/form/toolbar/bar.png"; diff --git a/designer-chart/src/main/java/com/fr/van/chart/bubble/BubbleIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/bubble/BubbleIndependentVanChartInterface.java index 86522174c..8e732b406 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/bubble/BubbleIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/bubble/BubbleIndependentVanChartInterface.java @@ -35,6 +35,15 @@ public class BubbleIndependentVanChartInterface extends AbstractIndependentVanCh Toolkit.i18nText("Fine-Design_Chart_New_Force_Bubble") }; } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/26.png", + "com/fr/plugin/chart/demo/image/27.png" + }; + } + /** * 图表的类型定义界面类型，就是属性表的第一个界面 * diff --git a/designer-chart/src/main/java/com/fr/van/chart/column/ColumnIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/column/ColumnIndependentVanChartInterface.java index d85cfc5fc..ebecf18ca 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/column/ColumnIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/column/ColumnIndependentVanChartInterface.java @@ -31,6 +31,16 @@ public class ColumnIndependentVanChartInterface extends AbstractMultiCategoryVan }; } + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/3.png", + "com/fr/plugin/chart/demo/image/4.png", + "com/fr/plugin/chart/demo/image/5.png", + "com/fr/plugin/chart/demo/image/6.png", + }; + } + @Override public String getIconPath() { return "com/fr/design/images/form/toolbar/column.png"; diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/CustomIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/custom/CustomIndependentVanChartInterface.java index 2d376f89b..ffb44ca32 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/custom/CustomIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/custom/CustomIndependentVanChartInterface.java @@ -30,6 +30,16 @@ public class CustomIndependentVanChartInterface extends AbstractIndependentVanCh }; } + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/28.png", + "com/fr/plugin/chart/demo/image/29.png", + "com/fr/plugin/chart/demo/image/30.png", + "com/fr/plugin/chart/demo/image/31.png" + }; + } + /** * 图表的类型定义界面类型，就是属性表的第一个界面 * diff --git a/designer-chart/src/main/java/com/fr/van/chart/drillmap/DrillMapIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/drillmap/DrillMapIndependentVanChartInterface.java index efa2eb684..f74706b9a 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/drillmap/DrillMapIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/drillmap/DrillMapIndependentVanChartInterface.java @@ -31,6 +31,15 @@ public class DrillMapIndependentVanChartInterface extends MapIndependentVanChart }; } + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/37.png", + "com/fr/plugin/chart/demo/image/38.png", + "com/fr/plugin/chart/demo/image/39.png" + }; + } + /** * 图标路径 * diff --git a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/FunnelIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/FunnelIndependentVanChartInterface.java index 2b5a28db1..549695970 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/FunnelIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/FunnelIndependentVanChartInterface.java @@ -31,6 +31,13 @@ public class FunnelIndependentVanChartInterface extends AbstractIndependentVanCh return Toolkit.i18nText("Fine-Design_Chart_New_Funnel"); } + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/41.png" + }; + } + /** * 图表的类型定义界面类型，就是属性表的第一个界面 * diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/GanttIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/GanttIndependentVanChartInterface.java index b840c925b..9bc3ce123 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/GanttIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/GanttIndependentVanChartInterface.java @@ -33,6 +33,13 @@ public class GanttIndependentVanChartInterface extends AbstractIndependentVanCha return Toolkit.i18nText("Fine-Design_Chart_New_Gantt"); } + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/44.png" + }; + } + @Override public AbstractChartTypePane getPlotTypePane() { return new VanChartGanttPlotPane(); diff --git a/designer-chart/src/main/java/com/fr/van/chart/gauge/GaugeIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/gauge/GaugeIndependentVanChartInterface.java index 8a9c6cde1..af4aa2c8f 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gauge/GaugeIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gauge/GaugeIndependentVanChartInterface.java @@ -48,6 +48,17 @@ public class GaugeIndependentVanChartInterface extends AbstractIndependentVanCha }; } + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/18.png", + "com/fr/plugin/chart/demo/image/19.png", + "com/fr/plugin/chart/demo/image/20.png", + "com/fr/plugin/chart/demo/image/21.png", + "com/fr/plugin/chart/demo/image/22.png" + }; + } + @Override public AbstractChartTypePane getPlotTypePane() { return new VanChartGaugePlotPane(); diff --git a/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/HeatMapIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/HeatMapIndependentVanChartInterface.java index 2bb347d4f..2d07fda4d 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/HeatMapIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/HeatMapIndependentVanChartInterface.java @@ -38,6 +38,13 @@ public class HeatMapIndependentVanChartInterface extends MapIndependentVanChartI return Toolkit.i18nText("Fine-Design_Chart_New_HeatMap"); } + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/42.png" + }; + } + public AbstractChartTypePane getPlotTypePane() { return new VanChartHeatMapTypePane(); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/line/LineIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/line/LineIndependentVanChartInterface.java index 171e72ac2..739e87f14 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/line/LineIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/line/LineIndependentVanChartInterface.java @@ -31,6 +31,15 @@ public class LineIndependentVanChartInterface extends AbstractMultiCategoryVanCh }; } + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/11.png", + "com/fr/plugin/chart/demo/image/12.png", + "com/fr/plugin/chart/demo/image/13.png" + }; + } + @Override public AbstractChartTypePane getPlotTypePane() { return new VanChartLinePlotPane(); diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/MapIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/map/MapIndependentVanChartInterface.java index a84a56e6f..76deff2d3 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/MapIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/MapIndependentVanChartInterface.java @@ -48,6 +48,18 @@ public class MapIndependentVanChartInterface extends AbstractIndependentVanChart }; } + + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/33.png", + "com/fr/plugin/chart/demo/image/34.png", + "com/fr/plugin/chart/demo/image/35.png", + "com/fr/plugin/chart/demo/image/36.png" + }; + } + + /** * 图表的类型定义界面类型，就是属性表的第一个界面 * diff --git a/designer-chart/src/main/java/com/fr/van/chart/multilayer/MultiPieIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/multilayer/MultiPieIndependentVanChartInterface.java index 3d72cd3d7..d6fe79390 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/multilayer/MultiPieIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/multilayer/MultiPieIndependentVanChartInterface.java @@ -29,6 +29,13 @@ public class MultiPieIndependentVanChartInterface extends AbstractIndependentVan return Toolkit.i18nText("Fine-Design_Chart_New_MultiPie"); } + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/32.png" + }; + } + // @Override // public ChartDataPane getChartDataPane(AttributeChangeListener listener) { // return new AbstractDataPane(listener) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/pie/PieIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/pie/PieIndependentVanChartInterface.java index 4e37c53c1..06841c0c9 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/pie/PieIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/pie/PieIndependentVanChartInterface.java @@ -38,6 +38,16 @@ public class PieIndependentVanChartInterface extends AbstractIndependentVanChart }; } + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/0.png", + "com/fr/plugin/chart/demo/image/1.png", + "com/fr/plugin/chart/demo/image/2.png" + }; + } + + @Override public AbstractChartTypePane getPlotTypePane() { return new VanChartPiePlotPane(); diff --git a/designer-chart/src/main/java/com/fr/van/chart/radar/RadarIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/radar/RadarIndependentVanChartInterface.java index 547b2d4a7..21784c522 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/radar/RadarIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/radar/RadarIndependentVanChartInterface.java @@ -30,6 +30,14 @@ public class RadarIndependentVanChartInterface extends AbstractIndependentVanCha }; } + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/23.png", + "com/fr/plugin/chart/demo/image/24.png" + }; + } + @Override public AbstractChartTypePane getPlotTypePane() { return new VanChartRadarPlotPane(); diff --git a/designer-chart/src/main/java/com/fr/van/chart/scatter/ScatterIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/scatter/ScatterIndependentVanChartInterface.java index 8374a7879..263ce191a 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/scatter/ScatterIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/scatter/ScatterIndependentVanChartInterface.java @@ -40,6 +40,13 @@ public class ScatterIndependentVanChartInterface extends AbstractIndependentVanC return Toolkit.i18nText("Fine-Design_Chart_New_Scatter"); } + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/25.png" + }; + } + /** * 图标路径 * diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/StructureIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/StructureIndependentVanChartInterface.java index 15d9cacf6..6be8c692b 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/StructureIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/StructureIndependentVanChartInterface.java @@ -46,6 +46,15 @@ public class StructureIndependentVanChartInterface extends AbstractIndependentVa }; } + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/45.png", + "com/fr/plugin/chart/demo/image/46.png", + "com/fr/plugin/chart/demo/image/47.png" + }; + } + @Override public String getIconPath() { return "com/fr/design/images/form/toolbar/structure.png"; diff --git a/designer-chart/src/main/java/com/fr/van/chart/treemap/TreeMapIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/treemap/TreeMapIndependentVanChartInterface.java index 021062fe6..2b6589ed8 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/treemap/TreeMapIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/treemap/TreeMapIndependentVanChartInterface.java @@ -28,6 +28,13 @@ public class TreeMapIndependentVanChartInterface extends MultiPieIndependentVanC return Toolkit.i18nText("Fine-Design_Chart_New_TreeMap"); } + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/40.png" + }; + } + @Override public String getIconPath() { return "com/fr/design/images/form/toolbar/treeMap.png"; diff --git a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java index 71c67be91..62356028f 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java @@ -40,6 +40,13 @@ public class WordCloudIndependentVanChartInterface extends AbstractIndependentVa return Toolkit.i18nText("Fine-Design_Chart_Word_Cloud"); } + @Override + public String[] getDemoImagePath() { + return new String[]{ + "com/fr/plugin/chart/demo/image/43.png" + }; + } + /** * 图标路径 *