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

Allow PieChartView to hide labels for tiny slices #944

Closed
wants to merge 3 commits into from
Closed

Allow PieChartView to hide labels for tiny slices #944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d810775
Allow PieChartView to hide labels for tiny slices
rofreg Apr 12, 2016
4487a24
Change PieChart demo label color for legibility
rofreg Apr 12, 2016
4dbc05b
Make drawSliceTextMinimumAngle a CGFloat
rofreg May 3, 2016
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
14 changes: 14 additions & 0 deletions Charts/Classes/Charts/PieChartView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public class PieChartView: PieRadarChartViewBase
private var _circleBox = CGRect()

private var _drawXLabelsEnabled = true
private var _drawXLabelsMinimumAngle: CGFloat = 0

/// array that holds the width of each pie-slice in degrees
private var _drawAngles = [CGFloat]()
Expand Down Expand Up @@ -514,6 +515,19 @@ public class PieChartView: PieRadarChartViewBase
}
}

public var drawSliceTextMinimumAngle: CGFloat
{
get
{
return _drawXLabelsMinimumAngle
}
set
{
_drawXLabelsMinimumAngle = newValue
setNeedsDisplay()
}
}

/// - returns: true if drawing x-values is enabled, false if not
public var isDrawSliceTextEnabled: Bool
{
Expand Down
9 changes: 5 additions & 4 deletions Charts/Classes/Renderers/PieChartRenderer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ public class PieChartRenderer: ChartDataRendererBase
let yValueSum = (data as! PieChartData).yValueSum

let drawXVals = chart.isDrawSliceTextEnabled
let drawSliceTextMinimumAngle = chart.drawSliceTextMinimumAngle
let usePercentValuesEnabled = chart.usePercentValuesEnabled

var angle: CGFloat = 0.0
Expand Down Expand Up @@ -359,10 +360,10 @@ public class PieChartRenderer: ChartDataRendererBase
let sliceXBase = cos(transformedAngle * ChartUtils.Math.FDEG2RAD)
let sliceYBase = sin(transformedAngle * ChartUtils.Math.FDEG2RAD)

let drawXOutside = drawXVals && xValuePosition == .OutsideSlice
let drawYOutside = drawYVals && yValuePosition == .OutsideSlice
let drawXInside = drawXVals && xValuePosition == .InsideSlice
let drawYInside = drawYVals && yValuePosition == .InsideSlice
let drawXOutside = sliceAngle > drawSliceTextMinimumAngle && drawXVals && xValuePosition == .OutsideSlice
let drawYOutside = sliceAngle > drawSliceTextMinimumAngle && drawYVals && yValuePosition == .OutsideSlice
let drawXInside = sliceAngle > drawSliceTextMinimumAngle && drawXVals && xValuePosition == .InsideSlice
let drawYInside = sliceAngle > drawSliceTextMinimumAngle && drawYVals && yValuePosition == .InsideSlice

if drawXOutside || drawYOutside
{
Expand Down
15 changes: 14 additions & 1 deletion ChartsDemo/Classes/Demos/PieChartViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ - (void)viewDidLoad
self.options = @[
@{@"key": @"toggleValues", @"label": @"Toggle Y-Values"},
@{@"key": @"toggleXValues", @"label": @"Toggle X-Values"},
@{@"key": @"toggleXValuesMinimumAngle", @"label": @"Toggle X-Values Minimum Angle"},
@{@"key": @"togglePercent", @"label": @"Toggle Percent"},
@{@"key": @"toggleHole", @"label": @"Toggle Hole"},
@{@"key": @"animateX", @"label": @"Animate X"},
Expand All @@ -49,6 +50,7 @@ - (void)viewDidLoad
[self setupPieChartView:_chartView];

_chartView.delegate = self;
_chartView.drawSliceTextMinimumAngle = 20;

_sliderX.value = 3.0;
_sliderY.value = 100.0;
Expand Down Expand Up @@ -117,7 +119,7 @@ - (void)setDataCount:(int)count range:(double)range
pFormatter.percentSymbol = @" %";
[data setValueFormatter:pFormatter];
[data setValueFont:[UIFont fontWithName:@"HelveticaNeue-Light" size:11.f]];
[data setValueTextColor:UIColor.whiteColor];
[data setValueTextColor:UIColor.blackColor];

_chartView.data = data;
[_chartView highlightValues:nil];
Expand All @@ -133,6 +135,17 @@ - (void)optionTapped:(NSString *)key
return;
}

if ([key isEqualToString:@"toggleXValuesMinimumAngle"])
{
if (_chartView.drawSliceTextMinimumAngle == 0){
_chartView.drawSliceTextMinimumAngle = 20;
} else {
_chartView.drawSliceTextMinimumAngle = 0;
}

return;
}

if ([key isEqualToString:@"togglePercent"])
{
_chartView.usePercentValuesEnabled = !_chartView.isUsePercentValuesEnabled;
Expand Down