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

Swift 3.0 - Xcode 8 Beta 4 #1290

Merged
merged 1 commit into from
Aug 5, 2016
Merged

Swift 3.0 - Xcode 8 Beta 4 #1290

merged 1 commit into from
Aug 5, 2016

Conversation

acegreen
Copy link

@acegreen acegreen commented Aug 4, 2016

Conforms To Xcode 8 Beta 4

@acegreen acegreen mentioned this pull request Aug 4, 2016
Closed
@acegreen acegreen changed the title Swift 3.0 Swift 3.0 - Xcode 8 Beta 4 Aug 4, 2016
@acegreen
Copy link
Author

acegreen commented Aug 4, 2016 •
edited
Loading

@liuxuan30 whoever reviews this should take a closer look because beta 4 complained about complex calculations, so I had to break it down. That could be a cause of miscalculation

For example:

let tempPOW = pow(2.0, -10.0 * position)
let tempSIN = sin((position * duration - s) * (2.0 * M_PI) / p) 
return CGFloat( tempPOW * tempSIN * 0.5 + 1.0 )

liuxuan30
liuxuan30 reviewed Aug 5, 2016
View reviewed changes
Charts/Classes/Renderers/BarChartRenderer.swift
@@ -557,7 +557,10 @@ public class BarChartRenderer: ChartDataRendererBase
context.saveGState()

let pixelToValueMatrix = trans.pixelToValueMatrix
let xToYRel = abs(sqrt(pixelToValueMatrix.b * pixelToValueMatrix.b + pixelToValueMatrix.d * pixelToValueMatrix.d) / sqrt(pixelToValueMatrix.a * pixelToValueMatrix.a + pixelToValueMatrix.c * pixelToValueMatrix.c))
let sqrtAC = sqrt(pixelToValueMatrix.a * pixelToValueMatrix.a + pixelToValueMatrix.c * pixelToValueMatrix.c)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indent issue

@liuxuan30
Copy link
Member

in BarChartRenderer.swift, the indent is not correct. Others seem good to go. Please fix the indent then I will merge.
If you are willing to practice squash skill with SourceTree, this is the best time. Or you can make another commit, it's fine.

@liuxuan30 liuxuan30 mentioned this pull request Aug 5, 2016
Closed
@liuxuan30
Copy link
Member

liuxuan30 commented Aug 5, 2016 •
edited
Loading

merging, I will take care of the indent

@liuxuan30 liuxuan30 merged commit c9ac170 into ChartsOrg:Swift-3.0 Aug 5, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@acegreen @liuxuan30