|
|
|
@@ -19,7 +19,6 @@ typedef NS_ENUM(NSUInteger, JBLineChartHorizontalIndexClamp){
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// Numerics (JBLineChartLineView)
|
|
|
|
|
CGFloat static const kJBLineChartLinesViewEdgePadding = 10.0;
|
|
|
|
|
CGFloat static const kJBLineChartLinesViewStrokeWidth = 5.0;
|
|
|
|
|
CGFloat static const kJBLineChartLinesViewMiterLimit = -5.0;
|
|
|
|
|
CGFloat static const kJBLineChartLinesViewDefaultLinePhase = 1.0f;
|
|
|
|
@@ -34,8 +33,7 @@ NSInteger static const kJBLineChartDotsViewUnselectedLineIndex = -1;
|
|
|
|
|
CGFloat static const kJBLineSelectionViewWidth = 20.0f;
|
|
|
|
|
|
|
|
|
|
// Numerics (JBLineChartView)
|
|
|
|
|
CGFloat static const kJBLineChartViewUndefinedMaxHeight = -1.0f;
|
|
|
|
|
CGFloat static const kJBLineChartViewUndefinedMinHeight = -1.0f;
|
|
|
|
|
CGFloat static const kJBBarChartViewUndefinedCachedHeight = -1.0f;
|
|
|
|
|
CGFloat static const kJBLineChartViewStateAnimationDuration = 0.25f;
|
|
|
|
|
CGFloat static const kJBLineChartViewStateAnimationDelay = 0.05f;
|
|
|
|
|
CGFloat static const kJBLineChartViewStateBounceOffset = 15.0f;
|
|
|
|
@@ -89,6 +87,7 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
|
|
|
|
|
- (UIColor *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView colorForLineAtLineIndex:(NSUInteger)lineIndex;
|
|
|
|
|
- (UIColor *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView selectedColorForLineAtLineIndex:(NSUInteger)lineIndex;
|
|
|
|
|
- (CGFloat)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView widthForLineAtLineIndex:(NSUInteger)lineIndex;
|
|
|
|
|
- (CGFloat)paddingForLineChartLinesView:(JBLineChartLinesView *)lineChartLinesView;
|
|
|
|
|
- (JBLineChartViewLineStyle)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView lineStyleForLineAtLineIndex:(NSUInteger)lineIndex;
|
|
|
|
|
- (BOOL)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView smoothLineAtLineIndex:(NSUInteger)lineIndex;
|
|
|
|
|
|
|
|
|
@@ -116,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)paddingForLineChartDotsView:(JBLineChartDotsView *)lineChartDotsView;
|
|
|
|
|
- (BOOL)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView showsDotsForLineAtLineIndex:(NSUInteger)lineIndex;
|
|
|
|
|
|
|
|
|
|
@end
|
|
|
|
@@ -142,8 +142,9 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
|
|
|
|
|
// View quick accessors
|
|
|
|
|
- (CGFloat)normalizedHeightForRawHeight:(CGFloat)rawHeight;
|
|
|
|
|
- (CGFloat)availableHeight;
|
|
|
|
|
- (CGFloat)maxHeight;
|
|
|
|
|
- (CGFloat)minHeight;
|
|
|
|
|
- (CGFloat)maxHeight;
|
|
|
|
|
- (CGFloat)padding;
|
|
|
|
|
- (NSUInteger)dataCount;
|
|
|
|
|
|
|
|
|
|
// Touch helpers
|
|
|
|
@@ -207,15 +208,20 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
|
|
|
|
|
{
|
|
|
|
|
_showsVerticalSelection = YES;
|
|
|
|
|
_showsLineSelection = YES;
|
|
|
|
|
_cachedMaxHeight = kJBLineChartViewUndefinedMaxHeight;
|
|
|
|
|
_cachedMinHeight = kJBBarChartViewUndefinedCachedHeight;
|
|
|
|
|
_cachedMaxHeight = kJBBarChartViewUndefinedCachedHeight;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#pragma mark - Data
|
|
|
|
|
|
|
|
|
|
- (void)reloadData
|
|
|
|
|
{
|
|
|
|
|
// reset cached max height
|
|
|
|
|
self.cachedMaxHeight = kJBLineChartViewUndefinedMaxHeight;
|
|
|
|
|
// Reset cached max height
|
|
|
|
|
self.cachedMinHeight = kJBBarChartViewUndefinedCachedHeight;
|
|
|
|
|
self.cachedMaxHeight = kJBBarChartViewUndefinedCachedHeight;
|
|
|
|
|
|
|
|
|
|
// Padding
|
|
|
|
|
CGFloat chartPadding = [self padding];
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Subview rectangle calculations
|
|
|
|
@@ -228,8 +234,8 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
|
|
|
|
|
*/
|
|
|
|
|
dispatch_block_t createChartData = ^{
|
|
|
|
|
|
|
|
|
|
CGFloat pointSpace = (self.bounds.size.width - (kJBLineChartLinesViewEdgePadding * 2)) / ([self dataCount] - 1); // Space in between points
|
|
|
|
|
CGFloat xOffset = kJBLineChartLinesViewEdgePadding;
|
|
|
|
|
CGFloat pointSpace = (self.bounds.size.width - (chartPadding * 2)) / ([self dataCount] - 1); // Space in between points
|
|
|
|
|
CGFloat xOffset = chartPadding;
|
|
|
|
|
CGFloat yOffset = 0;
|
|
|
|
|
|
|
|
|
|
NSMutableArray *mutableChartData = [NSMutableArray array];
|
|
|
|
@@ -255,7 +261,7 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
|
|
|
|
|
xOffset += pointSpace;
|
|
|
|
|
}
|
|
|
|
|
[mutableChartData addObject:chartPointData];
|
|
|
|
|
xOffset = kJBLineChartLinesViewEdgePadding;
|
|
|
|
|
xOffset = chartPadding;
|
|
|
|
|
}
|
|
|
|
|
self.chartData = [NSArray arrayWithArray:mutableChartData];
|
|
|
|
|
};
|
|
|
|
@@ -379,34 +385,6 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
|
|
|
|
|
|
|
|
|
|
- (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);
|
|
|
|
@@ -415,35 +393,7 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- (CGFloat)maxHeight
|
|
|
|
|
{
|
|
|
|
|
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++)
|
|
|
|
|
{
|
|
|
|
|
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 > maxHeight)
|
|
|
|
|
{
|
|
|
|
|
maxHeight = height;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
self.cachedMaxHeight = maxHeight;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
if (!hasCachedMaxHeight)
|
|
|
|
|
{
|
|
|
|
|
calculateCachedMaxHeight();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
if (self.maximumValue != kJBChartViewUndefinedMaximumValue)
|
|
|
|
|
{
|
|
|
|
|
return MAX(self.maximumValue, self.cachedMaxHeight);
|
|
|
|
@@ -451,6 +401,25 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
|
|
|
|
|
return self.cachedMaxHeight;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- (CGFloat)padding
|
|
|
|
|
{
|
|
|
|
|
if ([self.dataSource respondsToSelector:@selector(lineChartView:widthForLineAtLineIndex:)])
|
|
|
|
|
{
|
|
|
|
|
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++)
|
|
|
|
|
{
|
|
|
|
|
CGFloat lineWidth = [self.dataSource lineChartView:self widthForLineAtLineIndex:lineIndex];
|
|
|
|
|
if (lineWidth > maxWidth)
|
|
|
|
|
{
|
|
|
|
|
maxWidth = lineWidth;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return ceil(maxWidth * 0.5);
|
|
|
|
|
}
|
|
|
|
|
return ceil(kJBLineChartLinesViewStrokeWidth * 0.5);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- (NSUInteger)dataCount
|
|
|
|
|
{
|
|
|
|
|
NSUInteger dataCount = 0;
|
|
|
|
@@ -501,6 +470,11 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
|
|
|
|
|
return kJBLineChartLinesViewStrokeWidth;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- (CGFloat)paddingForLineChartLinesView:(JBLineChartLinesView *)lineChartLinesView
|
|
|
|
|
{
|
|
|
|
|
return [self padding];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- (BOOL)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView smoothLineAtLineIndex:(NSUInteger)lineIndex
|
|
|
|
|
{
|
|
|
|
|
if ([self.dataSource respondsToSelector:@selector(lineChartView:smoothLineAtLineIndex:)])
|
|
|
|
@@ -553,6 +527,11 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
|
|
|
|
|
return kJBLineChartLinesViewStrokeWidth;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- (CGFloat)paddingForLineChartDotsView:(JBLineChartDotsView *)lineChartDotsView
|
|
|
|
|
{
|
|
|
|
|
return [self padding];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- (BOOL)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView showsDotsForLineAtLineIndex:(NSUInteger)lineIndex
|
|
|
|
|
{
|
|
|
|
|
if ([self.dataSource respondsToSelector:@selector(lineChartView:showsDotsForLineAtLineIndex:)])
|
|
|
|
@@ -621,6 +600,78 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#pragma mark - Getters
|
|
|
|
|
|
|
|
|
|
- (CGFloat)cachedMinHeight
|
|
|
|
|
{
|
|
|
|
|
if (_cachedMinHeight == kJBBarChartViewUndefinedCachedHeight)
|
|
|
|
|
{
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
_cachedMinHeight = minHeight;
|
|
|
|
|
}
|
|
|
|
|
return _cachedMinHeight;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- (CGFloat)cachedMaxHeight
|
|
|
|
|
{
|
|
|
|
|
if (_cachedMaxHeight == kJBBarChartViewUndefinedCachedHeight)
|
|
|
|
|
{
|
|
|
|
|
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++)
|
|
|
|
|
{
|
|
|
|
|
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 > maxHeight)
|
|
|
|
|
{
|
|
|
|
|
maxHeight = height;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
_cachedMaxHeight = maxHeight;
|
|
|
|
|
}
|
|
|
|
|
return _cachedMaxHeight;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- (CGFloat)mininumValue
|
|
|
|
|
{
|
|
|
|
|
if ([super mininumValue] == kJBChartViewUndefinedMinimumValue)
|
|
|
|
|
{
|
|
|
|
|
return self.cachedMinHeight;
|
|
|
|
|
}
|
|
|
|
|
return [super mininumValue];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- (CGFloat)maximumValue
|
|
|
|
|
{
|
|
|
|
|
if ([super maximumValue] == kJBChartViewUndefinedMaximumValue)
|
|
|
|
|
{
|
|
|
|
|
return self.cachedMaxHeight;
|
|
|
|
|
}
|
|
|
|
|
return [super maximumValue];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#pragma mark - Touch Helpers
|
|
|
|
|
|
|
|
|
|
- (CGPoint)clampPoint:(CGPoint)point toBounds:(CGRect)bounds padding:(CGFloat)padding
|
|
|
|
@@ -673,6 +724,9 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
|
|
|
|
|
NSInteger leftHorizontalIndex = [self horizontalIndexForPoint:point indexClamp:JBLineChartHorizontalIndexClampLeft];
|
|
|
|
|
NSInteger rightHorizontalIndex = [self horizontalIndexForPoint:point indexClamp:JBLineChartHorizontalIndexClampRight];
|
|
|
|
|
|
|
|
|
|
// Padding
|
|
|
|
|
CGFloat chartPadding = [self padding];
|
|
|
|
|
|
|
|
|
|
NSUInteger shortestDistance = INT_MAX;
|
|
|
|
|
NSInteger selectedIndex = kJBLineChartUnselectedLineIndex;
|
|
|
|
|
NSAssert([self.dataSource respondsToSelector:@selector(numberOfLinesInLineChartView:)], @"JBLineChartView // dataSource must implement - (NSUInteger)numberOfLinesInLineChartView:(JBLineChartView *)lineChartView");
|
|
|
|
@@ -687,11 +741,11 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
|
|
|
|
|
|
|
|
|
|
// Left point
|
|
|
|
|
JBLineChartPoint *leftLineChartPoint = [lineData objectAtIndex:leftHorizontalIndex];
|
|
|
|
|
CGPoint leftPoint = CGPointMake(leftLineChartPoint.position.x, fmin(fmax(kJBLineChartLinesViewEdgePadding, self.linesView.bounds.size.height - leftLineChartPoint.position.y), self.linesView.bounds.size.height - kJBLineChartLinesViewEdgePadding));
|
|
|
|
|
CGPoint leftPoint = CGPointMake(leftLineChartPoint.position.x, fmin(fmax(chartPadding, self.linesView.bounds.size.height - leftLineChartPoint.position.y), self.linesView.bounds.size.height - chartPadding));
|
|
|
|
|
|
|
|
|
|
// Right point
|
|
|
|
|
JBLineChartPoint *rightLineChartPoint = [lineData objectAtIndex:rightHorizontalIndex];
|
|
|
|
|
CGPoint rightPoint = CGPointMake(rightLineChartPoint.position.x, fmin(fmax(kJBLineChartLinesViewEdgePadding, self.linesView.bounds.size.height - rightLineChartPoint.position.y), self.linesView.bounds.size.height - kJBLineChartLinesViewEdgePadding));
|
|
|
|
|
CGPoint rightPoint = CGPointMake(rightLineChartPoint.position.x, fmin(fmax(chartPadding, self.linesView.bounds.size.height - rightLineChartPoint.position.y), self.linesView.bounds.size.height - chartPadding));
|
|
|
|
|
|
|
|
|
|
// Touch point
|
|
|
|
|
CGPoint normalizedTouchPoint = CGPointMake(point.x, self.linesView.bounds.size.height - point.y);
|
|
|
|
@@ -721,7 +775,7 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
UITouch *touch = [touches anyObject];
|
|
|
|
|
CGPoint touchPoint = [self clampPoint:[touch locationInView:self.linesView] toBounds:self.linesView.bounds padding:kJBLineChartLinesViewEdgePadding];
|
|
|
|
|
CGPoint touchPoint = [self clampPoint:[touch locationInView:self.linesView] toBounds:self.linesView.bounds padding:[self padding]];
|
|
|
|
|
|
|
|
|
|
if ([self.delegate respondsToSelector:@selector(lineChartView:didSelectLineAtIndex:horizontalIndex:touchPoint:)])
|
|
|
|
|
{
|
|
|
|
@@ -794,7 +848,7 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
|
|
|
|
|
- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
|
|
|
|
|
{
|
|
|
|
|
UITouch *touch = [touches anyObject];
|
|
|
|
|
CGPoint touchPoint = [self clampPoint:[touch locationInView:self.linesView] toBounds:self.linesView.bounds padding:kJBLineChartLinesViewEdgePadding];
|
|
|
|
|
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];
|
|
|
|
|
[self touchesBeganOrMovedWithTouches:touches];
|
|
|
|
@@ -912,6 +966,9 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
|
|
|
|
|
|
|
|
|
|
NSAssert([self.delegate respondsToSelector:@selector(chartDataForLineChartLinesView:)], @"JBLineChartLinesView // delegate must implement - (NSArray *)chartDataForLineChartLinesView:(JBLineChartLinesView *)lineChartLinesView");
|
|
|
|
|
NSArray *chartData = [self.delegate chartDataForLineChartLinesView:self];
|
|
|
|
|
|
|
|
|
|
NSAssert([self.delegate respondsToSelector:@selector(paddingForLineChartLinesView:)], @"JBLineChartLinesView // delegate must implement - (CGFloat)paddingForLineChartLinesView:(JBLineChartLinesView *)lineChartLinesView");
|
|
|
|
|
CGFloat padding = [self.delegate paddingForLineChartLinesView:self];
|
|
|
|
|
|
|
|
|
|
NSUInteger lineIndex = 0;
|
|
|
|
|
for (NSArray *lineData in chartData)
|
|
|
|
@@ -924,11 +981,11 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
|
|
|
|
|
{
|
|
|
|
|
if (index == 0)
|
|
|
|
|
{
|
|
|
|
|
[path moveToPoint:CGPointMake(lineChartPoint.position.x, fmin(self.bounds.size.height - kJBLineChartLinesViewEdgePadding, fmax(kJBLineChartLinesViewEdgePadding, lineChartPoint.position.y)))];
|
|
|
|
|
[path moveToPoint:CGPointMake(lineChartPoint.position.x, fmin(self.bounds.size.height - padding, fmax(padding, lineChartPoint.position.y)))];
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
[path addLineToPoint:CGPointMake(lineChartPoint.position.x, fmin(self.bounds.size.height - kJBLineChartLinesViewEdgePadding, fmax(kJBLineChartLinesViewEdgePadding, lineChartPoint.position.y)))];
|
|
|
|
|
[path addLineToPoint:CGPointMake(lineChartPoint.position.x, fmin(self.bounds.size.height - padding, fmax(padding, lineChartPoint.position.y)))];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
index++;
|
|
|
|
@@ -1081,6 +1138,9 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
|
|
|
|
|
|
|
|
|
|
NSAssert([self.delegate respondsToSelector:@selector(chartDataForLineChartDotsView:)], @"JBLineChartDotsView // delegate must implement - (NSArray *)chartDataForLineChartDotsView:(JBLineChartDotsView *)lineChartDotsView");
|
|
|
|
|
NSArray *chartData = [self.delegate chartDataForLineChartDotsView:self];
|
|
|
|
|
|
|
|
|
|
NSAssert([self.delegate respondsToSelector:@selector(paddingForLineChartDotsView:)], @"JBLineChartDotsView // delegate must implement - (CGFloat)paddingForLineChartDotsView:(JBLineChartDotsView *)lineChartDotsView");
|
|
|
|
|
CGFloat padding = [self.delegate paddingForLineChartDotsView:self];
|
|
|
|
|
|
|
|
|
|
NSUInteger lineIndex = 0;
|
|
|
|
|
NSMutableDictionary *mutableDotViewsDict = [NSMutableDictionary dictionary];
|
|
|
|
@@ -1098,7 +1158,7 @@ static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
|
|
|
|
|
CGFloat dotRadius = lineWidth * kJBLineChartDotsViewRadiusFactor;
|
|
|
|
|
|
|
|
|
|
JBLineChartDotView *dotView = [[JBLineChartDotView alloc] initWithRadius:dotRadius];
|
|
|
|
|
dotView.center = CGPointMake(lineChartPoint.position.x, fmin(self.bounds.size.height - kJBLineChartLinesViewEdgePadding, fmax(kJBLineChartLinesViewEdgePadding, lineChartPoint.position.y)));
|
|
|
|
|
dotView.center = CGPointMake(lineChartPoint.position.x, fmin(self.bounds.size.height - padding, fmax(padding, lineChartPoint.position.y)));
|
|
|
|
|
|
|
|
|
|
NSAssert([self.delegate respondsToSelector:@selector(lineChartDotsView:colorForLineAtLineIndex:)], @"JBLineChartDotsView // delegate must implement - (UIColor *)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView colorForLineAtLineIndex:(NSUInteger)lineIndex");
|
|
|
|
|
dotView.backgroundColor = [self.delegate lineChartDotsView:self colorForLineAtLineIndex:lineIndex];
|
|
|
|
|
Terry Worona