From fd07ca6ae0fc345ca11a0e23bce28458ee45bf2d Mon Sep 17 00:00:00 2001 From: xiaohu Date: Fri, 1 Apr 2016 15:52:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E5=A4=A7=E6=95=B0=E6=8D=AE=E6=8F=90?= =?UTF-8?q?=E4=BE=9B=E5=88=9B=E5=BB=BA=E6=9D=A1=E4=BB=B6=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/ChartTypeInterfaceManager.java | 5 +++++ .../fr/design/chart/fun/IndependentChartUIProvider.java | 8 ++++++++ .../fun/impl/AbstractIndependentChartUIWithAPILevel.java | 5 +++++ 3 files changed, 18 insertions(+) diff --git a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java index a4947058d3..4f93db43c7 100644 --- a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java @@ -159,6 +159,11 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh return chartTypeInterfaces.get(plot.getPlotID()).getPlotConditionPane(plot); } + //大数据需要通过chart判断 + public ConditionAttributesPane getPlotConditionPane(Chart chart) { + return chartTypeInterfaces.get(chart.getPlot().getPlotID()).getPlotConditionPane(chart); + } + public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot) { return chartTypeInterfaces.get(plot.getPlotID()).getPlotSeriesPane(parent, plot); } diff --git a/designer_chart/src/com/fr/design/chart/fun/IndependentChartUIProvider.java b/designer_chart/src/com/fr/design/chart/fun/IndependentChartUIProvider.java index 7afcaa71fe..6ef877aaf0 100644 --- a/designer_chart/src/com/fr/design/chart/fun/IndependentChartUIProvider.java +++ b/designer_chart/src/com/fr/design/chart/fun/IndependentChartUIProvider.java @@ -1,5 +1,6 @@ package com.fr.design.chart.fun; +import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; import com.fr.design.condition.ConditionAttributesPane; @@ -53,6 +54,13 @@ public interface IndependentChartUIProvider extends Level { */ ConditionAttributesPane getPlotConditionPane(Plot plot); + /** + * 条件属性界面 + * + * @return 条件属性界面 + */ + ConditionAttributesPane getPlotConditionPane(Chart chart); + /** * 系列界面 * diff --git a/designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java b/designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java index e0e5e8f7d2..1ec8a31384 100644 --- a/designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java +++ b/designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java @@ -1,5 +1,6 @@ package com.fr.design.chart.fun.impl; +import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; import com.fr.design.chart.fun.IndependentChartUIProvider; @@ -46,4 +47,8 @@ public abstract class AbstractIndependentChartUIWithAPILevel implements Independ public ConditionAttributesPane getPlotConditionPane(Plot plot){ return new DataSeriesConditionPane(); } + + public ConditionAttributesPane getPlotConditionPane(Chart chart){ + return null; + } }