Updated for new version

JBChartView: needs initWithCoder initializer for inflation from a xib

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## <a href="https://github.com/Jawbone/JBChartView/tree/v2.1.6">2.1.6</a> 
+#### 04/11/14
+- Fixes issue <a href="https://github.com/Jawbone/JBChartView/pull/33">#33</a>.
+ 
+## <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. 

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
 {

Classes/JBChartView.podspec

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

Classes/JBLineChartView.m

@@ -847,8 +847,12 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
     {
         [self.delegate didUnselectLineInLineChartView:self];
     }
-    [self.linesView setSelectedLineIndex:kJBLineChartLinesViewUnselectedLineIndex animated:YES];
-    [self.dotsView setSelectedLineIndex:kJBLineChartDotsViewUnselectedLineIndex animated:YES];
+    
+    if (self.showsLineSelection)
+    {
+        [self.linesView setSelectedLineIndex:kJBLineChartLinesViewUnselectedLineIndex animated:YES];
+        [self.dotsView setSelectedLineIndex:kJBLineChartDotsViewUnselectedLineIndex animated:YES];
+    }
 }
 
 #pragma mark - Setters
@@ -888,8 +892,11 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
 {
     UITouch *touch = [touches anyObject];
     CGPoint touchPoint = [self clampPoint:[touch locationInView:self.linesView] toBounds:self.linesView.bounds padding:[self padding]];
-    [self.linesView setSelectedLineIndex:[self lineIndexForPoint:touchPoint] animated:YES];
-    [self.dotsView setSelectedLineIndex:[self lineIndexForPoint:touchPoint] animated:YES];
+    if (self.showsLineSelection)
+    {
+        [self.linesView setSelectedLineIndex:[self lineIndexForPoint:touchPoint] animated:YES];
+        [self.dotsView setSelectedLineIndex:[self lineIndexForPoint:touchPoint] animated:YES];
+    }
     [self touchesBeganOrMovedWithTouches:touches];
 }
 

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.4'
+	pod 'JBChartView', '~> 2.1.6'
 	
 ### 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: