From a1356e0d84558986eb690120c807f44b7405b45f Mon Sep 17 00:00:00 2001
From: monitor1394 <monitor1394@gmail.com>
Date: Tue, 1 Oct 2019 09:36:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0SmoothDash=E5=B9=B3=E6=BB=91?=
 =?UTF-8?q?=E8=99=9A=E7=BA=BF=E7=9A=84=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Scripts/UI/Component/Serie.cs                 |  7 +++-
 .../UI/Internal/CoordinateChart_DrawLine.cs   | 40 +++++++++++++++++--
 Scripts/UI/Utility/ChartHelper.cs             |  3 +-
 3 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/Scripts/UI/Component/Serie.cs b/Scripts/UI/Component/Serie.cs
index 6110dc20..c5501839 100644
--- a/Scripts/UI/Component/Serie.cs
+++ b/Scripts/UI/Component/Serie.cs
@@ -73,11 +73,16 @@ namespace XCharts
         /// </summary>
         Normal,
         /// <summary>
-        /// the normal line chart，
+        /// the smooth line chart，
         /// 平滑曲线。
         /// </summary>
         Smooth,
         /// <summary>
+        /// the smooth-dash line chart，
+        /// 平滑虚线。
+        /// </summary>
+        SmoothDash,
+        /// <summary>
         /// step line.
         /// 阶梯线图：当前点。
         /// </summary>
diff --git a/Scripts/UI/Internal/CoordinateChart_DrawLine.cs b/Scripts/UI/Internal/CoordinateChart_DrawLine.cs
index a373d6f9..9bd4d10d 100644
--- a/Scripts/UI/Internal/CoordinateChart_DrawLine.cs
+++ b/Scripts/UI/Internal/CoordinateChart_DrawLine.cs
@@ -1,5 +1,4 @@
 
-
 using System;
 using System.Collections.Generic;
 using UnityEngine;
@@ -131,6 +130,29 @@ namespace XCharts
             float currDetailProgress = lp.x;
             float totalDetailProgress = serie.dataPoints[dataCount - 1].x;
             serie.animation.InitProgress(dataCount, currDetailProgress, totalDetailProgress);
+
+            Vector3 firstLastPos = Vector3.zero, lastNextPos = Vector3.zero;
+            if (serie.minShow > 0 && serie.minShow < showData.Count)
+            {
+                i = serie.minShow - 1;
+                float yValue = showData[i].data[1];
+                GetDataPoint(xAxis, yAxis, showData, yValue, startX, i, scaleWid, 0, ref firstLastPos);
+            }
+            else
+            {
+                firstLastPos = lp;
+            }
+            if (serie.maxShow > 0 && serie.maxShow < showData.Count)
+            {
+                i = serie.maxShow;
+                float yValue = showData[i].data[1];
+                GetDataPoint(xAxis, yAxis, showData, yValue, startX, i, scaleWid, 0, ref lastNextPos);
+            }
+            else
+            {
+                lastNextPos = serie.dataPoints[serie.dataPoints.Count - 1];
+            }
+
             for (i = 1; i < serie.dataPoints.Count; i++)
             {
                 np = serie.dataPoints[i];
@@ -145,8 +167,9 @@ namespace XCharts
                             areaColor, areaToColor, zeroPos);
                         break;
                     case LineType.Smooth:
-                        llp = i > 1 ? serie.dataPoints[i - 2] : lp;
-                        nnp = i < serie.dataPoints.Count - 1 ? serie.dataPoints[i + 1] : np;
+                    case LineType.SmoothDash:
+                        llp = i > 1 ? serie.dataPoints[i - 2] : firstLastPos;
+                        nnp = i < serie.dataPoints.Count - 1 ? serie.dataPoints[i + 1] : lastNextPos;
                         isFinish = DrawSmoothLine(vh, serieIndex, serie, xAxis, lp, np, llp, nnp, i,
                             lineColor, areaColor, areaToColor, isStack, zeroPos);
                         break;
@@ -401,6 +424,7 @@ namespace XCharts
                             areaColor, areaToColor, zeroPos);
                         break;
                     case LineType.Smooth:
+                    case LineType.SmoothDash:
                         llp = i > 1 ? serie.dataPoints[i - 2] : lp;
                         nnp = i < serie.dataPoints.Count - 1 ? serie.dataPoints[i + 1] : np;
                         isFinish = DrawSmoothLine(vh, serieIndex, serie, yAxis, lp, np, llp, nnp, i,
@@ -844,6 +868,16 @@ namespace XCharts
             else ChartHelper.GetBezierList(ref bezierPoints, vh, lp, np, llp, nnp, fine, lineSmoothStyle);
 
             Vector3 start, to;
+            if (serie.lineType == LineType.SmoothDash)
+            {
+                for (int i = 0; i < bezierPoints.Count - 2; i += 2)
+                {
+                    start = bezierPoints[i];
+                    to = bezierPoints[i + 1];
+                    ChartHelper.DrawLine(vh, start, to, lineWidth, lineColor);
+                }
+                return true;
+            }
             start = bezierPoints[0];
 
             var dir = bezierPoints[1] - start;
diff --git a/Scripts/UI/Utility/ChartHelper.cs b/Scripts/UI/Utility/ChartHelper.cs
index 2bbaef34..d74c052e 100644
--- a/Scripts/UI/Utility/ChartHelper.cs
+++ b/Scripts/UI/Utility/ChartHelper.cs
@@ -522,7 +522,8 @@ namespace XCharts
             }
             if (nep == ep) cp2 = ep;
             else cp2 = ep - (nep - sp).normalized * diff;
-            int segment = (int)(dist / (fine ? 3f : 7f));
+            dist = Vector3.Distance(sp, ep);
+            int segment = (int)(dist / (fine ? 2f : 6f));
             if (segment < 1) segment = (int)(dist / 0.5f);
             if (segment < 4) segment = 4;
             GetBezierList2(ref posList, sp, ep, segment, cp1, cp2);