Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Xcode 14 and Swift 5.7 compiler error #4874

Closed
wants to merge 1 commit into from
Closed

Fix Xcode 14 and Swift 5.7 compiler error #4874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Source/Charts/Animation/ChartAnimationEasing.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ internal struct EasingFunctions
let s: TimeInterval = 1.70158
var position: TimeInterval = elapsed / duration
position -= 1.0
return Double( position * position * ((s + 1.0) * position + s) + 1.0 )
return position * position * ((s + 1.0) * position + s) + 1.0
}

internal static let EaseInOutBack = { (elapsed: TimeInterval, duration: TimeInterval) -> Double in
Expand Down
5 changes: 5 additions & 0 deletions Source/Charts/Data/Implementations/Standard/ChartDataSet.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,11 @@ extension ChartDataSet: RandomAccessCollection {

// MARK: RangeReplaceableCollection
extension ChartDataSet: RangeReplaceableCollection {
public func replaceSubrange<C>(_ subrange: Swift.Range<Index>, with newElements: C) where C : Collection, Element == C.Element {
entries.replaceSubrange(subrange, with: newElements)
notifyDataSetChanged()
}

public func append(_ newElement: Element) {
calcMinMax(entry: newElement)
entries.append(newElement)
Expand Down
4 changes: 2 additions & 2 deletions Source/Charts/Renderers/CandleStickChartRenderer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ open class CandleStickChartRenderer: LineScatterCandleRadarRenderer
accessibleChartElements.append(element)
}

for case let set as CandleChartDataSetProtocol in candleData where set.isVisible
for case let dataSet as CandleChartDataSetProtocol in (candleData as ChartData) where dataSet.isVisible
{
drawDataSet(context: context, dataSet: set)
drawDataSet(context: context, dataSet: dataSet)
}
}

Expand Down
6 changes: 3 additions & 3 deletions Source/Charts/Renderers/PieChartRenderer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ open class PieChartRenderer: NSObject, DataRenderer
// If we redraw the data, remove and repopulate accessible elements to update label values and frames
accessibleChartElements.removeAll()

for case let set as PieChartDataSetProtocol in pieData where
set.isVisible && set.entryCount > 0
for case let dataSet as PieChartDataSetProtocol in pieData where
dataSet.isVisible && dataSet.entryCount > 0
{
drawDataSet(context: context, dataSet: set)
drawDataSet(context: context, dataSet: dataSet)
}
}

Expand Down
4 changes: 2 additions & 2 deletions Source/Charts/Renderers/RadarChartRenderer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ open class RadarChartRenderer: LineRadarRenderer
withDefaultDescription: "Radar Chart")
self.accessibleChartElements.append(element)

for case let set as RadarChartDataSetProtocol in radarData where set.isVisible
for case let dataSet as RadarChartDataSetProtocol in (radarData as ChartData) where dataSet.isVisible
{
drawDataSet(context: context, dataSet: set, mostEntries: mostEntries)
drawDataSet(context: context, dataSet: dataSet, mostEntries: mostEntries)
}
}

Expand Down
6 changes: 3 additions & 3 deletions Source/Charts/Utils/ChartUtils.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ extension CGPoint
extension CGContext
{

open func drawImage(_ image: NSUIImage, atCenter center: CGPoint, size: CGSize)
public func drawImage(_ image: NSUIImage, atCenter center: CGPoint, size: CGSize)
{
var drawOffset = CGPoint()
drawOffset.x = center.x - (size.width / 2)
Expand Down Expand Up @@ -157,7 +157,7 @@ extension CGContext
NSUIGraphicsPopContext()
}

open func drawText(_ text: String, at point: CGPoint, align: TextAlignment, anchor: CGPoint = CGPoint(x: 0.5, y: 0.5), angleRadians: CGFloat = 0.0, attributes: [NSAttributedString.Key : Any]?)
public func drawText(_ text: String, at point: CGPoint, align: TextAlignment, anchor: CGPoint = CGPoint(x: 0.5, y: 0.5), angleRadians: CGFloat = 0.0, attributes: [NSAttributedString.Key : Any]?)
{
let drawPoint = getDrawPoint(text: text, point: point, align: align, attributes: attributes)

Expand All @@ -175,7 +175,7 @@ extension CGContext
}
}

open func drawText(_ text: String, at point: CGPoint, anchor: CGPoint = CGPoint(x: 0.5, y: 0.5), angleRadians: CGFloat, attributes: [NSAttributedString.Key : Any]?)
public func drawText(_ text: String, at point: CGPoint, anchor: CGPoint = CGPoint(x: 0.5, y: 0.5), angleRadians: CGFloat, attributes: [NSAttributedString.Key : Any]?)
{
var drawOffset = CGPoint()

Expand Down