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

ChartRenderer's must be initialized with a chart #2982

Merged
merged 18 commits into from
Nov 27, 2017
Merged

ChartRenderer's must be initialized with a chart #2982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f32c71b
Merge pull request #1 from danielgindi/master
jjatie Sep 17, 2017
613b2ac
Merge remote-tracking branch 'upstream/master'
Sep 24, 2017
052e5c1
Merge remote-tracking branch 'upstream/master'
jjatie Nov 6, 2017
9a2157e
Merge remote-tracking branch 'upstream/master'
jjatie Nov 13, 2017
5453508
`ViewPortHandler` is now non-optional in all, if not most cases
jjatie Nov 13, 2017
e4a3da0
Removed unnecessary `init()`s from `ViewPortHandler` and related
jjatie Nov 13, 2017
032b507
`Renderer` now has a constant `ViewPortHandler`
jjatie Nov 13, 2017
de18b48
`ChartRenderer`'s must be initialized with a chart
jjatie Nov 13, 2017
dbf003c
CombinedChartRenderer gets the same treatment
jjatie Nov 20, 2017
20e411f
Merge branch 'master' into view-port-handler-nonnil
jjatie Nov 20, 2017
3a4b5fe
Merge branch 'master' into view-port-handler-nonnil
jjatie Nov 20, 2017
6374083
Merge remote-tracking branch 'upstream/master' into view-port-handler…
jjatie Nov 24, 2017
8323212
Pulled latest master
jjatie Nov 24, 2017
52531e2
Merge remote-tracking branch 'origin/view-port-handler-nonnil' into r…
jjatie Nov 24, 2017
2826a46
Pulled latest master
jjatie Nov 24, 2017
8b5f4e7
Merge remote-tracking branch 'upstream/master' into renderer-chart-no…
jjatie Nov 27, 2017
d100a6c
Removed unnecessary comment
jjatie Nov 27, 2017
e458bd9
Removed unnecessary whitespace
jjatie Nov 27, 2017
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/Renderers/BarChartRenderer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer

@objc open weak var dataProvider: BarChartDataProvider?

@objc public init(dataProvider: BarChartDataProvider?, animator: Animator, viewPortHandler: ViewPortHandler)
@objc public init(dataProvider: BarChartDataProvider, animator: Animator, viewPortHandler: ViewPortHandler)
{
super.init(animator: animator, viewPortHandler: viewPortHandler)

Expand Down
2 changes: 1 addition & 1 deletion Source/Charts/Renderers/BubbleChartRenderer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ open class BubbleChartRenderer: BarLineScatterCandleBubbleRenderer
{
@objc open weak var dataProvider: BubbleChartDataProvider?

@objc public init(dataProvider: BubbleChartDataProvider?, animator: Animator, viewPortHandler: ViewPortHandler)
@objc public init(dataProvider: BubbleChartDataProvider, animator: Animator, viewPortHandler: ViewPortHandler)
{
super.init(animator: animator, viewPortHandler: viewPortHandler)

Expand Down
2 changes: 1 addition & 1 deletion Source/Charts/Renderers/CandleStickChartRenderer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ open class CandleStickChartRenderer: LineScatterCandleRadarRenderer
{
@objc open weak var dataProvider: CandleChartDataProvider?

@objc public init(dataProvider: CandleChartDataProvider?, animator: Animator, viewPortHandler: ViewPortHandler)
@objc public init(dataProvider: CandleChartDataProvider, animator: Animator, viewPortHandler: ViewPortHandler)
{
super.init(animator: animator, viewPortHandler: viewPortHandler)

Expand Down
2 changes: 1 addition & 1 deletion Source/Charts/Renderers/CombinedChartRenderer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ open class CombinedChartRenderer: DataRenderer

internal var _drawOrder: [CombinedChartView.DrawOrder] = [.bar, .bubble, .line, .candle, .scatter]

@objc public init(chart: CombinedChartView?, animator: Animator, viewPortHandler: ViewPortHandler)
@objc public init(chart: CombinedChartView, animator: Animator, viewPortHandler: ViewPortHandler)
{
super.init(animator: animator, viewPortHandler: viewPortHandler)

Expand Down
2 changes: 1 addition & 1 deletion Source/Charts/Renderers/HorizontalBarChartRenderer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ open class HorizontalBarChartRenderer: BarChartRenderer
var rects = [CGRect]()
}

public override init(dataProvider: BarChartDataProvider?, animator: Animator, viewPortHandler: ViewPortHandler)
public override init(dataProvider: BarChartDataProvider, animator: Animator, viewPortHandler: ViewPortHandler)
{
super.init(dataProvider: dataProvider, animator: animator, viewPortHandler: viewPortHandler)
}
Expand Down
2 changes: 1 addition & 1 deletion Source/Charts/Renderers/LineChartRenderer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ open class LineChartRenderer: LineRadarRenderer
{
@objc open weak var dataProvider: LineChartDataProvider?

@objc public init(dataProvider: LineChartDataProvider?, animator: Animator, viewPortHandler: ViewPortHandler)
@objc public init(dataProvider: LineChartDataProvider, animator: Animator, viewPortHandler: ViewPortHandler)
{
super.init(animator: animator, viewPortHandler: viewPortHandler)

Expand Down
2 changes: 1 addition & 1 deletion Source/Charts/Renderers/PieChartRenderer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ open class PieChartRenderer: DataRenderer
{
@objc open weak var chart: PieChartView?

@objc public init(chart: PieChartView?, animator: Animator, viewPortHandler: ViewPortHandler)
@objc public init(chart: PieChartView, animator: Animator, viewPortHandler: ViewPortHandler)
{
super.init(animator: animator, viewPortHandler: viewPortHandler)

Expand Down
2 changes: 1 addition & 1 deletion Source/Charts/Renderers/RadarChartRenderer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ open class RadarChartRenderer: LineRadarRenderer
{
@objc open weak var chart: RadarChartView?

@objc public init(chart: RadarChartView?, animator: Animator, viewPortHandler: ViewPortHandler)
@objc public init(chart: RadarChartView, animator: Animator, viewPortHandler: ViewPortHandler)
{
super.init(animator: animator, viewPortHandler: viewPortHandler)

Expand Down
2 changes: 1 addition & 1 deletion Source/Charts/Renderers/ScatterChartRenderer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ open class ScatterChartRenderer: LineScatterCandleRadarRenderer
{
@objc open weak var dataProvider: ScatterChartDataProvider?

@objc public init(dataProvider: ScatterChartDataProvider?, animator: Animator, viewPortHandler: ViewPortHandler)
@objc public init(dataProvider: ScatterChartDataProvider, animator: Animator, viewPortHandler: ViewPortHandler)
{
super.init(animator: animator, viewPortHandler: viewPortHandler)

Expand Down
2 changes: 1 addition & 1 deletion Source/Charts/Renderers/XAxisRendererHorizontalBarChart.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ open class XAxisRendererHorizontalBarChart: XAxisRenderer
{
@objc internal var chart: BarChartView?

@objc public init(viewPortHandler: ViewPortHandler, xAxis: XAxis?, transformer: Transformer?, chart: BarChartView?)
@objc public init(viewPortHandler: ViewPortHandler, xAxis: XAxis?, transformer: Transformer?, chart: BarChartView)
{
super.init(viewPortHandler: viewPortHandler, xAxis: xAxis, transformer: transformer)

Expand Down
2 changes: 1 addition & 1 deletion Source/Charts/Renderers/XAxisRendererRadarChart.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ open class XAxisRendererRadarChart: XAxisRenderer
{
@objc open weak var chart: RadarChartView?

@objc public init(viewPortHandler: ViewPortHandler, xAxis: XAxis?, chart: RadarChartView?)
@objc public init(viewPortHandler: ViewPortHandler, xAxis: XAxis?, chart: RadarChartView)
{
super.init(viewPortHandler: viewPortHandler, xAxis: xAxis, transformer: nil)

Expand Down
2 changes: 1 addition & 1 deletion Source/Charts/Renderers/YAxisRendererRadarChart.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ open class YAxisRendererRadarChart: YAxisRenderer
{
fileprivate weak var chart: RadarChartView?

@objc public init(viewPortHandler: ViewPortHandler, yAxis: YAxis?, chart: RadarChartView?)
@objc public init(viewPortHandler: ViewPortHandler, yAxis: YAxis?, chart: RadarChartView)
{
super.init(viewPortHandler: viewPortHandler, yAxis: yAxis, transformer: nil)

Expand Down