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

Axis labels #6

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Axis labels #6

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
4eeb903
Axis labels
Morkrom Nov 16, 2014
11b8d11
Label offsets
Morkrom Nov 17, 2014
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
134 changes: 116 additions & 18 deletions linechart/linechart/LineChart.swift
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,19 @@ func - (left: Array<CGFloat>, right: Array<CGFloat>) -> Array<CGFloat> {
}



// delegate method
@objc protocol LineChartDelegate {
func didSelectDataPoint(x: CGFloat, yValues: Array<CGFloat>)
optional func plotLabelForX(index: Int) -> String
optional func plotLabelForY(index: Int) -> String
}

enum Axis {
case x
case y
}

typealias PlotLabelForAxis = (axis: Axis, index: Int) -> (text: String, degreesRotated: CGFloat)

// LineChart class
class LineChart: UIControl {
Expand All @@ -34,11 +40,15 @@ class LineChart: UIControl {
var dotsVisible = true
var labelsXVisible = false
var labelsYVisible = false
var xLabelPercentOffsetFromCenter: CGFloat = 0
var yLabelPercentOffsetFromCenter: CGFloat = 0

var areaUnderLinesVisible = false
var numberOfGridLinesX: CGFloat = 10
var numberOfGridLinesY: CGFloat = 10
var animationEnabled = true
var animationDuration: CFTimeInterval = 1
var plotLabelForAxis: PlotLabelForAxis?

var dotsBackgroundColor = UIColor.whiteColor()

Expand Down Expand Up @@ -176,8 +186,6 @@ class LineChart: UIControl {
return UIColor(red: red, green: green, blue: blue, alpha: 1)
}



/**
* Lighten color.
*/
Expand Down Expand Up @@ -254,8 +262,6 @@ class LineChart: UIControl {
return roundedDividend
}



/**
* Highlight data points at index.
*/
Expand Down Expand Up @@ -345,11 +351,10 @@ class LineChart: UIControl {
maximum = newMaximum
}
}

return CGFloat(maximum)
}



/**
* Scale to fit drawing width.
*/
Expand Down Expand Up @@ -479,8 +484,6 @@ class LineChart: UIControl {

}



/**
* Draw x grid.
*/
Expand All @@ -496,7 +499,6 @@ class LineChart: UIControl {
}



/**
* Draw y grid.
*/
Expand All @@ -510,11 +512,11 @@ class LineChart: UIControl {
CGContextMoveToPoint(context, axisInset, self.bounds.height - (CGFloat(index) * height) - axisInset)
CGContextAddLineToPoint(context, self.bounds.width - axisInset, self.bounds.height - (CGFloat(index) * height) - axisInset)
}

CGContextStrokePath(context)
}



/**
* Draw grid.
*/
Expand All @@ -523,8 +525,6 @@ class LineChart: UIControl {
drawYGrid()
}



/**
* Draw x labels.
*/
Expand All @@ -535,12 +535,59 @@ class LineChart: UIControl {
var label = UILabel(frame: CGRect(x: scaledValue + (axisInset/2), y: self.bounds.height-axisInset, width: axisInset, height: axisInset))
label.font = UIFont.systemFontOfSize(10)
label.textAlignment = NSTextAlignment.Center
label.text = String(index)
label.lineBreakMode = NSLineBreakMode.ByWordWrapping
label.numberOfLines = 0
let labelTextAndSizeToFit = labelTextForAxis(Axis.x, index: index)
label.text = labelTextAndSizeToFit.0//String(index)

applyDimensionsToLabel(

label,
labelTextAndScale: labelTextAndSizeToFit,
offset: xLabelPercentOffsetFromCenter,
axis: Axis.x
)


self.addSubview(label)
}
}

func degreesToRad(deg: CGFloat) -> CGFloat {

return deg / (180 * CGFloat(M_PI))

}

func radToDeg(rad: CGFloat) -> CGFloat {

return (rad * (180 / CGFloat(M_PI)) )
}

func applyDimensionsToLabel(label: UILabel, labelTextAndScale: (String, Bool, CGFloat), offset: CGFloat, axis: Axis) {

if labelTextAndScale.1 == true {

let labelSize = label.text?.sizeWithAttributes([NSFontAttributeName: label.font]) as CGSize?
let width = labelSize?.width
let height = labelSize?.height
let x = axis == .x ? label.frame.origin.x - (width! * offset) : label.frame.origin.x
let y = axis == .y ? label.frame.origin.y - (height! * offset) : label.frame.origin.y

label.frame = CGRectMake(

x,
y,
width!,
height!
)

let rads = degreesToRad(labelTextAndScale.2)
let tr: CGAffineTransform = CGAffineTransformMakeRotation(rads)

label.transform = tr
}
}

/**
* Draw y labels.
Expand All @@ -555,13 +602,64 @@ class LineChart: UIControl {
var label = UILabel(frame: CGRect(x: 0, y: yValue, width: axisInset, height: axisInset))
label.font = UIFont.systemFontOfSize(10)
label.textAlignment = NSTextAlignment.Center
label.text = String(index)
label.numberOfLines = 0
label.lineBreakMode = NSLineBreakMode.ByWordWrapping
let labelTextAndSizeToFit = labelTextForAxis(Axis.y, index: index)
label.text = labelTextAndSizeToFit.0 //String(index)

applyDimensionsToLabel(

label,
labelTextAndScale: labelTextAndSizeToFit,
offset: yLabelPercentOffsetFromCenter,
axis: Axis.y

)

self.addSubview(label)
}
}




func labelTextForAxis(axis: Axis, index: Int) -> (String, Bool, CGFloat) {

var text = String(index)
var sizeToFit = false
var rotationDegrees: CGFloat = 0

if let plotLabelForAxis = plotLabelForAxis as PlotLabelForAxis? {

let plotLabelForAxis = plotLabelForAxis(axis: axis, index: index)
text = plotLabelForAxis.0
rotationDegrees = plotLabelForAxis.1

sizeToFit = true

} else {

if let delegate = delegate as LineChartDelegate? {

switch axis {

case .x:

if let xPlot = delegate.plotLabelForX!(index) as String? {
text = xPlot
sizeToFit = true
}

case .y:

if let yPlot = delegate.plotLabelForY!(index) as String? {
text = yPlot
sizeToFit = true
}
}
}
}

return (text, sizeToFit, rotationDegrees)
}

/**
* Add line chart
*/
Expand Down
11 changes: 7 additions & 4 deletions linechart/linechart/MainViewController.swift
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ import UIKit
import QuartzCore

class MainViewController: UIViewController, LineChartDelegate {



var label = UILabel()
var lineChart: LineChart?
Expand Down Expand Up @@ -40,8 +38,6 @@ class MainViewController: UIViewController, LineChartDelegate {

}



override func didReceiveMemoryWarning() {
super.didReceiveMemoryWarning()
}
Expand All @@ -55,7 +51,14 @@ class MainViewController: UIViewController, LineChartDelegate {
label.text = "x: \(x) y: \(yValues)"
}

func plotLabelForX(index: Int) -> String {
return String(index)
}

func plotLabelForY(index: Int) -> String {
return String(index)
}


/**
* Redraw chart on device rotation.
Expand Down