diff --git a/Source/Charts/Data/Implementations/Standard/ChartData.swift b/Source/Charts/Data/Implementations/Standard/ChartData.swift index 5d64efeb84..669263d968 100644 --- a/Source/Charts/Data/Implementations/Standard/ChartData.swift +++ b/Source/Charts/Data/Implementations/Standard/ChartData.swift @@ -137,6 +137,26 @@ open class ChartData: NSObject } } + open var leftAxisMin: Double + { + return _leftAxisMin + } + + open var leftAxisMax: Double + { + return _leftAxisMax + } + + open var rightAxisMin: Double + { + return _rightAxisMin + } + + open var rightAxisMax: Double + { + return _rightAxisMax + } + /// Adjusts the current minimum and maximum values based on the provided Entry object. open func calcMinMax(entry e: ChartDataEntry, axis: YAxis.AxisDependency) { diff --git a/Source/Charts/Data/Implementations/Standard/CombinedChartData.swift b/Source/Charts/Data/Implementations/Standard/CombinedChartData.swift index d356d32994..dc4e6d430a 100644 --- a/Source/Charts/Data/Implementations/Standard/CombinedChartData.swift +++ b/Source/Charts/Data/Implementations/Standard/CombinedChartData.swift @@ -30,7 +30,7 @@ open class CombinedChartData: BarLineScatterCandleBubbleChartData } open var lineData: LineChartData! - { + { get { return _lineData @@ -43,7 +43,7 @@ open class CombinedChartData: BarLineScatterCandleBubbleChartData } open var barData: BarChartData! - { + { get { return _barData @@ -56,7 +56,7 @@ open class CombinedChartData: BarLineScatterCandleBubbleChartData } open var scatterData: ScatterChartData! - { + { get { return _scatterData @@ -69,7 +69,7 @@ open class CombinedChartData: BarLineScatterCandleBubbleChartData } open var candleData: CandleChartData! - { + { get { return _candleData @@ -82,7 +82,7 @@ open class CombinedChartData: BarLineScatterCandleBubbleChartData } open var bubbleData: BubbleChartData! - { + { get { return _bubbleData @@ -137,24 +137,25 @@ open class CombinedChartData: BarLineScatterCandleBubbleChartData _xMin = data.xMin } - if data.yMax > _leftAxisMax + + if data.leftAxisMax > _leftAxisMax { - _leftAxisMax = data.yMax + _leftAxisMax = data.leftAxisMax } - if data.yMin < _leftAxisMin + if data.leftAxisMin < _leftAxisMin { - _leftAxisMin = data.yMin + _leftAxisMin = data.leftAxisMin } - if data.yMax > _rightAxisMax + if data.rightAxisMax > _rightAxisMax { - _rightAxisMax = data.yMax + _rightAxisMax = data.rightAxisMax } - if data.yMin < _rightAxisMin + if data.rightAxisMin < _rightAxisMin { - _rightAxisMin = data.yMin + _rightAxisMin = data.rightAxisMin } } }