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

fix issues #1830 #2433

Closed
wants to merge 2 commits into from
Closed

fix issues #1830 #2433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b93f3f
fix issue #1830
songsong20100 May 12, 2017
095a762
fix error
songsong20100 May 12, 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
20 changes: 20 additions & 0 deletions Source/Charts/Data/Implementations/Standard/ChartData.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
27 changes: 14 additions & 13 deletions Source/Charts/Data/Implementations/Standard/CombinedChartData.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ open class CombinedChartData: BarLineScatterCandleBubbleChartData
}

open var lineData: LineChartData!
{
{
get
{
return _lineData
Expand All @@ -43,7 +43,7 @@ open class CombinedChartData: BarLineScatterCandleBubbleChartData
}

open var barData: BarChartData!
{
{
get
{
return _barData
Expand All @@ -56,7 +56,7 @@ open class CombinedChartData: BarLineScatterCandleBubbleChartData
}

open var scatterData: ScatterChartData!
{
{
get
{
return _scatterData
Expand All @@ -69,7 +69,7 @@ open class CombinedChartData: BarLineScatterCandleBubbleChartData
}

open var candleData: CandleChartData!
{
{
get
{
return _candleData
Expand All @@ -82,7 +82,7 @@ open class CombinedChartData: BarLineScatterCandleBubbleChartData
}

open var bubbleData: BubbleChartData!
{
{
get
{
return _bubbleData
Expand Down Expand Up @@ -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
}
}
}
Expand Down