Compare commits

...

6 Commits

Author SHA1 Message Date
terryworona 7944c03962 Merge pull request #209 from loumoore/master
Handle NaN line slope in line chart selection code.
2016-06-21 17:33:45 -07:00
Lou Moore e28a0113f8 PR feedback 2016-06-21 17:31:32 -07:00
Lou Moore 40ae91de47 Handle NaN line slope in line chart selection code. 2016-06-21 17:19:10 -07:00
terryworona 251b6e888f updated pod spec and change log 2016-05-30 19:35:38 -07:00
terryworona c2558f9975 Fixes 207 2016-05-30 19:30:42 -07:00
terryworona 2d1450340b updated pod spec and change log 2016-04-27 18:52:35 -07:00
4 changed files with 44 additions and 4 deletions
+18
View File
@@ -1,5 +1,23 @@
# Change Log
## [v3.0.10](https://github.com/Jawbone/JBChartView/tree/v3.0.10) (2016-05-31)
[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v3.0.9...v3.0.10)
## [v3.0.9](https://github.com/Jawbone/JBChartView/tree/v3.0.9) (2016-04-28)
[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v3.0.8...v3.0.9)
**Implemented enhancements:**
- ability to set line chart view padding [\#205](https://github.com/Jawbone/JBChartView/issues/205)
**Fixed bugs:**
- old gradient fill shows if chart is scrolled offscreen [\#204](https://github.com/Jawbone/JBChartView/issues/204)
**Closed issues:**
- example of using gradient for fills [\#202](https://github.com/Jawbone/JBChartView/issues/202)
## [v3.0.8](https://github.com/Jawbone/JBChartView/tree/v3.0.8) (2016-02-29)
[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v3.0.7...v3.0.8)
+22
View File
@@ -149,6 +149,28 @@ static UIColor *kJBBarChartViewDefaultBarColor = nil;
* Final block to refresh state and turn off reloading bit
*/
dispatch_block_t completionBlock = ^{
if (animated)
{
[self.chartData enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger index, BOOL * _Nonnull stop) {
// Grab old bar
UIView *oldBarView = [self.barViews objectAtIndex:index];
// Update bar instance
UIView *barView = [self createBarViewForIndex:index];
barView.frame = oldBarView.frame;
// Swap subviews
[oldBarView removeFromSuperview];
[self insertBarView:barView];
// Update bar colection
NSMutableArray *mutableBarViews = [NSMutableArray arrayWithArray:self.barViews];
[mutableBarViews replaceObjectAtIndex:index withObject:barView];
self.barViews = [NSArray arrayWithArray:mutableBarViews];
}];
}
self.reloading = NO;
[self setState:self.state animated:NO force:YES callback:nil];
};
+2 -2
View File
@@ -1035,8 +1035,8 @@ static NSInteger const kJBLineChartUnselectedLineIndex = -1;
// Touch point
CGPoint normalizedTouchPoint = CGPointMake(point.x, self.linesView.bounds.size.height - point.y);
// Slope
CGFloat lineSlope = (CGFloat)(rightPoint.y - leftPoint.y) / (CGFloat)(rightPoint.x - leftPoint.x);
// Slope - set to zero if x coordinates are the same and would result in a NaN value
CGFloat lineSlope = rightPoint.x != leftPoint.x ? (CGFloat)(rightPoint.y - leftPoint.y) / (CGFloat)(rightPoint.x - leftPoint.x) : 0.0f;
// Insersection point
CGPoint interesectionPoint = CGPointMake(normalizedTouchPoint.x, (lineSlope * (normalizedTouchPoint.x - leftPoint.x)) + leftPoint.y);
+2 -2
View File
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "JBChartView"
s.version = "3.0.8"
s.version = "3.0.10"
s.summary = "Jawbone's iOS-based charting library for both line and bar graphs."
s.homepage = "https://github.com/Jawbone/JBChartView"
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
s.author = { "Terry Worona" => "tworona@jawbone.com" }
s.source = {
:git => "https://github.com/Jawbone/JBChartView.git",
:tag => "v3.0.8"
:tag => "v3.0.10"
}
s.platform = :ios, '6.0'