Merge pull request #250 from pkclsoft/master

Enhancements to Bar and Line Charts

Merge pull request #250 from pkclsoft/master
Enhancements to Bar and Line Charts
Kevin
Commit 4bc3d3f50e561a4dcf71fa3c76427c65cda291d2 4bc3d3f5 2 parents 55fa1f41 4c65136c
Showing 10 changed files with 110 additions and 67 deletions
PNChart/PNBar.h
PNChart/PNBar.m
PNChart/PNBarChart.h
PNChart/PNBarChart.m
PNChart/PNLineChart.h
PNChart/PNLineChart.m
PNChart/PNLineChartData.h
PNChart/PNLineChartData.m
PNChart/PNLineChartDataItem.h
PNChart/PNLineChartDataItem.m
--- a/PNChart/PNBar.h 100644 → 100755
View file @4bc3d3f
+++ b/PNChart/PNBar.h 100644 → 100755
View file @4bc3d3f
@@ -26,6 +26,9 @@
 @property (nonatomic) CAShapeLayer *gradeLayer;
 @property (nonatomic) CATextLayer* textLayer;
+/** Text color for all bars in the chart. */
+@property (nonatomic) UIColor * labelTextColor;
+
 @property (nonatomic, assign) BOOL isNegative;          //!< 是否是负数
 @property (nonatomic, assign) BOOL isShowNumber;        //!< 是否显示numbers
 @end
--- a/PNChart/PNBar.m 100644 → 100755
View file @4bc3d3f
+++ b/PNChart/PNBar.m 100644 → 100755
View file @4bc3d3f
@@ -181,7 +181,7 @@
         _textLayer = [[CATextLayer alloc]init];
         [_textLayer setString:@"0"];
         [_textLayer setAlignmentMode:kCAAlignmentCenter];
-        [_textLayer setForegroundColor:[[UIColor colorWithRed:178/255.0 green:178/255. blue:178/255.0 alpha:1.0] CGColor]];
+        [_textLayer setForegroundColor:[_labelTextColor CGColor]];
        _textLayer.hidden = YES;
     }
@@ -189,6 +189,11 @@
     return _textLayer;
 }
+- (void) setLabelTextColor:(UIColor *)labelTextColor {
+    _labelTextColor = labelTextColor;
+    [_textLayer setForegroundColor:[_labelTextColor CGColor]];
+}
+
 -(void)setGradeFrame:(CGFloat)grade startPosY:(CGFloat)startPosY
 {
     CGFloat textheigt = self.bounds.size.height*self.grade;
--- a/PNChart/PNBarChart.h 100644 → 100755
View file @4bc3d3f
+++ b/PNChart/PNBarChart.h 100644 → 100755
View file @4bc3d3f
@@ -63,6 +63,8 @@ typedef NSString *(^PNYLabelFormatter)(CGFloat yLabelValue);
 /** Controls whether the chart border line should be displayed. */
 @property (nonatomic) BOOL showChartBorder;
+@property (nonatomic) UIColor *chartBorderColor;
+
 /** Controls whether the chart Horizontal separator should be displayed. */
 @property (nonatomic, assign) BOOL showLevelLine;
--- a/PNChart/PNBarChart.m 100644 → 100755
View file @4bc3d3f
+++ b/PNChart/PNBarChart.m 100644 → 100755
View file @4bc3d3f
@@ -62,6 +62,7 @@
     _chartMarginBottom   = 25.0;
     _barRadius           = 2.0;
     _showChartBorder     = NO;
+    _chartBorderColor    = PNLightGrey;
     _showLevelLine       = NO;
     _yChartLabelWidth    = 18;
     _rotateForXAxisText  = false;
@@ -234,7 +235,7 @@
             }
             bar = [[PNBar alloc] initWithFrame:CGRectMake(barXPosition, //Bar X position
-                                                          self.frame.size.height - chartCavanHeight - kXLabelHeight - _chartMarginTop , //Bar Y position
+                                                          self.frame.size.height - chartCavanHeight - kXLabelHeight - _chartMarginBottom + _chartMarginTop , //Bar Y position
                                                           barWidth, // Bar witdh
                                                           self.showLevelLine ? chartCavanHeight/2.0:chartCavanHeight)]; //Bar height
@@ -249,6 +250,10 @@
             }else{
                 bar.barColor = [self barColorAtIndex:index];
             }
+            
+            if (self.labelTextColor) {
+                bar.labelTextColor = self.labelTextColor;
+            }
             // Add gradient
             if (self.isGradientShow) {
@@ -309,13 +314,13 @@
         UIBezierPath *progressline = [UIBezierPath bezierPath];
-        [progressline moveToPoint:CGPointMake(_chartMarginLeft, self.frame.size.height - kXLabelHeight - _chartMarginTop)];
+        [progressline moveToPoint:CGPointMake(_chartMarginLeft, self.frame.size.height - kXLabelHeight - _chartMarginBottom + _chartMarginTop)];
-        [progressline addLineToPoint:CGPointMake(self.frame.size.width - _chartMarginRight,  self.frame.size.height - kXLabelHeight - _chartMarginTop)];
+        [progressline addLineToPoint:CGPointMake(self.frame.size.width - _chartMarginRight,  self.frame.size.height - kXLabelHeight - _chartMarginBottom + _chartMarginTop)];
         [progressline setLineWidth:1.0];
         [progressline setLineCapStyle:kCGLineCapSquare];
         _chartBottomLine.path = progressline.CGPath;
-        _chartBottomLine.strokeColor = PNLightGrey.CGColor;
+        _chartBottomLine.strokeColor = [_chartBorderColor CGColor];;
         CABasicAnimation *pathAnimation = [CABasicAnimation animationWithKeyPath:@"strokeEnd"];
         pathAnimation.duration = 0.5;
@@ -344,7 +349,7 @@
         [progressLeftline setLineWidth:1.0];
         [progressLeftline setLineCapStyle:kCGLineCapSquare];
         _chartLeftLine.path = progressLeftline.CGPath;
-        _chartLeftLine.strokeColor = PNLightGrey.CGColor;
+        _chartLeftLine.strokeColor = [_chartBorderColor CGColor];
         CABasicAnimation *pathLeftAnimation = [CABasicAnimation animationWithKeyPath:@"strokeEnd"];
         pathLeftAnimation.duration = 0.5;
--- a/PNChart/PNLineChart.h 100644 → 100755
View file @4bc3d3f
+++ b/PNChart/PNLineChart.h 100644 → 100755
View file @4bc3d3f
@@ -45,11 +45,14 @@
 @property (nonatomic) UIColor *yLabelColor;
 @property (nonatomic) CGFloat chartCavanHeight;
 @property (nonatomic) CGFloat chartCavanWidth;
-@property (nonatomic) CGFloat chartMargin;
 @property (nonatomic) BOOL showLabel;
 @property (nonatomic) BOOL showGenYLabels;
 @property (nonatomic) BOOL thousandsSeparator;
+@property (nonatomic) CGFloat chartMarginLeft;
+@property (nonatomic) CGFloat chartMarginRight;
+@property (nonatomic) CGFloat chartMarginTop;
+@property (nonatomic) CGFloat chartMarginBottom;
 /**
  * Controls whether to show the coordinate axis. Default is NO.
--- a/PNChart/PNLineChart.m 100644 → 100755
View file @4bc3d3f
+++ b/PNChart/PNLineChart.m 100644 → 100755
View file @4bc3d3f
@@ -70,19 +70,19 @@
     }
     if (yStep == 0.0) {
-        PNChartLabel *minLabel = [[PNChartLabel alloc] initWithFrame:CGRectMake(0.0, (NSInteger)_chartCavanHeight, (NSInteger)_chartMargin, (NSInteger)_yLabelHeight)];
+        PNChartLabel *minLabel = [[PNChartLabel alloc] initWithFrame:CGRectMake(0.0, (NSInteger)_chartCavanHeight, (NSInteger)_chartMarginBottom, (NSInteger)_yLabelHeight)];
         minLabel.text = [self formatYLabel:0.0];
         [self setCustomStyleForYLabel:minLabel];
         [self addSubview:minLabel];
         [_yChartLabels addObject:minLabel];
-        PNChartLabel *midLabel = [[PNChartLabel alloc] initWithFrame:CGRectMake(0.0, (NSInteger)(_chartCavanHeight / 2), (NSInteger)_chartMargin, (NSInteger)_yLabelHeight)];
+        PNChartLabel *midLabel = [[PNChartLabel alloc] initWithFrame:CGRectMake(0.0, (NSInteger)(_chartCavanHeight / 2), (NSInteger)_chartMarginBottom, (NSInteger)_yLabelHeight)];
         midLabel.text = [self formatYLabel:_yValueMax];
         [self setCustomStyleForYLabel:midLabel];
         [self addSubview:midLabel];
         [_yChartLabels addObject:midLabel];
-        PNChartLabel *maxLabel = [[PNChartLabel alloc] initWithFrame:CGRectMake(0.0, 0.0, (NSInteger)_chartMargin, (NSInteger)_yLabelHeight)];
+        PNChartLabel *maxLabel = [[PNChartLabel alloc] initWithFrame:CGRectMake(0.0, 0.0, (NSInteger)_chartMarginBottom, (NSInteger)_yLabelHeight)];
         maxLabel.text = [self formatYLabel:_yValueMax * 2];
         [self setCustomStyleForYLabel:maxLabel];
         [self addSubview:maxLabel];
@@ -94,7 +94,7 @@
         while (num > 0)
         {
-            PNChartLabel *label = [[PNChartLabel alloc] initWithFrame:CGRectMake(0.0, (NSInteger)(_chartCavanHeight - index * yStepHeight), (NSInteger)_chartMargin, (NSInteger)_yLabelHeight)];
+            PNChartLabel *label = [[PNChartLabel alloc] initWithFrame:CGRectMake(0.0, (NSInteger)(_chartCavanHeight - index * yStepHeight), (NSInteger)_chartMarginBottom, (NSInteger)_yLabelHeight)];
             [label setTextAlignment:NSTextAlignmentRight];
             label.text = [self formatYLabel:_yValueMin + (yStep * index)];
             [self setCustomStyleForYLabel:label];
@@ -143,7 +143,7 @@
             NSInteger y = (NSInteger)(_chartCavanHeight - index * yStepHeight);
-            PNChartLabel *label = [[PNChartLabel alloc] initWithFrame:CGRectMake(0.0, y, (NSInteger)_chartMargin, (NSInteger)_yLabelHeight)];
+            PNChartLabel *label = [[PNChartLabel alloc] initWithFrame:CGRectMake(0.0, y, (NSInteger)_chartMarginLeft * 0.9, (NSInteger)_yLabelHeight)];
             [label setTextAlignment:NSTextAlignmentRight];
             label.text = labelText;
             [self setCustomStyleForYLabel:label];
@@ -174,7 +174,7 @@
     if (_showLabel) {
         xLabelWidth = _chartCavanWidth / [xLabels count];
     } else {
-        xLabelWidth = (self.frame.size.width) / [xLabels count];
+        xLabelWidth = (self.frame.size.width - _chartMarginLeft - _chartMarginRight) / [xLabels count];
     }
     return [self setXLabels:xLabels withWidth:xLabelWidth];
@@ -198,10 +198,10 @@
         for (int index = 0; index < xLabels.count; index++) {
             labelText = xLabels[index];
-            NSInteger x = 2 * _chartMargin +  (index * _xLabelWidth) - (_xLabelWidth / 2);
+            NSInteger x = (index *  _xLabelWidth + _chartMarginLeft + _xLabelWidth /2.0 );
-            NSInteger y = _chartMargin + _chartCavanHeight;
+            NSInteger y = _chartMarginBottom + _chartCavanHeight;
-            PNChartLabel *label = [[PNChartLabel alloc] initWithFrame:CGRectMake(x, y, (NSInteger)_xLabelWidth, (NSInteger)_chartMargin)];
+            PNChartLabel *label = [[PNChartLabel alloc] initWithFrame:CGRectMake(x, y, (NSInteger)_xLabelWidth, (NSInteger)_chartMarginBottom)];
             [label setTextAlignment:NSTextAlignmentCenter];
             label.text = labelText;
             [self setCustomStyleForXLabel:label];
@@ -392,7 +392,7 @@
         if (!_showLabel) {
             _chartCavanHeight = self.frame.size.height - 2 * _yLabelHeight;
             _chartCavanWidth = self.frame.size.width;
-            _chartMargin = chartData.inflexionPointWidth;
+            //_chartMargin = chartData.inflexionPointWidth;
             _xLabelWidth = (_chartCavanWidth / ([_xLabels count] - 1));
         }
@@ -412,10 +412,9 @@
                 innerGrade = (yValue - _yValueMin) / (_yValueMax - _yValueMin);
             }
-            CGFloat offSetX = (_chartCavanWidth) / (chartData.itemCount);
+            int x = i *  _xLabelWidth + _chartMarginLeft + _xLabelWidth /2.0;
-            int x = 2 * _chartMargin +  (i * offSetX);
+            int y = _chartCavanHeight - (innerGrade * _chartCavanHeight) + (_yLabelHeight / 2)  + _chartMarginTop - _chartMarginBottom;
-            int y = _chartCavanHeight - (innerGrade * _chartCavanHeight) + (_yLabelHeight / 2);
             // Circular point
             if (chartData.inflexionPointStyle == PNLineChartPointStyleCircle) {
@@ -427,9 +426,9 @@
                 [pointPath addArcWithCenter:circleCenter radius:inflexionWidth / 2 startAngle:0 endAngle:2 * M_PI clockwise:YES];
                 //jet text display text
-//                CATextLayer* textLayer = [self createTextLayer];
+                if (chartData.showPointLabel == YES) {
-//                [self setGradeFrame:textLayer grade:yValue pointCenter:circleCenter width:inflexionWidth];
+                    [gradePathArray addObject:[self createPointLabelFor:chartData.getData(i).rawY pointCenter:circleCenter width:inflexionWidth withChartData:chartData]];
-//                [gradePathArray addObject:textLayer];
+                }
                 if ( i != 0 ) {
@@ -463,9 +462,9 @@
                 [pointPath closePath];
                 // text display text
-//                CATextLayer* textLayer = [self createTextLayer];
+                if (chartData.showPointLabel == YES) {
-//                [self setGradeFrame:textLayer grade:yValue pointCenter:squareCenter width:inflexionWidth];
+                    [gradePathArray addObject:[self createPointLabelFor:chartData.getData(i).rawY pointCenter:squareCenter width:inflexionWidth withChartData:chartData]];
-//                [gradePathArray addObject:textLayer];
+                }
                 if ( i != 0 ) {
@@ -501,9 +500,9 @@
                 [pointPath closePath];
                 // text display text
-//                CATextLayer* textLayer = [self createTextLayer];
+                if (chartData.showPointLabel == YES) {
-//                [self setGradeFrame:textLayer grade:yValue pointCenter:middlePoint width:inflexionWidth];
+                    [gradePathArray addObject:[self createPointLabelFor:chartData.getData(i).rawY pointCenter:middlePoint width:inflexionWidth withChartData:chartData]];
-//                [gradePathArray addObject:textLayer];
+                }
                 if ( i != 0 ) {
                     // calculate the point for triangle
@@ -684,19 +683,19 @@
         CGContextSetLineWidth(ctx, self.axisWidth);
         CGContextSetStrokeColorWithColor(ctx, [self.axisColor CGColor]);
-        CGFloat xAxisWidth = CGRectGetWidth(rect) - _chartMargin / 2;
+        CGFloat xAxisWidth = CGRectGetWidth(rect) - (_chartMarginLeft + _chartMarginRight) / 2;
-        CGFloat yAxisHeight = _chartMargin + _chartCavanHeight;
+        CGFloat yAxisHeight = _chartMarginBottom + _chartCavanHeight;
         // draw coordinate axis
-        CGContextMoveToPoint(ctx, _chartMargin + yAxisOffset, 0);
+        CGContextMoveToPoint(ctx, _chartMarginBottom + yAxisOffset, 0);
-        CGContextAddLineToPoint(ctx, _chartMargin + yAxisOffset, yAxisHeight);
+        CGContextAddLineToPoint(ctx, _chartMarginBottom + yAxisOffset, yAxisHeight);
         CGContextAddLineToPoint(ctx, xAxisWidth, yAxisHeight);
         CGContextStrokePath(ctx);
         // draw y axis arrow
-        CGContextMoveToPoint(ctx, _chartMargin + yAxisOffset - 3, 6);
+        CGContextMoveToPoint(ctx, _chartMarginBottom + yAxisOffset - 3, 6);
-        CGContextAddLineToPoint(ctx, _chartMargin + yAxisOffset, 0);
+        CGContextAddLineToPoint(ctx, _chartMarginBottom + yAxisOffset, 0);
-        CGContextAddLineToPoint(ctx, _chartMargin + yAxisOffset + 3, 6);
+        CGContextAddLineToPoint(ctx, _chartMarginBottom + yAxisOffset + 3, 6);
         CGContextStrokePath(ctx);
         // draw x axis arrow
@@ -710,7 +709,7 @@
             // draw x axis separator
             CGPoint point;
             for (NSUInteger i = 0; i < [self.xLabels count]; i++) {
-                point = CGPointMake(2 * _chartMargin +  (i * _xLabelWidth), _chartMargin + _chartCavanHeight);
+                point = CGPointMake(2 * _chartMarginLeft +  (i * _xLabelWidth), _chartMarginBottom + _chartCavanHeight);
                 CGContextMoveToPoint(ctx, point.x, point.y - 2);
                 CGContextAddLineToPoint(ctx, point.x, point.y);
                 CGContextStrokePath(ctx);
@@ -719,7 +718,7 @@
             // draw y axis separator
             CGFloat yStepHeight = _chartCavanHeight / _yLabelNum;
             for (NSUInteger i = 0; i < [self.xLabels count]; i++) {
-                point = CGPointMake(_chartMargin + yAxisOffset, (_chartCavanHeight - i * yStepHeight + _yLabelHeight / 2));
+                point = CGPointMake(_chartMarginBottom + yAxisOffset, (_chartCavanHeight - i * yStepHeight + _yLabelHeight / 2));
                 CGContextMoveToPoint(ctx, point.x, point.y);
                 CGContextAddLineToPoint(ctx, point.x + 2, point.y);
                 CGContextStrokePath(ctx);
@@ -731,14 +730,14 @@
         // draw y unit
         if ([self.yUnit length]) {
             CGFloat height = [PNLineChart sizeOfString:self.yUnit withWidth:30.f font:font].height;
-            CGRect drawRect = CGRectMake(_chartMargin + 10 + 5, 0, 30.f, height);
+            CGRect drawRect = CGRectMake(_chartMarginLeft + 10 + 5, 0, 30.f, height);
             [self drawTextInContext:ctx text:self.yUnit inRect:drawRect font:font];
         }
         // draw x unit
         if ([self.xUnit length]) {
             CGFloat height = [PNLineChart sizeOfString:self.xUnit withWidth:30.f font:font].height;
-            CGRect drawRect = CGRectMake(CGRectGetWidth(rect) - _chartMargin + 5, _chartMargin + _chartCavanHeight - height / 2, 25.f, height);
+            CGRect drawRect = CGRectMake(CGRectGetWidth(rect) - _chartMarginLeft + 5, _chartMarginBottom + _chartCavanHeight - height / 2, 25.f, height);
             [self drawTextInContext:ctx text:self.xUnit inRect:drawRect font:font];
         }
     }
@@ -766,15 +765,23 @@
     _yLabelNum = 5.0;
     _yLabelHeight = [[[[PNChartLabel alloc] init] font] pointSize];
-    _chartMargin = 40;
+//    _chartMargin = 40;
+    
+    _chartMarginLeft     = 25.0;
+    _chartMarginRight    = 25.0;
+    _chartMarginTop      = 25.0;
+    _chartMarginBottom   = 25.0;
+    
+    _yLabelFormat = @"%1.f";
-    _chartCavanWidth = self.frame.size.width - _chartMargin * 2;
+    _chartCavanWidth = self.frame.size.width - _chartMarginLeft - _chartMarginRight;
-    _chartCavanHeight = self.frame.size.height - _chartMargin * 2;
+    _chartCavanHeight = self.frame.size.height - _chartMarginBottom - _chartMarginTop;
     // Coordinate Axis Default Values
     _showCoordinateAxis = NO;
     _axisColor = [UIColor colorWithRed:0.4f green:0.4f blue:0.4f alpha:1.f];
     _axisWidth = 1.f;
+
 }
 #pragma mark - tools
@@ -1001,36 +1008,38 @@
 #pragma mark setter and getter
--(CATextLayer*)createTextLayer
+-(CATextLayer*) createPointLabelFor:(CGFloat)grade pointCenter:(CGPoint)pointCenter width:(CGFloat)width withChartData:(PNLineChartData*)chartData
 {
-    CATextLayer * textLayer = [[CATextLayer alloc]init];
+    CATextLayer *textLayer = [[CATextLayer alloc]init];
-    [textLayer setString:@"0"];
     [textLayer setAlignmentMode:kCAAlignmentCenter];
-    [textLayer setForegroundColor:[[UIColor blackColor] CGColor]];
+    [textLayer setForegroundColor:[chartData.pointLabelColor CGColor]];
-    return textLayer;
+    [textLayer setBackgroundColor:[[[UIColor whiteColor] colorWithAlphaComponent:0.8] CGColor]];
-}
+    [textLayer setCornerRadius:textLayer.fontSize/8.0];
-
--(void)setGradeFrame:(CATextLayer*)textLayer grade:(CGFloat)grade pointCenter:(CGPoint)pointCenter width:(CGFloat)width
-{
-    CGFloat textheigt = width*3;
-    CGFloat textWidth = width*8;
-    CGFloat textStartPosY;
-    if (pointCenter.y > textheigt) {
+    if (chartData.pointLabelFont != nil) {
-        textStartPosY = pointCenter.y - textheigt;
+        [textLayer setFont:(__bridge CFTypeRef)(chartData.pointLabelFont)];
-    }
+        textLayer.fontSize = [chartData.pointLabelFont pointSize];
-    else {
-        textStartPosY = pointCenter.y;
     }
+    CGFloat textHeight = textLayer.fontSize * 1.1;
+    CGFloat textWidth = width*8;
+    CGFloat textStartPosY;
+    
+    textStartPosY = pointCenter.y - textLayer.fontSize;
+
     [self.layer addSublayer:textLayer];
-    [textLayer setFontSize:textheigt/2];
-    [textLayer setString:[[NSString alloc]initWithFormat:@"%d",(int)(grade*100)]];
+    if (chartData.pointLabelFormat != nil) {
-    [textLayer setFrame:CGRectMake(0, 0, textWidth,  textheigt)];
+        [textLayer setString:[[NSString alloc]initWithFormat:chartData.pointLabelFormat, grade]];
+    } else {
+        [textLayer setString:[[NSString alloc]initWithFormat:_yLabelFormat, grade]];
+    }
+    
+    [textLayer setFrame:CGRectMake(0, 0, textWidth,  textHeight)];
     [textLayer setPosition:CGPointMake(pointCenter.x, textStartPosY)];
     textLayer.contentsScale = [UIScreen mainScreen].scale;
+    return textLayer;
 }
 -(CABasicAnimation*)fadeAnimation
--- a/PNChart/PNLineChartData.h 100644 → 100755
View file @4bc3d3f
+++ b/PNChart/PNLineChartData.h 100644 → 100755
View file @4bc3d3f
@@ -25,6 +25,11 @@ typedef PNLineChartDataItem *(^LCLineChartDataGetter)(NSUInteger item);
 @property (copy) LCLineChartDataGetter getData;
 @property (strong, nonatomic) NSString *dataTitle;
+@property (nonatomic) BOOL showPointLabel;
+@property (nonatomic) UIColor *pointLabelColor;
+@property (nonatomic) UIFont *pointLabelFont;
+@property (nonatomic) NSString *pointLabelFormat;
+
 @property (nonatomic, assign) PNLineChartPointStyle inflexionPointStyle;
 /**
--- a/PNChart/PNLineChartData.m 100644 → 100755
View file @4bc3d3f
+++ b/PNChart/PNLineChartData.m 100644 → 100755
View file @4bc3d3f
@@ -23,6 +23,9 @@
     _inflexionPointWidth = 6.f;
     _lineWidth = 2.f;
     _alpha = 1.f;
+    _showPointLabel = NO;
+    _pointLabelColor = [UIColor blackColor];
+    _pointLabelFormat = @"%1.f";
 }
 @end
--- a/PNChart/PNLineChartDataItem.h 100644 → 100755
View file @4bc3d3f
+++ b/PNChart/PNLineChartDataItem.h 100644 → 100755
View file @4bc3d3f
@@ -9,7 +9,9 @@
 @interface PNLineChartDataItem : NSObject
 + (PNLineChartDataItem *)dataItemWithY:(CGFloat)y;
++ (PNLineChartDataItem *)dataItemWithY:(CGFloat)y andRawY:(CGFloat)rawY;
 @property (readonly) CGFloat y; // should be within the y range
+@property (readonly) CGFloat rawY; // this is the raw value, used for point label.
 @end
--- a/PNChart/PNLineChartDataItem.m 100644 → 100755
View file @4bc3d3f
+++ b/PNChart/PNLineChartDataItem.m 100644 → 100755
View file @4bc3d3f
@@ -7,9 +7,10 @@
 @interface PNLineChartDataItem ()
-- (id)initWithY:(CGFloat)y;
+- (id)initWithY:(CGFloat)y andRawY:(CGFloat)rawY;
-@property (readwrite) CGFloat y; // should be within the y range
+@property (readwrite) CGFloat y;    // should be within the y range
+@property (readwrite) CGFloat rawY; // this is the raw value, used for point label.
 @end
@@ -17,13 +18,18 @@
 + (PNLineChartDataItem *)dataItemWithY:(CGFloat)y
 {
-    return [[PNLineChartDataItem alloc] initWithY:y];
+    return [[PNLineChartDataItem alloc] initWithY:y andRawY:y];
 }
-- (id)initWithY:(CGFloat)y
++ (PNLineChartDataItem *)dataItemWithY:(CGFloat)y andRawY:(CGFloat)rawY {
+    return [[PNLineChartDataItem alloc] initWithY:y andRawY:rawY];
+}
+
+- (id)initWithY:(CGFloat)y andRawY:(CGFloat)rawY
 {
     if ((self = [super init])) {
         self.y = y;
+        self.rawY = rawY;
     }
     return self;