Updated read me, change log and podspec

CHANGELOG.md

@@ -1,12 +1,17 @@
 # Changelog
 
+## <a href="https://github.com/Jawbone/JBChartView/tree/v2.1.0">2.1.0</a> 
+#### 03/30/14
+- Added minimumValue and maximumValue properties. 
+- Changed default min value implementation from 0 to chart's actual minimum value.
+
 ## <a href="https://github.com/Jawbone/JBChartView/tree/v2.0.2">2.0.2</a> 
 #### 03/27/14
 - Added the ability to add point dots for lines in JBLineChartView.
 - Streamlined line styling. 
 
 ## <a href="https://github.com/Jawbone/JBChartView/tree/v2.0.1">2.0.1</a> 
-### 03/19/14
+#### 03/19/14
 - Fixes issue <a href="https://github.com/Jawbone/JBChartView/pull/22">#22</a>.
 
 ## <a href="https://github.com/Jawbone/JBChartView/tree/v2.0.0">2.0.0</a> 

Classes/JBBarChartView.m

@@ -11,6 +11,7 @@
 // Numerics
 CGFloat static const kJBBarChartViewBarBasePaddingMutliplier = 50.0f;
 CGFloat static const kJBBarChartViewUndefinedMaxHeight = -1.0f;
+CGFloat static const kJBBarChartViewUndefinedMinHeight = -1.0f;
 CGFloat static const kJBBarChartViewStateAnimationDuration = 0.05f;
 CGFloat static const kJBBarChartViewPopOffset = 10.0f; // used to offset bars for 'pop' animations
 NSInteger static const kJBBarChartViewUndefinedBarIndex = -1;
@@ -24,6 +25,7 @@ static UIColor *kJBBarChartViewDefaultBarColor = nil;
 @property (nonatomic, strong) NSArray *barViews;
 @property (nonatomic, assign) CGFloat barPadding;
 @property (nonatomic, assign) CGFloat cachedMaxHeight;
+@property (nonatomic, assign) CGFloat cachedMinHeight;
 @property (nonatomic, strong) JBChartVerticalSelectionView *verticalSelectionView;
 @property (nonatomic, assign) BOOL verticalSelectionViewVisible;
 
@@ -258,22 +260,50 @@ static UIColor *kJBBarChartViewDefaultBarColor = nil;
     return ((value - minHeight) / (maxHeight - minHeight)) * [self availableHeight];
 }
 
+- (CGFloat)minHeight
+{
+    BOOL hasCachedMinHeight = self.cachedMinHeight != kJBBarChartViewUndefinedMinHeight;
+    
+    dispatch_block_t calculateCachedMinHeight = ^{
+        // min height is min value across all goals and values
+        NSArray *chartValues = [[[self.chartDataDictionary allValues] arrayByAddingObjectsFromArray:[self.chartDataDictionary allValues]] sortedArrayUsingSelector:@selector(compare:)];
+        self.cachedMinHeight =  [[chartValues firstObject] floatValue];
+    };
+    
+    if (!hasCachedMinHeight)
+    {
+        calculateCachedMinHeight();
+    }
+    
+    if (self.mininumValue != kJBChartViewUndefinedMinimumValue)
+    {
+        return MIN(self.mininumValue, self.cachedMinHeight);
+    }
+    return self.cachedMinHeight;
+}
+
 - (CGFloat)maxHeight
 {
-    if (self.cachedMaxHeight == kJBBarChartViewUndefinedMaxHeight)
-    {
+    BOOL hasCachedMaxHeight = self.cachedMaxHeight != kJBBarChartViewUndefinedMaxHeight;
+    
+    dispatch_block_t calculateCachedMaxHeight = ^{
         // max height is max value across all goals and values
         NSArray *chartValues = [[[self.chartDataDictionary allValues] arrayByAddingObjectsFromArray:[self.chartDataDictionary allValues]] sortedArrayUsingSelector:@selector(compare:)];
         self.cachedMaxHeight =  [[chartValues lastObject] floatValue];
+    };
+    
+    if (!hasCachedMaxHeight)
+    {
+        calculateCachedMaxHeight();
+    }
+    
+    if (self.maximumValue != kJBChartViewUndefinedMaximumValue)
+    {
+        return MAX(self.maximumValue, self.cachedMaxHeight);
     }
     return self.cachedMaxHeight;
 }
 
-- (CGFloat)minHeight
-{
-    return 0;
-}
-
 - (CGFloat)barWidth
 {
     NSUInteger barCount = [[self.chartDataDictionary allKeys] count];

Classes/JBChartView.h

@@ -9,6 +9,8 @@
 #import <Foundation/Foundation.h>
 
 extern CGFloat const kJBChartViewDefaultAnimationDuration;
+extern CGFloat const kJBChartViewUndefinedMinimumValue; // helper for undefined min/max values
+extern CGFloat const kJBChartViewUndefinedMaximumValue;
 
 /**
  * At a minimum, a chart can support two states, along with animations to-and-from.
@@ -39,6 +41,19 @@ typedef NS_ENUM(NSInteger, JBChartViewState){
  */
 @property (nonatomic, assign) CGFloat headerPadding;
 
+/**
+ *  The minimum and maxmimum values of the chart. 
+ *  If no value(s) are supplied, the min and max values of the chart's data source are used.
+ *
+ *  If value(s) are supplied, they must be >= 0, otherwise an assertion will be thrown. 
+ *  The min/max values are clamped to the ceiling and floor of the actual min/max values of the chart's data source;
+ *  for example, if a maximumValue of 20 is supplied & the chart's actual max is 100, then 100 will be used.
+ *
+ *  For min/max modifications to take effect, reloadData must be called.
+ */
+@property (nonatomic, assign) CGFloat mininumValue;
+@property (nonatomic, assign) CGFloat maximumValue;
+
 /**
  *  Charts can either be expanded or contracted. 
  *  By default, a chart should be expanded on initialization.

Classes/JBChartView.m

@@ -9,6 +9,8 @@
 #import "JBChartView.h"
 
 CGFloat const kJBChartViewDefaultAnimationDuration = 0.25f;
+CGFloat const kJBChartViewUndefinedMinimumValue = -1.0f;
+CGFloat const kJBChartViewUndefinedMaximumValue = -1.0f;
 
 // Color (JBChartSelectionView)
 static UIColor *kJBChartVerticalSelectionViewDefaultBgColor = nil;
@@ -29,6 +31,8 @@ static UIColor *kJBChartVerticalSelectionViewDefaultBgColor = nil;
     if (self)
     {
         self.clipsToBounds = YES;
+        _mininumValue = kJBChartViewUndefinedMinimumValue;
+        _maximumValue = kJBChartViewUndefinedMaximumValue;
     }
     return self;
 }
@@ -108,6 +112,18 @@ static UIColor *kJBChartVerticalSelectionViewDefaultBgColor = nil;
     [self setState:state animated:NO];
 }
 
+- (void)setMininumValue:(CGFloat)mininumValue
+{
+    NSAssert(mininumValue >= 0, @"JBChartView // the minimumValue must be >= 0.");
+    _mininumValue = mininumValue;
+}
+
+- (void)setMaximumValue:(CGFloat)maximumValue
+{
+    NSAssert(maximumValue >= 0, @"JBChartView // the maximumValue must be >= 0.");
+    _maximumValue = maximumValue;
+}
+
 @end
 
 @implementation JBChartVerticalSelectionView

Classes/JBChartView.podspec

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

Classes/JBLineChartView.m

@@ -35,6 +35,7 @@ CGFloat static const kJBLineSelectionViewWidth = 20.0f;
 
 // Numerics (JBLineChartView)
 CGFloat static const kJBLineChartViewUndefinedMaxHeight = -1.0f;
+CGFloat static const kJBLineChartViewUndefinedMinHeight = -1.0f;
 CGFloat static const kJBLineChartViewStateAnimationDuration = 0.25f;
 CGFloat static const kJBLineChartViewStateAnimationDelay = 0.05f;
 CGFloat static const kJBLineChartViewStateBounceOffset = 15.0f;
@@ -132,6 +133,7 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
 @property (nonatomic, strong) JBLineChartDotsView *dotsView;
 @property (nonatomic, strong) JBChartVerticalSelectionView *verticalSelectionView;
 @property (nonatomic, assign) CGFloat cachedMaxHeight;
+@property (nonatomic, assign) CGFloat cachedMinHeight;
 @property (nonatomic, assign) BOOL verticalSelectionViewVisible;
 
 // Initialization
@@ -375,10 +377,48 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
     return self.bounds.size.height - self.headerView.frame.size.height - self.footerView.frame.size.height - self.headerPadding;
 }
 
+- (CGFloat)minHeight
+{
+    BOOL hasCachedMinHeight = self.cachedMinHeight != kJBLineChartViewUndefinedMinHeight;
+    
+    dispatch_block_t calculateCachedMinHeight = ^{
+        CGFloat minHeight = FLT_MAX;
+        NSAssert([self.dataSource respondsToSelector:@selector(numberOfLinesInLineChartView:)], @"JBLineChartView // dataSource must implement - (NSUInteger)numberOfLinesInLineChartView:(JBLineChartView *)lineChartView");
+        for (NSUInteger lineIndex=0; lineIndex<[self.dataSource numberOfLinesInLineChartView:self]; lineIndex++)
+        {
+            NSAssert([self.dataSource respondsToSelector:@selector(lineChartView:numberOfVerticalValuesAtLineIndex:)], @"JBLineChartView // dataSource must implement - (NSUInteger)lineChartView:(JBLineChartView *)lineChartView numberOfVerticalValuesAtLineIndex:(NSUInteger)lineIndex");
+            NSUInteger dataCount = [self.dataSource lineChartView:self numberOfVerticalValuesAtLineIndex:lineIndex];
+            for (NSUInteger horizontalIndex=0; horizontalIndex<dataCount; horizontalIndex++)
+            {
+                NSAssert([self.delegate respondsToSelector:@selector(lineChartView:verticalValueForHorizontalIndex:atLineIndex:)], @"JBLineChartView // delegate must implement - (CGFloat)lineChartView:(JBLineChartView *)lineChartView verticalValueForHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex");
+                CGFloat height = [self.delegate lineChartView:self verticalValueForHorizontalIndex:horizontalIndex atLineIndex:lineIndex];
+                NSAssert(height >= 0, @"JBLineChartView // delegate function - (CGFloat)lineChartView:(JBLineChartView *)lineChartView verticalValueForHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex must return a CGFloat >= 0");
+                if (height < minHeight)
+                {
+                    minHeight = height;
+                }
+            }
+        }
+        self.cachedMinHeight = minHeight;
+    };
+    
+    if (!hasCachedMinHeight)
+    {
+        calculateCachedMinHeight();
+    }
+    
+    if (self.mininumValue != kJBChartViewUndefinedMinimumValue)
+    {
+        return MIN(self.mininumValue, self.cachedMinHeight);
+    }
+    return self.cachedMinHeight;
+}
+
 - (CGFloat)maxHeight
 {
-    if (self.cachedMaxHeight == kJBLineChartViewUndefinedMaxHeight)
-    {
+    BOOL hasCachedMaxHeight = self.cachedMaxHeight != kJBLineChartViewUndefinedMaxHeight;
+
+    dispatch_block_t calculateCachedMaxHeight = ^{
         CGFloat maxHeight = 0;
         NSAssert([self.dataSource respondsToSelector:@selector(numberOfLinesInLineChartView:)], @"JBLineChartView // dataSource must implement - (NSUInteger)numberOfLinesInLineChartView:(JBLineChartView *)lineChartView");
         for (NSUInteger lineIndex=0; lineIndex<[self.dataSource numberOfLinesInLineChartView:self]; lineIndex++)
@@ -397,15 +437,20 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
             }
         }
         self.cachedMaxHeight = maxHeight;
+    };
+    
+    if (!hasCachedMaxHeight)
+    {
+        calculateCachedMaxHeight();
+    }
+    
+    if (self.maximumValue != kJBChartViewUndefinedMaximumValue)
+    {
+        return MAX(self.maximumValue, self.cachedMaxHeight);
     }
     return self.cachedMaxHeight;
 }
 
-- (CGFloat)minHeight
-{
-    return 0;
-}
-
 - (NSUInteger)dataCount
 {
     NSUInteger dataCount = 0;

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.0.2'
+	pod 'JBChartView', '~> 2.1.0'
 	
 ### The Old School Way