From 3ea7e6e79b5eaab4ebb59b56a1a61609f27a31c0 Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Wed, 20 May 2020 20:04:58 +0800
Subject: [PATCH] =?UTF-8?q?CHART-13988=20=E6=95=A3=E7=82=B9=E5=9B=BE?=
 =?UTF-8?q?=E5=A4=A7=E6=95=B0=E6=8D=AE=E6=A8=A1=E5=BC=8F=E4=B8=8B=E6=A0=87?=
 =?UTF-8?q?=E8=AE=B0=E7=82=B9=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scatter/VanChartScatterConditionPane.java |  4 +--
 ...tScatterLargeModelMarkerConditionPane.java | 29 +++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 designer-chart/src/main/java/com/fr/van/chart/scatter/large/VanChartScatterLargeModelMarkerConditionPane.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 ce91afe7e7..c1e7886c9c 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
@@ -23,7 +23,7 @@ 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;
+import com.fr.van.chart.scatter.large.VanChartScatterLargeModelMarkerConditionPane;
 
 import java.awt.Dimension;
 
@@ -53,7 +53,7 @@ public class VanChartScatterConditionPane extends DataSeriesConditionPane {
         classPaneMap.put(VanChartAttrTrendLine.class, new VanChartTrendLineConditionPane(this));
         classPaneMap.put(AttrAlpha.class, new LabelAlphaPane(this));
         if(PlotFactory.largeDataModel(plot)){
-            classPaneMap.put(VanChartAttrMarker.class, new VanChartLargeModelMarkerConditionPane(this));
+            classPaneMap.put(VanChartAttrMarker.class, new VanChartScatterLargeModelMarkerConditionPane(this));
         } else {
             classPaneMap.put(VanChartAttrLine.class, new VanChartScatterLineTypeConditionPane(this));
             classPaneMap.put(VanChartAttrMarker.class, new VanChartScatterMarkerConditionPane(this));
diff --git a/designer-chart/src/main/java/com/fr/van/chart/scatter/large/VanChartScatterLargeModelMarkerConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/scatter/large/VanChartScatterLargeModelMarkerConditionPane.java
new file mode 100644
index 0000000000..32dc88be14
--- /dev/null
+++ b/designer-chart/src/main/java/com/fr/van/chart/scatter/large/VanChartScatterLargeModelMarkerConditionPane.java
@@ -0,0 +1,29 @@
+package com.fr.van.chart.scatter.large;
+
+import com.fr.chart.chartglyph.Marker;
+import com.fr.design.condition.ConditionAttributesPane;
+import com.fr.plugin.chart.marker.type.MarkerType;
+import com.fr.van.chart.designer.component.marker.VanChartCommonMarkerPane;
+import com.fr.van.chart.designer.other.condition.item.VanChartMarkerConditionPane;
+
+public class VanChartScatterLargeModelMarkerConditionPane extends VanChartMarkerConditionPane {
+
+    public VanChartScatterLargeModelMarkerConditionPane(ConditionAttributesPane conditionAttributesPane) {
+        super(conditionAttributesPane);
+    }
+
+    protected void initMarkerPane() {
+
+        markerPane = new VanChartLargeModelMarkerPane() {
+            protected VanChartCommonMarkerPane createCommonMarkerPane() {
+
+                return new VanChartCommonMarkerPane() {
+                    protected Marker[] getMarkers() {
+                        return getNormalMarkersWithCustom(new MarkerType[]{MarkerType.MARKER_AUTO});
+                    }
+                };
+            }
+
+        };
+    }
+}