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

Stop axis labels duplicating. #315 [Pending squash and cleanup] #640

Closed
wants to merge 13 commits into from
Closed

Stop axis labels duplicating. #315 [Pending squash and cleanup] #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b84df21
Repeated line removed from example
noais Sep 22, 2015
bbf7251
adding MaximumScaleX
noais Sep 23, 2015
0576dd1
Repeated line removed from example
noais Sep 22, 2015
944a5f6
Merge branch 'master' of https://github.com/noais/ios-charts
noais Sep 23, 2015
e34dfbd
Merge commit 'bf7d7ff729c417b414059933c8b44b877e365743'
Sep 24, 2015
1721089
be explicit on how to install 'Charts' when using CocoaPods since
avishaan Sep 17, 2015
2c9d0a2
Repeated line removed from example
noais Sep 22, 2015
f656578
Update README.md
danielgindi Sep 24, 2015
eb38549
Merge remote-tracking branch 'origin/master'
Sep 24, 2015
b01fa5d
Bug fix setMaximumScaleY should be setMaximumScaleX
noais Sep 24, 2015
f1005f0
Merge branch 'master' of https://github.com/noais/ios-charts
Sep 25, 2015
7f0010b
Merge commit '3f88894f31683888862cf14312db74b05c1a0101'
Dec 1, 2015
8885bfa
Stop axis labels duplicating.
Dec 30, 2015
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
8 changes: 8 additions & 0 deletions Charts/Classes/Components/ChartYAxis.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,14 @@ public class ChartYAxis: ChartAxisBase
/// **default**: 0.0 (no maximum specified)
public var maxWidth = CGFloat(0)

/// if true, axis values will be repeated
public var allowRepeatedValues = false

/// the minimum diference value of the axis values
///
/// **default**: 1
public var granuality = Double(1.0)

public override init()
{
super.init()
Expand Down
4 changes: 4 additions & 0 deletions Charts/Classes/Renderers/ChartYAxisRenderer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ public class ChartYAxisRenderer: ChartAxisRendererBase

let rawInterval = range / Double(labelCount)
var interval = ChartUtils.roundToNextSignificant(number: Double(rawInterval))
if !_yAxis.allowRepeatedValues
{
interval = interval < _yAxis.granuality ? _yAxis.granuality : interval
}
let intervalMagnitude = pow(10.0, round(log10(interval)))
let intervalSigDigit = (interval / intervalMagnitude)
if (intervalSigDigit > 5)
Expand Down
2 changes: 2 additions & 0 deletions ChartsDemo/Classes/Demos/CombinedChartViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,11 @@ - (void)viewDidLoad

ChartYAxis *rightAxis = _chartView.rightAxis;
rightAxis.drawGridLinesEnabled = NO;
rightAxis.granuality = 0.1;

ChartYAxis *leftAxis = _chartView.leftAxis;
leftAxis.drawGridLinesEnabled = NO;
leftAxis.granuality = 0.1;

ChartXAxis *xAxis = _chartView.xAxis;
xAxis.labelPosition = XAxisLabelPositionBothSided;
Expand Down
2 changes: 2 additions & 0 deletions ChartsDemo/Classes/Demos/LineChart2ViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,15 @@ - (void)viewDidLoad
leftAxis.labelTextColor = [UIColor colorWithRed:51/255.f green:181/255.f blue:229/255.f alpha:1.f];
leftAxis.customAxisMax = 200.0;
leftAxis.drawGridLinesEnabled = YES;
leftAxis.allowRepeatedValues = false;

ChartYAxis *rightAxis = _chartView.rightAxis;
rightAxis.labelTextColor = UIColor.redColor;
rightAxis.customAxisMax = 900.0;
rightAxis.startAtZeroEnabled = NO;
rightAxis.customAxisMin = -200.0;
rightAxis.drawGridLinesEnabled = NO;
rightAxis.allowRepeatedValues = true;

_sliderX.value = 19.0;
_sliderY.value = 30.0;
Expand Down
5 changes: 3 additions & 2 deletions ChartsDemo/Classes/Demos/LineChart2ViewController.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7519.1" systemVersion="14C1510" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7513.1"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="LineChart2ViewController">
Expand Down