From 852a6e24e7c38af869268990131d78ee4d9b8e93 Mon Sep 17 00:00:00 2001 From: Greg Bernstein Date: Thu, 23 Mar 2023 10:15:19 -0700 Subject: [PATCH 1/4] better --- Source/Charts/Renderers/LineChartRenderer.swift | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Charts/Renderers/LineChartRenderer.swift b/Source/Charts/Renderers/LineChartRenderer.swift index ec622967ee..2780c1ed14 100644 --- a/Source/Charts/Renderers/LineChartRenderer.swift +++ b/Source/Charts/Renderers/LineChartRenderer.swift @@ -409,9 +409,12 @@ open class LineChartRenderer: LineRadarRenderer y: CGFloat(e1.y * phaseY)) .applying(valueToPixelMatrix) + if firstPoint || (dataSet.drawCirclesEnabled) { + path.move(to: startPoint) + } + if firstPoint { - path.move(to: startPoint) firstPoint = false } else From d2901b8ecc0ff075cc0eae33222443ded1f4b9f6 Mon Sep 17 00:00:00 2001 From: Greg Bernstein Date: Thu, 23 Mar 2023 11:11:40 -0700 Subject: [PATCH 2/4] exclude stepping (always 90) --- Source/Charts/Renderers/LineChartRenderer.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Charts/Renderers/LineChartRenderer.swift b/Source/Charts/Renderers/LineChartRenderer.swift index 2780c1ed14..c3bd8620ea 100644 --- a/Source/Charts/Renderers/LineChartRenderer.swift +++ b/Source/Charts/Renderers/LineChartRenderer.swift @@ -409,7 +409,7 @@ open class LineChartRenderer: LineRadarRenderer y: CGFloat(e1.y * phaseY)) .applying(valueToPixelMatrix) - if firstPoint || (dataSet.drawCirclesEnabled) { + if firstPoint || (dataSet.drawCirclesEnabled && !isDrawSteppedEnabled) { path.move(to: startPoint) } From aecb0cb59bbf42d6d5308fb417a31ad68b8a6be8 Mon Sep 17 00:00:00 2001 From: Greg Bernstein Date: Thu, 23 Mar 2023 11:19:30 -0700 Subject: [PATCH 3/4] shared variable # Conflicts: # Source/Charts/Renderers/LineChartRenderer.swift --- Source/Charts/Renderers/LineChartRenderer.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Charts/Renderers/LineChartRenderer.swift b/Source/Charts/Renderers/LineChartRenderer.swift index c3bd8620ea..33a2ef2102 100644 --- a/Source/Charts/Renderers/LineChartRenderer.swift +++ b/Source/Charts/Renderers/LineChartRenderer.swift @@ -396,6 +396,8 @@ open class LineChartRenderer: LineRadarRenderer } var firstPoint = true + + let disjointSegmentsAllowed = dataSet.drawCirclesEnabled && !isDrawSteppedEnabled let path = CGMutablePath() for x in stride(from: _xBounds.min, through: _xBounds.range + _xBounds.min, by: 1) @@ -409,7 +411,7 @@ open class LineChartRenderer: LineRadarRenderer y: CGFloat(e1.y * phaseY)) .applying(valueToPixelMatrix) - if firstPoint || (dataSet.drawCirclesEnabled && !isDrawSteppedEnabled) { + if firstPoint || disjointSegmentsAllowed { path.move(to: startPoint) } From 14868095e84dfa77ce41f41d2357eb98f2683540 Mon Sep 17 00:00:00 2001 From: Greg Bernstein Date: Thu, 23 Mar 2023 11:22:44 -0700 Subject: [PATCH 4/4] name --- Source/Charts/Renderers/LineChartRenderer.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Charts/Renderers/LineChartRenderer.swift b/Source/Charts/Renderers/LineChartRenderer.swift index 33a2ef2102..05942226db 100644 --- a/Source/Charts/Renderers/LineChartRenderer.swift +++ b/Source/Charts/Renderers/LineChartRenderer.swift @@ -397,7 +397,7 @@ open class LineChartRenderer: LineRadarRenderer var firstPoint = true - let disjointSegmentsAllowed = dataSet.drawCirclesEnabled && !isDrawSteppedEnabled + let shouldDisconnectSegments = dataSet.drawCirclesEnabled && !isDrawSteppedEnabled let path = CGMutablePath() for x in stride(from: _xBounds.min, through: _xBounds.range + _xBounds.min, by: 1) @@ -411,7 +411,7 @@ open class LineChartRenderer: LineRadarRenderer y: CGFloat(e1.y * phaseY)) .applying(valueToPixelMatrix) - if firstPoint || disjointSegmentsAllowed { + if firstPoint || shouldDisconnectSegments { path.move(to: startPoint) }