From b0abfb372bf6ca10ceb911e1c4ebec53f710404c Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Mon, 11 May 2020 14:08:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=A3=E7=82=B9=E5=9B=BE=E6=A0=87=E8=AE=B0?=
 =?UTF-8?q?=E7=82=B9=E6=9D=A1=E4=BB=B6=E5=B1=9E=E6=80=A7=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scatter/VanChartScatterConditionPane.java |  4 +--
 .../VanChartScatterMarkerConditionPane.java   | 27 +++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 designer-chart/src/main/java/com/fr/van/chart/scatter/component/VanChartScatterMarkerConditionPane.java

diff --git a/designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterConditionPane.java
index 10b762350d..ce91afe7e7 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterConditionPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterConditionPane.java
@@ -17,10 +17,10 @@ import com.fr.plugin.chart.scatter.attr.ScatterAttrTooltip;
 import com.fr.van.chart.bubble.VanChartBubbleConditionSelectionPane;
 import com.fr.van.chart.designer.PlotFactory;
 import com.fr.van.chart.designer.other.condition.item.VanChartEffectConditionPane;
-import com.fr.van.chart.designer.other.condition.item.VanChartMarkerConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartSeriesColorConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartTrendLineConditionPane;
 import com.fr.van.chart.scatter.component.VanChartScatterLineTypeConditionPane;
+import com.fr.van.chart.scatter.component.VanChartScatterMarkerConditionPane;
 import com.fr.van.chart.scatter.component.label.VanChartScatterLabelConditionPane;
 import com.fr.van.chart.scatter.component.tooltip.VanChartScatterTooltipConditionPane;
 import com.fr.van.chart.scatter.large.VanChartLargeModelMarkerConditionPane;
@@ -56,7 +56,7 @@ public class VanChartScatterConditionPane extends DataSeriesConditionPane {
             classPaneMap.put(VanChartAttrMarker.class, new VanChartLargeModelMarkerConditionPane(this));
         } else {
             classPaneMap.put(VanChartAttrLine.class, new VanChartScatterLineTypeConditionPane(this));
-            classPaneMap.put(VanChartAttrMarker.class, new VanChartMarkerConditionPane(this));
+            classPaneMap.put(VanChartAttrMarker.class, new VanChartScatterMarkerConditionPane(this));
             classPaneMap.put(ScatterAttrLabel.class, new VanChartScatterLabelConditionPane(this, plot));
             classPaneMap.put(AttrEffect.class, new VanChartEffectConditionPane(this, EffectHelper.getScatterPlotDefaultEffect()));
         }
diff --git a/designer-chart/src/main/java/com/fr/van/chart/scatter/component/VanChartScatterMarkerConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/scatter/component/VanChartScatterMarkerConditionPane.java
new file mode 100644
index 0000000000..4ac8543a60
--- /dev/null
+++ b/designer-chart/src/main/java/com/fr/van/chart/scatter/component/VanChartScatterMarkerConditionPane.java
@@ -0,0 +1,27 @@
+package com.fr.van.chart.scatter.component;
+
+import com.fr.chart.chartglyph.Marker;
+import com.fr.design.condition.ConditionAttributesPane;
+import com.fr.van.chart.designer.component.VanChartMarkerPane;
+import com.fr.van.chart.designer.component.marker.VanChartCommonMarkerPane;
+import com.fr.van.chart.designer.other.condition.item.VanChartMarkerConditionPane;
+
+public class VanChartScatterMarkerConditionPane extends VanChartMarkerConditionPane {
+
+    public VanChartScatterMarkerConditionPane(ConditionAttributesPane conditionAttributesPane) {
+        super(conditionAttributesPane);
+    }
+
+    protected void initMarkerPane() {
+        markerPane = new VanChartMarkerPane() {
+            protected VanChartCommonMarkerPane createCommonMarkerPane() {
+
+                return new VanChartCommonMarkerPane() {
+                    protected Marker[] getMarkers() {
+                        return getNormalMarkersWithAuto();
+                    }
+                };
+            }
+        };
+    }
+}