diff --git a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java index 4f93db43c..a4947058d 100644 --- a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java @@ -159,11 +159,6 @@ 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 6ef877aaf..f41fc479d 100644 --- a/designer_chart/src/com/fr/design/chart/fun/IndependentChartUIProvider.java +++ b/designer_chart/src/com/fr/design/chart/fun/IndependentChartUIProvider.java @@ -54,13 +54,6 @@ 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 1ec8a3138..067043376 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 @@ -47,8 +47,4 @@ public abstract class AbstractIndependentChartUIWithAPILevel implements Independ public ConditionAttributesPane getPlotConditionPane(Plot plot){ return new DataSeriesConditionPane(); } - - public ConditionAttributesPane getPlotConditionPane(Chart chart){ - return null; - } } diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java index cde926db1..fe2107fb4 100644 --- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java +++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java @@ -54,7 +54,7 @@ public class DataSeriesConditionPane extends ConditionAttributesPane