From 5e276b06fe2fd2b2ecaa3905cf25697619d9ca68 Mon Sep 17 00:00:00 2001 From: richie Date: Fri, 19 Feb 2016 14:26:52 +0800 Subject: [PATCH] =?UTF-8?q?echarts=E9=A5=BC=E5=9B=BE=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../echarts/common/glyph/EChartsGlyph.java | 11 ---- .../echarts/common/plot/EChartsPlot.java | 4 ++ .../common/ui/AbstractEChartsTypePane.java | 40 +++++++++++- .../plugin/chart/echarts/pie/EChartsPie.java | 9 +-- .../pie/glyph/EChartsPiePlotGlyph.java | 14 +++- .../chart/echarts/pie/images/pie_type1.png | Bin 4893 -> 0 bytes .../echarts/pie/images/pie_type_area.png | Bin 0 -> 1017 bytes .../{pie_type2.png => pie_type_none.png} | Bin .../echarts/pie/images/pie_type_radius.png | Bin 0 -> 1139 bytes .../echarts/pie/plot/EChartsPiePlot.java | 21 ++++-- .../pie/plot/{PieType.java => RoseType.java} | 16 ++--- .../pie/ui/EChartsPieChartTypePane.java | 61 +++++++++++++----- 12 files changed, 126 insertions(+), 50 deletions(-) delete mode 100644 src/com/fr/solution/plugin/chart/echarts/pie/images/pie_type1.png create mode 100644 src/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_area.png rename src/com/fr/solution/plugin/chart/echarts/pie/images/{pie_type2.png => pie_type_none.png} (100%) create mode 100644 src/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_radius.png rename src/com/fr/solution/plugin/chart/echarts/pie/plot/{PieType.java => RoseType.java} (64%) diff --git a/src/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsGlyph.java b/src/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsGlyph.java index f0bbac3..c1b2518 100644 --- a/src/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsGlyph.java +++ b/src/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsGlyph.java @@ -24,7 +24,6 @@ public class EChartsGlyph extends ChartGlyph { if (legendGlyph != null) { jo.put("legend", legendGlyph.toJSONObject(repo)); } - //jo.put("dataRange", createDataRange(repo)); EChartsPlotGlyph plotGlyph = (EChartsPlotGlyph) getPlotGlyph(); if (plotGlyph != null) { jo.put("series", plotGlyph.toSeriesData(repo)); @@ -37,14 +36,4 @@ public class EChartsGlyph extends ChartGlyph { return JSONObject.create() .put("trigger", "item"); } - - - private JSONObject createDataRange(Repository repo) throws JSONException { - return JSONObject.create() - .put("min", 0) - .put("max", 2500) - .put("x", "left") - .put("y", "bottom") - .put("text", JSONArray.create().put("高").put("低")); - } } \ No newline at end of file diff --git a/src/com/fr/solution/plugin/chart/echarts/common/plot/EChartsPlot.java b/src/com/fr/solution/plugin/chart/echarts/common/plot/EChartsPlot.java index 9c3ce11..a445a3b 100644 --- a/src/com/fr/solution/plugin/chart/echarts/common/plot/EChartsPlot.java +++ b/src/com/fr/solution/plugin/chart/echarts/common/plot/EChartsPlot.java @@ -24,6 +24,10 @@ public abstract class EChartsPlot extends Plot { @Override public EChartsLegendGlyph createLegendGlyph(PlotGlyph plotGlyph) { EChartsLegend legend = (EChartsLegend) getLegend(); + if (legend == null) { + legend = new EChartsLegend(); + setLegend(legend); + } return legend.createLegendGlyph(createLegendItems(plotGlyph)); } diff --git a/src/com/fr/solution/plugin/chart/echarts/common/ui/AbstractEChartsTypePane.java b/src/com/fr/solution/plugin/chart/echarts/common/ui/AbstractEChartsTypePane.java index 8057543..0f3f498 100644 --- a/src/com/fr/solution/plugin/chart/echarts/common/ui/AbstractEChartsTypePane.java +++ b/src/com/fr/solution/plugin/chart/echarts/common/ui/AbstractEChartsTypePane.java @@ -1,10 +1,12 @@ package com.fr.solution.plugin.chart.echarts.common.ui; import com.fr.chart.chartattr.Chart; +import com.fr.chart.chartattr.Legend; import com.fr.chart.chartattr.Plot; import com.fr.chart.chartglyph.ConditionCollection; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.ChartImagePane; +import com.fr.general.FRLogger; import com.fr.solution.plugin.chart.echarts.common.base.ECharts; import java.util.ArrayList; @@ -13,7 +15,6 @@ import java.util.List; public abstract class AbstractEChartsTypePane extends AbstractChartTypePane{ private static final long serialVersionUID = 7743244512351499265L; - //新图表暂时还没有平面3d，渐变高光等布局。 @Override protected List initStyleList() { return new ArrayList(); @@ -25,6 +26,35 @@ public abstract class AbstractEChartsTypePane extends AbstractChartTypePane{ }; } + @Override + protected String[] getTypeIconPath() { + return getIconsOfTypes(); + } + + public abstract String[] getIconsOfTypes(); + + /** + * 不同字类型图表的名字 + * @return 名字 + */ + public abstract String[] getNamesOfTypes(); + + + public abstract Plot getSelectedClonedPlot(); + + @Override + protected List initDemoList() { + List demoList = new ArrayList(); + String[] iconPaths = getTypeIconPath(); + String[] names = getNamesOfTypes(); + ChartImagePane pane = new ChartImagePane(iconPaths[0], names[0]); + pane.isPressing = true; + demoList.add(pane); + demoList.add(new ChartImagePane(iconPaths[1], names[1])); + demoList.add(new ChartImagePane(iconPaths[2], names[2])); + return demoList; + } + /** * 保存界面属性 */ @@ -62,7 +92,13 @@ public abstract class AbstractEChartsTypePane extends AbstractChartTypePane{ * 同一个图表， 类型之间切换 */ protected void cloneOldPlot2New(Plot oldPlot, Plot newPlot) { - + try { + if (oldPlot.getLegend() != null) { + newPlot.setLegend((Legend) oldPlot.getLegend().clone()); + } + } catch (CloneNotSupportedException e) { + FRLogger.getLogger().error(e.getMessage(), e); + } } protected void cloneOldConditionCollection(Plot oldPlot, Plot newPlot) throws CloneNotSupportedException{ diff --git a/src/com/fr/solution/plugin/chart/echarts/pie/EChartsPie.java b/src/com/fr/solution/plugin/chart/echarts/pie/EChartsPie.java index bca7ed8..e46f745 100644 --- a/src/com/fr/solution/plugin/chart/echarts/pie/EChartsPie.java +++ b/src/com/fr/solution/plugin/chart/echarts/pie/EChartsPie.java @@ -5,21 +5,22 @@ import com.fr.general.Inter; import com.fr.solution.plugin.chart.echarts.common.base.AbstractIndependentEChartsProvider; import com.fr.solution.plugin.chart.echarts.common.base.ECharts; import com.fr.solution.plugin.chart.echarts.pie.plot.EChartsPiePlot; -import com.fr.solution.plugin.chart.echarts.pie.plot.PieType; +import com.fr.solution.plugin.chart.echarts.pie.plot.RoseType; /** * Created by richie on 16/2/18. */ public class EChartsPie extends AbstractIndependentEChartsProvider { - private static ECharts createPie(PieType type) { + private static ECharts createPie(RoseType type) { EChartsPiePlot plot = new EChartsPiePlot(type); return new ECharts(plot); } public static ECharts[] charts = new ECharts[] { - createPie(PieType.REGULAR), - createPie(PieType.CIRCLE) + createPie(RoseType.NONE), + createPie(RoseType.AREA), + createPie(RoseType.RADIUS), }; diff --git a/src/com/fr/solution/plugin/chart/echarts/pie/glyph/EChartsPiePlotGlyph.java b/src/com/fr/solution/plugin/chart/echarts/pie/glyph/EChartsPiePlotGlyph.java index 642c707..06bc983 100644 --- a/src/com/fr/solution/plugin/chart/echarts/pie/glyph/EChartsPiePlotGlyph.java +++ b/src/com/fr/solution/plugin/chart/echarts/pie/glyph/EChartsPiePlotGlyph.java @@ -7,12 +7,24 @@ import com.fr.json.JSONException; import com.fr.json.JSONFunction; import com.fr.json.JSONObject; import com.fr.solution.plugin.chart.echarts.common.glyph.EChartsPlotGlyph; +import com.fr.solution.plugin.chart.echarts.pie.plot.RoseType; import com.fr.stable.web.Repository; /** * Created by richie on 16/2/18. */ public class EChartsPiePlotGlyph extends EChartsPlotGlyph { + + private RoseType roseType; + + public EChartsPiePlotGlyph() { + this(RoseType.NONE); + } + + public EChartsPiePlotGlyph(RoseType roseType) { + this.roseType = roseType; + } + @Override public String getPlotGlyphType() { return "EChartsPiePlotGlyph"; @@ -28,6 +40,7 @@ public class EChartsPiePlotGlyph extends EChartsPlotGlyph { JSONObject wrapper = JSONObject.create(); result.put(wrapper); wrapper.put("type", "pie"); + wrapper.put("roseType", roseType.toTypeString()); wrapper.put("itemStyle", JSONObject.create().put("normal", JSONObject.create().put("label", @@ -39,7 +52,6 @@ public class EChartsPiePlotGlyph extends EChartsPlotGlyph { String name = series.getSeriesName(); JSONObject item = JSONObject.create(); data.put(item); - item.put("name", name); if (series.getDataPointCount() > 0) { DataPoint dataPoint = series.getDataPoint(0); diff --git a/src/com/fr/solution/plugin/chart/echarts/pie/images/pie_type1.png b/src/com/fr/solution/plugin/chart/echarts/pie/images/pie_type1.png deleted file mode 100644 index 10e2bbea4481df1bd8b5dfd88eefa97dbbe4a424..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4893 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 diff --git a/src/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_area.png b/src/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_area.png new file mode 100644 index 0000000000000000000000000000000000000000..2b81600365f454a81ef62581a8419862b868bc36 GIT binary patch literal 1017 zcmVl}Pqrn!~xx?QXZb>%O{yh=$I)dCmL4m)pi2-+S%z zupi6-`^0om9aIO^L3Pk<8kMDaT=MXw1~Ff1`c{Ez|DcB96c2K|3ScPS=zn~kWYf1IWI zMpq!pNjaCJ_6RF}kwKkzUWafXEaYS{vMeXHyb0tLe^2mXNOA&oL^K!Xxn!uNeCN9K?iQN-R&3 zKTWHk9-@;(LNYRL33&f2;6@)%Lg2#*8F)zIqurVVB^^)yw>Va!!V2>vkQjf0A-U43 zCTvEaq^%*YJr-IwpQnMKWGO;k42yA}B+V9?Si_=>|A7U5-y?3DQ z!^ZUF?PCjk_1kH7+ZQ*v88BJGFccj5=XsZm7vY$>G_dELQ5w3;hE++}3QJi+K8$Gv zbgZ(7qAW(FC}as;3>M5tN&8+Ea=h9dURv;;0X<;H>Y&p^dS4$eXm=M37Pvv#0QN@vxJKiBy zd>7@VhNqumcrhk!siU>!9L&V#RwaZ~S5kOVIT-?#3@N>}ALgWP8bfQ(1dE5~5}SfH zRvL#fGW4Z%(g#^E#W$G>XmpdNQ2muEX8F;De32BXjo~aq4#|hdkj-rg;!(AR9Ljei zocK%rEKLV_esG4BCKq|~wO!45HybERZ>88_Z6~d6i52aIjNuJrd6Nn0uixmPI;ak+ ngX*9YzDle+3u-usHoLSxYkF00000NkvXXu0mjfKnTZ7 literal 0 HcmV?d00001 diff --git a/src/com/fr/solution/plugin/chart/echarts/pie/images/pie_type2.png b/src/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_none.png similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/pie/images/pie_type2.png rename to src/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_none.png diff --git a/src/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_radius.png b/src/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_radius.png new file mode 100644 index 0000000000000000000000000000000000000000..a3a95a3c31e68c388e656d877924e9009c29bc6c GIT binary patch literal 1139 zcmV-(1dRKMP)us8h#>4Y>zw31 z%uMdi{Px^)&i~vQL@9;$!7T8emlb+xtdaL5}_UP5j@ zh?31F9&a&*B6X@p4^P|xT^XZlbeR8XM)hH%OVp&Hd;#_II>}2&GDgD_pgg?}@^HJL z&)ly8J$9P`_p?hkex2=upc?T-v}i}pLAm1Tc`V|TGpr_o`fo32fj>5iud!Ss_amAAk!(~SR?>Y)YizCoGckllsr-T^rLkOvn%ee%t@QPzd!-YgM{Azgb*$;9ZeqS2+Q4S01e$VAxwX$I?UhFW*^ifav?T40*@ zx11^?S%v=QYDY?t>%nqwHk2FzH*tNDE>M)@YeT=N&g(JGH5YMqGQHcDYf#>%J?(iS?f?F6BxT6eu&j2zX4$qpFZ$8)B7E+%I;YAT>2yFE z%eZ$k#!E_Byf@8@9fm%(e1H7*xM#WZ<}rKpfF0&Voj#jOULyYfT;{)_hh*BAPEeHU ztNoy;|1&wK`f7GtVSY)!NC>L4VL1KMsDwA`)drsxPF34AS%Xfu4YlPJD8%=46%8(x zZnIo5_LHIt?Uqzp)IBC!h5`z(*>MYG;JpmW initDemoList() { - List demoList = new ArrayList(); - String[] iconPaths = getTypeIconPath(); - ChartImagePane pane = new ChartImagePane(iconPaths[0], "Regular"); - pane.isPressing = true; - demoList.add(pane); - demoList.add(new ChartImagePane(iconPaths[1], "Circle")); - return demoList; + public Plot getSelectedClonedPlot() { + EChartsPiePlot newPlot = null; + Chart[] pieChart = EChartsPie.charts; + for(int i = 0, len = pieChart.length; i < len; i++){ + if(typeDemo.get(i).isPressing){ + newPlot = (EChartsPiePlot)pieChart[i].getPlot(); + } + } + + Plot cloned = null; + try { + cloned = (Plot)newPlot.clone(); + } catch (CloneNotSupportedException e) { + FRLogger.getLogger().error("Error In ColumnChart"); + } + return cloned; + } + + @Override + public String[] getIconsOfTypes() { + return new String[]{ + "/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_none.png", + "/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_area.png", + "/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_radius.png", + }; } @Override - protected String[] getTypeIconPath() { + public String[] getNamesOfTypes() { return new String[]{ - "/com/fr/solution/plugin/chart/echarts/pie/images/pie_type1.png", - "/com/fr/solution/plugin/chart/echarts/pie/images/pie_type2.png" + "Normal", + "Area", + "Redius" }; } } \ No newline at end of file