From 3fa3b0450a04c3d609d66966b5f9523e500f50a8 Mon Sep 17 00:00:00 2001
From: fr_shine <zheng@finereport.com>
Date: Wed, 9 Nov 2016 19:30:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BC=8F=E6=96=97=E5=9B=BE=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/chart/ChartPlotFactory.java |  2 +-
 .../dlp/FunnelDataLabelPane.java              | 13 +++++++++
 .../FunnelPlotDataSeriesConditionPane.java    | 28 +++++++++++++++++++
 .../FunnelIndependentChartInterface.java      |  6 ++++
 4 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 designer_chart/src/com/fr/design/chart/series/SeriesCondition/dlp/FunnelDataLabelPane.java
 create mode 100644 designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/FunnelPlotDataSeriesConditionPane.java

diff --git a/designer_chart/src/com/fr/design/chart/ChartPlotFactory.java b/designer_chart/src/com/fr/design/chart/ChartPlotFactory.java
index 48e018a598..aeb780add1 100644
--- a/designer_chart/src/com/fr/design/chart/ChartPlotFactory.java
+++ b/designer_chart/src/com/fr/design/chart/ChartPlotFactory.java
@@ -72,7 +72,7 @@ public class ChartPlotFactory {
                 .setAxisPaneCls(XYChartStyleAxisPane.class)
                 .setDataLabelPaneClass(XYDataLabelPane.class));
         map.put(FunnelPlot.class.getName(), new FactoryObject()
-                .setDataLabelPaneClass(PieDataLabelPane.class));
+                .setDataLabelPaneClass(FunnelDataLabelPane.class));
     }
 
     private ChartPlotFactory() {
diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/dlp/FunnelDataLabelPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/dlp/FunnelDataLabelPane.java
new file mode 100644
index 0000000000..14b0c18ad2
--- /dev/null
+++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/dlp/FunnelDataLabelPane.java
@@ -0,0 +1,13 @@
+package com.fr.design.chart.series.SeriesCondition.dlp;
+
+import java.awt.*;
+
+/**
+ * Created by Mitisky on 16/11/9.
+ */
+public class FunnelDataLabelPane extends DataLabelPane {
+    @Override
+    protected Component[] createComponents4ShowCategoryName() {
+        return new Component[0];
+    }
+}
diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/FunnelPlotDataSeriesConditionPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/FunnelPlotDataSeriesConditionPane.java
new file mode 100644
index 0000000000..99469ff3cf
--- /dev/null
+++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/FunnelPlotDataSeriesConditionPane.java
@@ -0,0 +1,28 @@
+package com.fr.design.chart.series.SeriesCondition.impl;
+
+import com.fr.chart.chartattr.FunnelPlot;
+import com.fr.chart.chartattr.Plot;
+import com.fr.design.chart.series.SeriesCondition.ChartConditionPane;
+import com.fr.design.chart.series.SeriesCondition.DataSeriesConditionPane;
+import com.fr.design.chart.series.SeriesCondition.PiePlotChartConditionPane;
+
+/**
+ * Created by Mitisky on 16/11/9.
+ */
+public class FunnelPlotDataSeriesConditionPane extends DataSeriesConditionPane {
+
+    @Override
+    protected ChartConditionPane createListConditionPane() {
+        return new PiePlotChartConditionPane();
+    }
+
+    /**
+     * 返回class对象
+     * @return class对象
+     */
+    @Override
+    public Class<? extends Plot> class4Correspond() {
+        return FunnelPlot.class;
+    }
+
+}
diff --git a/designer_chart/src/com/fr/design/chartinterface/FunnelIndependentChartInterface.java b/designer_chart/src/com/fr/design/chartinterface/FunnelIndependentChartInterface.java
index 43c71b46c2..00891e628c 100644
--- a/designer_chart/src/com/fr/design/chartinterface/FunnelIndependentChartInterface.java
+++ b/designer_chart/src/com/fr/design/chartinterface/FunnelIndependentChartInterface.java
@@ -3,6 +3,8 @@ package com.fr.design.chartinterface;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel;
+import com.fr.design.chart.series.SeriesCondition.impl.FunnelPlotDataSeriesConditionPane;
+import com.fr.design.condition.ConditionAttributesPane;
 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;
@@ -34,6 +36,10 @@ public class FunnelIndependentChartInterface extends AbstractIndependentChartUIW
         return new FunnelSeriesPane(parent, plot);
     }
 
+    public ConditionAttributesPane getPlotConditionPane(Plot plot){
+        return new FunnelPlotDataSeriesConditionPane();
+    }
+
     /**
      *图标路径
      * @return 图标路径