updated read me, etc for new version

JBChartView: needs initWithCoder initializer for inflation from a xib

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## <a href="https://github.com/Jawbone/JBChartView/tree/v2.1.5">2.1.5</a> 
+#### 04/10/14
+- Fixes issue <a href="https://github.com/Jawbone/JBChartView/pull/30">#30</a>.
+
+## <a href="https://github.com/Jawbone/JBChartView/tree/v2.1.4">2.1.4</a> 
+#### 04/10/14
+- Added ability to specify a radius for dotted lines. 
+
+## <a href="https://github.com/Jawbone/JBChartView/tree/v2.1.3">2.1.3</a> 
+#### 04/03/14
+- Added the ability to force a chart's state. 
+
 ## <a href="https://github.com/Jawbone/JBChartView/tree/v2.1.2">2.1.2</a> 
 #### 04/02/14
 - Added dynamic padding to JBLineChartView (based on max line width).

Classes/JBBarChartView.m

@@ -238,6 +238,9 @@ static UIColor *kJBBarChartViewDefaultBarColor = nil;
     // Position header and footer
     self.headerView.frame = CGRectMake(self.bounds.origin.x, self.bounds.origin.y, self.bounds.size.width, self.headerView.frame.size.height);
     self.footerView.frame = CGRectMake(self.bounds.origin.x, self.bounds.size.height - self.footerView.frame.size.height, self.bounds.size.width, self.footerView.frame.size.height);
+
+    // Refresh state
+    [self setState:self.state animated:NO callback:nil force:YES];
 }
 
 #pragma mark - View Quick Accessors
@@ -298,9 +301,9 @@ static UIColor *kJBBarChartViewDefaultBarColor = nil;
 
 #pragma mark - Setters
 
-- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)())callback
+- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)())callback force:(BOOL)force
 {
-    [super setState:state animated:animated callback:callback];
+    [super setState:state animated:animated callback:callback force:force];
     
     dispatch_block_t callbackCopy = [callback copy];
     
@@ -355,7 +358,7 @@ static UIColor *kJBBarChartViewDefaultBarColor = nil;
             {
                 callbackCopy();
             }
-        }   
+        }
     }
     else
     {
@@ -366,6 +369,11 @@ static UIColor *kJBBarChartViewDefaultBarColor = nil;
     }
 }
 
+- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)())callback
+{
+    [self setState:state animated:animated callback:callback force:NO];
+}
+
 #pragma mark - Getters
 
 - (CGFloat)cachedMinHeight

Classes/JBChartView.h

@@ -66,6 +66,16 @@ typedef NS_ENUM(NSInteger, JBChartViewState){
  */
 - (void)reloadData;
 
+/**
+ *  State setter.
+ *
+ *  @param state        Either collapse or expanded.
+ *  @param animated     Whether or not the state should be animated or not.
+ *  @param callback     Called once the animation is completed. If animated == NO, then callback is immediate.
+ *  @param force        If current state == new state, then setting force to YES will re-configure the chart (default NO).
+ */
+- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)())callback force:(BOOL)force;
+
 /**
  *  State setter.
  *

Classes/JBChartView.m

@@ -17,6 +17,10 @@ static UIColor *kJBChartVerticalSelectionViewDefaultBgColor = nil;
 
 @interface JBChartView ()
 
+// Construction
+- (void)constructChartView;
+
+// Validation
 - (void)validateHeaderAndFooterHeights;
 
 @end
@@ -25,14 +29,22 @@ static UIColor *kJBChartVerticalSelectionViewDefaultBgColor = nil;
 
 #pragma mark - Alloc/Init
 
+- (id)initWithCoder:(NSCoder *)aDecoder
+{
+    self = [super initWithCoder:aDecoder];
+    if (self)
+    {
+        [self constructChartView];
+    }
+    return self;
+}
+
 - (id)initWithFrame:(CGRect)frame
 {
     self = [super initWithFrame:frame];
     if (self)
     {
-        self.clipsToBounds = YES;
-        _mininumValue = kJBChartViewUndefinedMinimumValue;
-        _maximumValue = kJBChartViewUndefinedMaximumValue;
+        [self constructChartView];
     }
     return self;
 }
@@ -42,6 +54,15 @@ static UIColor *kJBChartVerticalSelectionViewDefaultBgColor = nil;
     return [self initWithFrame:CGRectZero];
 }
 
+#pragma mark - Construction
+
+- (void)constructChartView
+{
+    self.clipsToBounds = YES;
+    _mininumValue = kJBChartViewUndefinedMinimumValue;
+    _maximumValue = kJBChartViewUndefinedMaximumValue;
+}
+
 #pragma mark - Public
 
 - (void)reloadData
@@ -49,7 +70,7 @@ static UIColor *kJBChartVerticalSelectionViewDefaultBgColor = nil;
     // Override
 }
 
-#pragma mark - Helpers
+#pragma mark - Validation
 
 - (void)validateHeaderAndFooterHeights
 {
@@ -90,9 +111,9 @@ static UIColor *kJBChartVerticalSelectionViewDefaultBgColor = nil;
     [self reloadData];
 }
 
-- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)())callback
+- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)())callback force:(BOOL)force
 {
-    if (_state == state)
+    if ((_state == state) && !force)
     {
         return;
     }
@@ -102,6 +123,11 @@ static UIColor *kJBChartVerticalSelectionViewDefaultBgColor = nil;
     // Override
 }
 
+- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)())callback
+{
+    [self setState:state animated:animated callback:callback force:NO];
+}
+
 - (void)setState:(JBChartViewState)state animated:(BOOL)animated
 {
     [self setState:state animated:animated callback:nil];

Classes/JBChartView.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "JBChartView"
-  s.version      = "2.1.2"
+  s.version      = "2.1.5"
   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 => "v2.1.2"
+	:tag => "v2.1.5"
   }
 
   s.platform     = :ios, '7.0'

Classes/JBLineChartView.h

@@ -138,6 +138,20 @@ typedef NS_ENUM(NSInteger, JBLineChartViewLineStyle){
  */
 - (CGFloat)lineChartView:(JBLineChartView *)lineChartView widthForLineAtLineIndex:(NSUInteger)lineIndex;
 
+/**
+ *  Returns the radius of all dots in a particular line at lineIndex within the chart.
+ *  For this value to apply, showsDotsForLineAtLineIndex: must return YES for the line at lineIndex.
+ *  Any value can be returned for lineIndex's that don't support dots, as it will never be called. 
+ *
+ *  Default: line width x 3.
+ *
+ *  @param lineChartView    The line chart object requesting this information.
+ *  @param lineIndex        An index number identifying a line in the chart.
+ *
+ *  @return The radius of the dots within a dotted line in the chart.
+ */
+- (CGFloat)lineChartView:(JBLineChartView *)lineChartView dotRadiusForLineAtLineIndex:(NSUInteger)lineIndex;
+
 /**
  *  Returns the (vertical) selection color to be overlayed on the chart during touch events.
  *  The color is automically faded to transparent (vertically). The property showsVerticalSelection

Classes/JBLineChartView.m

@@ -26,7 +26,7 @@ CGFloat static const kJBLineChartLinesViewDefaultDimmedOpacity = 0.5f;
 NSInteger static const kJBLineChartLinesViewUnselectedLineIndex = -1;
 
 // Numerics (JBLineChartDotsView)
-NSInteger static const kJBLineChartDotsViewRadiusFactor = 3; // 3x size of line width
+NSInteger static const kJBLineChartDotsViewDefaultRadiusFactor = 3; // 3x size of line width
 NSInteger static const kJBLineChartDotsViewUnselectedLineIndex = -1;
 
 // Numerics (JBLineSelectionView)
@@ -115,6 +115,7 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
 - (UIColor *)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView colorForLineAtLineIndex:(NSUInteger)lineIndex;
 - (UIColor *)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView selectedColorForLineAtLineIndex:(NSUInteger)lineIndex;
 - (CGFloat)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView widthForLineAtLineIndex:(NSUInteger)lineIndex;
+- (CGFloat)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView dotRadiusForLineAtLineIndex:(NSUInteger)lineIndex;
 - (CGFloat)paddingForLineChartDotsView:(JBLineChartDotsView *)lineChartDotsView;
 - (BOOL)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView showsDotsForLineAtLineIndex:(NSUInteger)lineIndex;
 
@@ -361,6 +362,9 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
     // Position header and footer
     self.headerView.frame = CGRectMake(self.bounds.origin.x, self.bounds.origin.y, self.bounds.size.width, self.headerView.frame.size.height);
     self.footerView.frame = CGRectMake(self.bounds.origin.x, self.bounds.size.height - self.footerView.frame.size.height, self.bounds.size.width, self.footerView.frame.size.height);
+
+    // Refresh state
+    [self setState:self.state animated:NO callback:nil force:YES];
 }
 
 #pragma mark - View Quick Accessors
@@ -403,21 +407,39 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
 
 - (CGFloat)padding
 {
-    if ([self.dataSource respondsToSelector:@selector(lineChartView:widthForLineAtLineIndex:)])
+    CGFloat maxLineWidth = 0.0f;
+    NSAssert([self.dataSource respondsToSelector:@selector(numberOfLinesInLineChartView:)], @"JBLineChartView // dataSource must implement - (NSUInteger)numberOfLinesInLineChartView:(JBLineChartView *)lineChartView");
+
+    for (int lineIndex=0; lineIndex<[self.dataSource numberOfLinesInLineChartView:self]; lineIndex++)
     {
-        NSAssert([self.dataSource respondsToSelector:@selector(numberOfLinesInLineChartView:)], @"JBLineChartView // dataSource must implement - (NSUInteger)numberOfLinesInLineChartView:(JBLineChartView *)lineChartView");
-        CGFloat maxWidth = 0.0f;
-        for (int lineIndex=0; lineIndex<[self.dataSource numberOfLinesInLineChartView:self]; lineIndex++)
+        BOOL showsDots = NO;
+        if ([self.dataSource respondsToSelector:@selector(lineChartView:showsDotsForLineAtLineIndex:)])
         {
-            CGFloat lineWidth = [self.dataSource lineChartView:self widthForLineAtLineIndex:lineIndex];
-            if (lineWidth > maxWidth)
+            showsDots = [self.dataSource lineChartView:self showsDotsForLineAtLineIndex:lineIndex];
+        }
+
+        CGFloat lineWidth = kJBLineChartLinesViewStrokeWidth; // default
+        if ([self.dataSource respondsToSelector:@selector(lineChartView:widthForLineAtLineIndex:)])
+        {
+            lineWidth = [self.dataSource lineChartView:self widthForLineAtLineIndex:lineWidth];
+        }
+        
+        CGFloat dotRadius = lineWidth * kJBLineChartDotsViewDefaultRadiusFactor; // default
+        if (showsDots)
+        {
+            if ([self.dataSource respondsToSelector:@selector(lineChartView:dotRadiusForLineAtLineIndex:)])
             {
-                maxWidth = lineWidth;
+                dotRadius = [self.dataSource lineChartView:self dotRadiusForLineAtLineIndex:lineIndex];
             }
         }
-        return ceil(maxWidth * 0.5);
+        
+        CGFloat currentMaxLineWidth = MAX(dotRadius, lineWidth);
+        if (currentMaxLineWidth > maxLineWidth)
+        {
+            maxLineWidth = currentMaxLineWidth;
+        }
     }
-    return ceil(kJBLineChartLinesViewStrokeWidth * 0.5);
+    return ceil(maxLineWidth * 0.5);
 }
 
 - (NSUInteger)dataCount
@@ -527,6 +549,18 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
     return kJBLineChartLinesViewStrokeWidth;
 }
 
+- (CGFloat)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView dotRadiusForLineAtLineIndex:(NSUInteger)lineIndex
+{
+    if ([self.dataSource respondsToSelector:@selector(lineChartView:dotRadiusForLineAtLineIndex:)])
+    {
+        return [self.dataSource lineChartView:self dotRadiusForLineAtLineIndex:lineIndex];
+    }
+    else
+    {
+        return [self lineChartDotsView:lineChartDotsView widthForLineAtLineIndex:lineIndex] * kJBLineChartDotsViewDefaultRadiusFactor;
+    }
+}
+
 - (CGFloat)paddingForLineChartDotsView:(JBLineChartDotsView *)lineChartDotsView
 {
     return [self padding];
@@ -543,9 +577,9 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
 
 #pragma mark - Setters
 
-- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)())callback
+- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)())callback force:(BOOL)force
 {
-    [super setState:state animated:animated callback:callback];
+    [super setState:state animated:animated callback:callback force:force];
     
     if ([self.chartData count] > 0)
     {
@@ -576,7 +610,7 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
                         callback();
                     }
                 }];
-            }];            
+            }];
             [UIView animateWithDuration:kJBLineChartViewStateAnimationDuration delay:(self.state == JBChartViewStateExpanded) ? kJBLineChartViewStateAnimationDelay : 0.0 options:UIViewAnimationOptionBeginFromCurrentState animations:^{
                 adjustViewAlphas();
             } completion:nil];
@@ -600,6 +634,11 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
     }
 }
 
+- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)())callback
+{
+    [self setState:state animated:animated callback:callback force:NO];
+}
+
 #pragma mark - Getters
 
 - (CGFloat)cachedMinHeight
@@ -1152,10 +1191,9 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
         {
             NSMutableArray *mutableDotViews = [NSMutableArray array];
             for (JBLineChartPoint *lineChartPoint in [lineData sortedArrayUsingSelector:@selector(compare:)])
-            {
-                NSAssert([self.delegate respondsToSelector:@selector(lineChartDotsView:widthForLineAtLineIndex:)], @"JBLineChartDotsView // delegate must implement - (CGFloat)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView widthForLineAtLineIndex:(NSUInteger)lineIndex");
-                CGFloat lineWidth = [self.delegate lineChartDotsView:self widthForLineAtLineIndex:lineIndex];
-                CGFloat dotRadius = lineWidth * kJBLineChartDotsViewRadiusFactor;
+            {                
+                NSAssert([self.delegate respondsToSelector:@selector(lineChartDotsView:dotRadiusForLineAtLineIndex:)], @"JBLineChartDotsView // delegate must implement - (CGFloat)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView dotRadiusForLineAtLineIndex:(NSUInteger)lineIndex");
+                CGFloat dotRadius = [self.delegate lineChartDotsView:self dotRadiusForLineAtLineIndex:lineIndex];
                 
                 JBLineChartDotView *dotView = [[JBLineChartDotView alloc] initWithRadius:dotRadius];
                 dotView.center = CGPointMake(lineChartPoint.position.x, fmin(self.bounds.size.height - padding, fmax(padding, lineChartPoint.position.y)));

JBChartViewDemo/JBChartViewDemo/Controllers/JBLineChartViewController.m

@@ -216,6 +216,11 @@ NSString * const kJBLineChartViewControllerNavButtonViewKey = @"view";
     return (lineIndex == JBLineChartLineSolid) ? kJBLineChartViewControllerChartSolidLineWidth: kJBLineChartViewControllerChartDashedLineWidth;
 }
 
+- (CGFloat)lineChartView:(JBLineChartView *)lineChartView dotRadiusForLineAtLineIndex:(NSUInteger)lineIndex
+{
+    return (lineIndex == JBLineChartLineSolid) ? 0.0: (kJBLineChartViewControllerChartDashedLineWidth * 4);
+}
+
 - (UIColor *)verticalSelectionColorForLineChartView:(JBLineChartView *)lineChartView
 {
     return [UIColor whiteColor];

README.md

@@ -38,7 +38,7 @@ Simply add the following line to your <code>Podfile</code>:
 Your Podfile should look something like:
 
 	platform :ios, '7.0'
-	pod 'JBChartView', '~> 2.1.2'
+	pod 'JBChartView', '~> 2.1.5'
 	
 ### The Old School Way
 
@@ -196,6 +196,10 @@ Furthermore, the color of the selection bar and line can be customized via the <
 By default, each line will not show dots for each point. To enable this on a per-line basis:
 
 	- (BOOL)lineChartView:(JBLineChartView *)lineChartView showsDotsForLineAtLineIndex:(NSUInteger)lineIndex;
+
+To customize the size of each dot, implement (default is 3x the line width):
+
+	- (BOOL)lineChartView:(JBLineChartView *)lineChartView showsDotsForLineAtLineIndex:(NSUInteger)lineIndex;
 	
 As well, by default, each line will have squared off end caps and connection points. To enable line smoothing: