-
-
Notifications
You must be signed in to change notification settings - Fork 6k
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.
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
Chartdata collection refactor #3024
Merged
jjatie
merged 29 commits into
ChartsOrg:4.0.0
from
jjatie:chartdata-collection-refactor
Jan 26, 2018
Merged
Changes from all commits
Commits
Show all changes
29 commits
Select commit
Hold shift + click to select a range
6e80eb0
Added Collection conformances
jjatie d36d11b
[#3018]
jjatie 36ca566
Fixed required initializers
jjatie cb32b08
ChartData adopts ExressibleByArrayLiteral
jjatie ad0d148
Merge remote-tracking branch 'origin/chartdata-collection-conformance…
jjatie fcd9fa2
Modified demos
jjatie 716f182
Pulled latest 4.0.0 and code style fixes
jjatie ca5afad
Updates for PR
jjatie 0d41175
Pulled latest base
jjatie 8976b95
PR review fixes
jjatie f28d3d5
Removed unnecessary `get` from subscripts.
jjatie 793e437
Merge remote-tracking branch 'origin/chartdata-collection-conformance…
jjatie 583dab6
Disabled `remove(at:)` for CombinedChartView
jjatie 0cce64d
Merge remote-tracking branch 'origin/chartdata-collection-conformance…
jjatie 47b6a1c
Removed redundant methods
jjatie c0b7d65
Relocated `appendEntry(_:todataSet:)`
jjatie 1d1e380
Merge remote-tracking branch 'origin/chartdata-collection-conformance…
jjatie a71f87c
Removed methods from CombinedChartData
jjatie efc5a72
Merge remote-tracking branch 'origin/chartdata-collection-conformance…
jjatie bfb750b
Merge branch '4.0.0' into chartdata-collection-refactor
jjatie 6adde98
Merge branch '4.0.0' into chartdata-collection-refactor
jjatie ae8279a
Merge branch '4.0.0' into chartdata-collection-refactor
jjatie 6de1114
Merge branch '4.0.0' into chartdata-collection-refactor
jjatie 37b29ad
Merge branch '4.0.0' of https://github.com/danielgindi/Charts into ch…
jjatie 329e00c
Fixed merge conflicts
jjatie 2572f04
Merge remote-tracking branch 'upstream/4.0.0' into chartdata-collecti…
jjatie 31a76eb
Fixed merge conflicts
jjatie b7e6f93
updated demos
jjatie eb8e031
Updated macOS demos
jjatie File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -104,7 +104,7 @@ class BubbleChartViewController: DemoBaseViewController { | |
set3.setColor(ChartColorTemplates.colorful()[2], alpha: 0.5) | ||
set3.drawValuesEnabled = true | ||
|
||
let data = BubbleChartData(dataSets: [set1, set2, set3]) | ||
let data = [set1, set2, set3] as BubbleChartData | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. may I know which protocol method enables this convenient conversion? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
data.setDrawValues(false) | ||
data.setValueFont(UIFont(name: "HelveticaNeue-Light", size: 7)!) | ||
data.setHighlightCircleWidth(1.5) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I had a feeling that
for set in data
is less natural thanfor set in data.dataSets
, what you think? Maybe need time to adapt?So in the future, we will deprecate
data.dataSet
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's just new to you. We need to continue to support
data.dataSet
as long as we keep Obj-C compatibility.