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

Removed methods and properties deprecated in 1.0 #2996

Merged
merged 5 commits into from
Dec 18, 2017
Merged

Removed methods and properties deprecated in 1.0 #2996

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ed85445
Removed methods and properties deprecated in 1.0
jjatie Nov 13, 2017
4041009
Removed old bridging functions
jjatie Nov 13, 2017
efa9b8a
Merge branch 'master' into depracated-1.0-removal
jjatie Nov 22, 2017
5127242
Merge remote-tracking branch 'upstream/master' into depracated-1.0-re…
jjatie Dec 11, 2017
a33f952
Pulled latest master
jjatie Dec 11, 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
54 changes: 1 addition & 53 deletions Source/Charts/Charts/ChartViewBase.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,59 +72,7 @@ open class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
/// The `Description` object of the chart.
/// This should have been called just "description", but
@objc open var chartDescription: Description?

/// This property is deprecated - Use `chartDescription.text` instead.
@objc @available(*, deprecated: 1.0, message: "Use `chartDescription.text` instead.")
open var descriptionText: String
{
get { return chartDescription?.text ?? "" }
set { chartDescription?.text = newValue }
}

/// This property is deprecated - Use `chartDescription.font` instead.
@objc @available(*, deprecated: 1.0, message: "Use `chartDescription.font` instead.")
open var descriptionFont: NSUIFont?
{
get { return chartDescription?.font }
set
{
if let value = newValue
{
chartDescription?.font = value
}
}
}

/// This property is deprecated - Use `chartDescription.textColor` instead.
@objc @available(*, deprecated: 1.0, message: "Use `chartDescription.textColor` instead.")
open var descriptionTextColor: NSUIColor?
{
get { return chartDescription?.textColor }
set
{
if let value = newValue
{
chartDescription?.textColor = value
}
}
}

/// This property is deprecated - Use `chartDescription.textAlign` instead.
@objc @available(*, deprecated: 1.0, message: "Use `chartDescription.textAlign` instead.")
open var descriptionTextAlign: NSTextAlignment
{
get { return chartDescription?.textAlign ?? NSTextAlignment.right }
set { chartDescription?.textAlign = newValue }
}

/// This property is deprecated - Use `chartDescription.position` instead.
@available(*, deprecated: 1.0, message: "Use `chartDescription.position` instead.")
open var descriptionTextPosition: CGPoint?
{
get { return chartDescription?.position }
set { chartDescription?.position = newValue }
}


/// The legend object containing all data associated with the legend
@objc internal var _legend: Legend!

Expand Down
26 changes: 1 addition & 25 deletions Source/Charts/Charts/PieChartView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,31 +532,7 @@ open class PieChartView: PieRadarChartViewBase
setNeedsDisplay()
}
}

/// set this to true to draw the enrty labels into the pie slices
@objc @available(*, deprecated: 1.0, message: "Use `drawEntryLabelsEnabled` instead.")
open var drawSliceTextEnabled: Bool
{
get
{
return drawEntryLabelsEnabled
}
set
{
drawEntryLabelsEnabled = newValue
}
}

/// - returns: `true` if drawing entry labels is enabled, `false` ifnot
@objc @available(*, deprecated: 1.0, message: "Use `isDrawEntryLabelsEnabled` instead.")
open var isDrawSliceTextEnabled: Bool
{
get
{
return isDrawEntryLabelsEnabled
}
}


/// The color the entry labels are drawn with.
@objc open var entryLabelColor: NSUIColor?
{
Expand Down
18 changes: 1 addition & 17 deletions Source/Charts/Components/AxisBase.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,23 +298,7 @@ open class AxisBase: ComponentBase
}

@objc open var isAxisMaxCustom: Bool { return _customAxisMax }

/// This property is deprecated - Use `axisMinimum` instead.
@objc @available(*, deprecated: 1.0, message: "Use axisMinimum instead.")
open var axisMinValue: Double
{
get { return axisMinimum }
set { axisMinimum = newValue }
}

/// This property is deprecated - Use `axisMaximum` instead.
@objc @available(*, deprecated: 1.0, message: "Use axisMaximum instead.")
open var axisMaxValue: Double
{
get { return axisMaximum }
set { axisMaximum = newValue }
}


/// The minimum value for this axis.
/// If set, this value will not be calculated automatically depending on the provided data.
/// Use `resetCustomAxisMin()` to undo this.
Expand Down
Loading