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

Fix chart only drawing first entry #4829

Merged
merged 3 commits into from
Aug 29, 2022
Merged

Fix chart only drawing first entry #4829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4a0c6d
missing Package.resolved change
FelixHerrmann May 26, 2022
d768a74
return last index for every rounding
FelixHerrmann May 26, 2022
2095115
used index APIs instead of raw integers
FelixHerrmann May 26, 2022
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
8 changes: 4 additions & 4 deletions Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
"repositoryURL": "https://github.com/apple/swift-algorithms",
"state": {
"branch": null,
"revision": "bb3bafeca0e164ece3403a9de646b7d38c07dd49",
"version": "0.0.2"
"revision": "b14b7f4c528c942f121c8b860b9410b2bf57825e",
"version": "1.0.0"
}
},
{
"package": "swift-numerics",
"repositoryURL": "https://github.com/apple/swift-numerics",
"state": {
"branch": null,
"revision": "6b24333510e9044cf4716a07bed65eeed6bc6393",
"version": "0.0.8"
"revision": "0a5bc04095a675662cf24757cc0640aa2204253b",
"version": "1.0.2"
}
}
]
Expand Down
11 changes: 7 additions & 4 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 @@ -217,7 +217,7 @@ open class ChartDataSet: ChartBaseDataSet
rounding: ChartDataSetRounding) -> Int
{
var closest = partitioningIndex { $0.x >= xValue }
guard closest < endIndex else { return rounding == .closest ? (endIndex-1) : -1 }
guard closest < endIndex else { return index(before: endIndex) }
FelixHerrmann marked this conversation as resolved.
Show resolved Hide resolved

var closestXValue = self[closest].x

Expand All @@ -240,10 +240,13 @@ open class ChartDataSet: ChartBaseDataSet
// The closest value in the beginning of this function
// `var closest = partitioningIndex { $0.x >= xValue }`
// doesn't guarantee closest rounding method
if closest > 0 {
if closest > startIndex {
let distanceAfter = abs(self[closest].x - xValue)
let distanceBefore = abs(self[closest-1].x - xValue)
distanceBefore < distanceAfter ? closest -= 1 : ()
let distanceBefore = abs(self[index(before: closest)].x - xValue)
if distanceBefore < distanceAfter
{
closest = index(before: closest)
}
closestXValue = self[closest].x
}
}
Expand Down