Merge pull request #209 from loumoore/master

Handle NaN line slope in line chart selection code.
PR feedback
2016-06-21 17:33:45 -07:00 · 2016-06-21 17:31:32 -07:00 · 2016-06-21 17:19:10 -07:00 · 2016-05-30 19:35:38 -07:00
3 changed files with 7 additions and 4 deletions
@@ -1,5 +1,8 @@
 # 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)

@@ -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);
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name         = "JBChartView"
-  s.version      = "3.0.9"
+  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.9"
+	:tag => "v3.0.10"
  }

  s.platform     = :ios, '6.0'
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