Compare commits

..

2 Commits

Author SHA1 Message Date
Terry Worona 84d9c0f5da updated pod spec and read me 2013-12-26 10:00:12 -05:00
Terry Worona 5f400d3c91 Updated datasource to request bar view instead of color 2013-12-25 17:25:58 -05:00
5 changed files with 20 additions and 17 deletions
+4 -4
View File
@@ -90,16 +90,16 @@
- (NSInteger)barPaddingForBarChartView:(JBBarChartView *)barChartView;
/**
* The color of all bars within the chart.
* A UIView subclass representing the bar at a particular index.
*
* Default: black color
* Default: solid black UIView
*
* @param barChartView The origin chart
* @param index The 0-based index of a given bar (left to right, x-axis)
*
* @return The color to be used on each of the bars within the chart.
* @return A UIView subclass. The view will automatically be resized by the chart during creation (ie. no need to set the frame).
*/
- (UIColor *)barColorForBarChartView:(JBBarChartView *)barChartView atIndex:(NSInteger)index;
- (UIView *)barViewForBarChartView:(JBBarChartView *)barChartView atIndex:(NSInteger)index;
/**
* The selection color to be overlayed on a bar during touch events.
+5 -4
View File
@@ -129,15 +129,16 @@ static UIColor *kJBBarChartViewDefaultBarColor = nil;
NSMutableArray *mutableBarViews = [NSMutableArray array];
for (NSNumber *key in [[self.chartDataDictionary allKeys] sortedArrayUsingSelector:@selector(compare:)])
{
UIView *barView = [[UIView alloc] init];
if ([self.dataSource respondsToSelector:@selector(barColorForBarChartView:atIndex:)])
UIView *barView = nil; // since all bars are visible at once, no need to cache this view
if ([self.dataSource respondsToSelector:@selector(barViewForBarChartView:atIndex:)])
{
barView.backgroundColor = [self.dataSource barColorForBarChartView:self atIndex:index];
barView = [self.dataSource barViewForBarChartView:self atIndex:index];
}
else
{
barView = [[UIView alloc] init];
barView.backgroundColor = kJBBarChartViewDefaultBarColor;
}
}
CGFloat height = [self normalizedHeightForRawHeight:[self.chartDataDictionary objectForKey:key]];
barView.frame = CGRectMake(xOffset, self.bounds.size.height - height - self.footerView.frame.size.height + self.headerPadding, [self barWidth], height + kJBBarChartViewPopOffset - self.headerPadding);
[mutableBarViews addObject:barView];
+2 -2
View File
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "JBChartView"
s.version = "1.0.3"
s.version = "1.1.0"
s.summary = "Jawbone's iOS-based charting library for both line and bar graphs."
s.homepage = "https://github.com/Jawbone/JBChartView"
@@ -8,7 +8,7 @@ Pod::Spec.new do |s|
s.author = { "Terry Worona" => "tworona@jawbone.com" }
s.source = {
:git => "https://github.com/Jawbone/JBChartView.git",
:tag => "v1.0.3"
:tag => "v1.1.0"
}
s.platform = :ios, '7.0'
@@ -137,9 +137,11 @@ NSString * const kJBBarChartViewControllerNavButtonViewKey = @"view";
return kJBBarChartViewControllerBarPadding;
}
- (UIColor *)barColorForBarChartView:(JBBarChartView *)barChartView atIndex:(NSInteger)index
- (UIView *)barViewForBarChartView:(JBBarChartView *)barChartView atIndex:(NSInteger)index
{
return (index % 2 == 0) ? kJBColorBarChartBarBlue : kJBColorBarChartBarGreen;
UIView *barView = [[UIView alloc] init];
barView.backgroundColor = (index % 2 == 0) ? kJBColorBarChartBarBlue : kJBColorBarChartBarGreen;
return barView;
}
- (UIColor *)selectionBarColorForBarChartView:(JBBarChartView *)barChartView
+5 -5
View File
@@ -36,7 +36,7 @@ Simply add the following line to your <code>Podfile</code>:
Your Podfile should look something like:
platform :ios, '7.0'
pod 'JBChartView', '~> 1.0.3'
pod 'JBChartView', '~> 1.1.0'
### The Old School Way
@@ -66,7 +66,7 @@ At a minimum, you need to inform the data source how many bars are in the chart:
return ...; // number of bars in chart
}
Secondly, you nee to inform the delegate the height of each bar (automatically normalized across the entire chart):
Secondly, you need to inform the delegate the height of each bar (automatically normalized across the entire chart):
- (NSInteger)barChartView:(JBBarChartView *)barChartView heightForBarViewAtAtIndex:(NSInteger)index
{
@@ -89,7 +89,7 @@ At a minimum, you need to inform the data source how many points are in the line
return ...; // number of points in chart
}
Secondly, you nee to inform the delegate the y-position of each point (automatically normalized across the entire chart):
Secondly, you need to inform the delegate the y-position of each point (automatically normalized across the entire chart):
- (NSInteger)lineChartView:(JBLineChartView *)lineChartView heightForIndex:(NSInteger)index
{
@@ -116,9 +116,9 @@ Lastly, any JBChartView subclass can be collapsed or expanded programmatically v
#### JBBarChartView
The color of a chart's bar can be customized via the <i>optional</i> protocol:
By default, a chart's bars will be black and flat. They can be customized by supplying a UIView subclass through the <i>optional</i> protocol:
- (UIColor *)barColorForBarChartView:(JBBarChartView *)barChartView atIndex:(NSInteger)index
- (UIView *)barViewForBarChartView:(JBBarChartView *)barChartView atIndex:(NSInteger)index
{
return ...; // color of line in chart
}