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.

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

for #3146. add a warning message if pie chart has more than one data set #3286

Merged
merged 1 commit into from
Mar 20, 2018
Merged
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions Source/Charts/Data/Implementations/Standard/PieChartData.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,20 @@ open class PieChartData: ChartData
super.init(dataSets: dataSets)
}

/// - returns: All DataSet objects this ChartData object holds.
@objc open override var dataSets: [IChartDataSet]
{
get
{
assert(super.dataSets.count <= 1, "Found multiple data sets while pie chart only allows one")
return super.dataSets
}
set
{
super.dataSets = newValue
Copy link
Collaborator

Choose a reason for hiding this comment

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

Add a warning for the setter too so you can't add more than 1 set. Make it an assert instead of a print

Copy link
Member Author

Choose a reason for hiding this comment

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

I think it's too strict to add an assert.

Copy link
Collaborator

Choose a reason for hiding this comment

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

But you break the Chart if you try to do that. We need to assert here to make it clear that this isn't allowed.

Copy link
Collaborator

Choose a reason for hiding this comment

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

In fact we only need an assert on the setter, and nothing on the getter.

Copy link
Collaborator

@jjatie jjatie Mar 15, 2018

Choose a reason for hiding this comment

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

Another way at looking at it is: This is not a suggestion, it is a requirement. Really, PieChartData shouldn't contain an array, but for now it does. Their app won't work properly if they are trying to set multiple datasets in the PieChartData and we need to make it as clear as possible that this is the case. (There used to be fatalError() about this in some for loops. The only reason they are gone is because I came up with an alternative for at least most of those situations)

Copy link
Member Author

Choose a reason for hiding this comment

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

Updated

}
}

@objc var dataSet: IPieChartDataSet?
{
get
Expand Down