Merge pull request #178 from antoninbiret/master

Fix #177

@@ -11,10 +11,10 @@
 #import "PNChartDelegate.h"
 #import "PNChartDelegate.h"
 #import "PNBar.h"
 #import "PNBar.h"
 
 
-#define xLabelMargin 15
-#define yLabelMargin 15
-#define yLabelHeight 11
-#define xLabelHeight 20
+#define kXLabelMargin 15
+#define kYLabelMargin 15
+#define kYLabelHeight 11
+#define kXLabelHeight 20
 
 
 typedef NSString *(^PNYLabelFormatter)(CGFloat yLabelValue);
 typedef NSString *(^PNYLabelFormatter)(CGFloat yLabelValue);
 
 

@@ -87,16 +87,16 @@
     if (_showLabel) {
     if (_showLabel) {
         //Add y labels
         //Add y labels
         
         
-        float yLabelSectionHeight = (self.frame.size.height - _chartMargin * 2 - xLabelHeight) / _yLabelSum;
+        float yLabelSectionHeight = (self.frame.size.height - _chartMargin * 2 - kXLabelHeight) / _yLabelSum;
         
         
         for (int index = 0; index < _yLabelSum; index++) {
         for (int index = 0; index < _yLabelSum; index++) {
             
             
             NSString *labelText = _yLabelFormatter((float)_yValueMax * ( (_yLabelSum - index) / (float)_yLabelSum ));
             NSString *labelText = _yLabelFormatter((float)_yValueMax * ( (_yLabelSum - index) / (float)_yLabelSum ));
             
             
             PNChartLabel * label = [[PNChartLabel alloc] initWithFrame:CGRectMake(0,
             PNChartLabel * label = [[PNChartLabel alloc] initWithFrame:CGRectMake(0,
-                                                                                  yLabelSectionHeight * index + _chartMargin - yLabelHeight/2.0,
+                                                                                  yLabelSectionHeight * index + _chartMargin - kYLabelHeight/2.0,
                                                                                   _yChartLabelWidth,
                                                                                   _yChartLabelWidth,
-                                                                                  yLabelHeight)];
+                                                                                  kYLabelHeight)];
             label.font = _labelFont;
             label.font = _labelFont;
             label.textColor = _labelTextColor;
             label.textColor = _labelTextColor;
             [label setTextAlignment:NSTextAlignmentRight];
             [label setTextAlignment:NSTextAlignmentRight];
@@ -144,7 +144,7 @@
             
             
             if (labelAddCount == _xLabelSkip) {
             if (labelAddCount == _xLabelSkip) {
                 NSString *labelText = [_xLabels[index] description];
                 NSString *labelText = [_xLabels[index] description];
-                PNChartLabel * label = [[PNChartLabel alloc] initWithFrame:CGRectMake(0, 0, _xLabelWidth, xLabelHeight)];
+                PNChartLabel * label = [[PNChartLabel alloc] initWithFrame:CGRectMake(0, 0, _xLabelWidth, kXLabelHeight)];
                 label.font = _labelFont;
                 label.font = _labelFont;
                 label.textColor = _labelTextColor;
                 label.textColor = _labelTextColor;
                 [label setTextAlignment:NSTextAlignmentCenter];
                 [label setTextAlignment:NSTextAlignmentCenter];
@@ -159,7 +159,7 @@
                     labelXPosition = (index *  _xLabelWidth + _chartMargin + _xLabelWidth /2.0 );
                     labelXPosition = (index *  _xLabelWidth + _chartMargin + _xLabelWidth /2.0 );
                 }
                 }
                 label.center = CGPointMake(labelXPosition,
                 label.center = CGPointMake(labelXPosition,
-                                           self.frame.size.height - xLabelHeight - _chartMargin + label.frame.size.height /2.0 + _labelMarginTop);
+                                           self.frame.size.height - kXLabelHeight - _chartMargin + label.frame.size.height /2.0 + _labelMarginTop);
                 labelAddCount = 0;
                 labelAddCount = 0;
                 
                 
                 [_xChartLabels addObject:label];
                 [_xChartLabels addObject:label];
@@ -179,7 +179,7 @@
 {
 {
     
     
     //Add bars
     //Add bars
-    CGFloat chartCavanHeight = self.frame.size.height - _chartMargin * 2 - xLabelHeight;
+    CGFloat chartCavanHeight = self.frame.size.height - _chartMargin * 2 - kXLabelHeight;
     NSInteger index = 0;
     NSInteger index = 0;
     
     
     for (NSNumber *valueString in _yValues) {
     for (NSNumber *valueString in _yValues) {
@@ -208,7 +208,7 @@
             }
             }
             
             
             bar = [[PNBar alloc] initWithFrame:CGRectMake(barXPosition, //Bar X position
             bar = [[PNBar alloc] initWithFrame:CGRectMake(barXPosition, //Bar X position
-                                                          self.frame.size.height - chartCavanHeight - xLabelHeight - _chartMargin, //Bar Y position
+                                                          self.frame.size.height - chartCavanHeight - kXLabelHeight - _chartMargin, //Bar Y position
                                                           barWidth, // Bar witdh
                                                           barWidth, // Bar witdh
                                                           chartCavanHeight)]; //Bar height
                                                           chartCavanHeight)]; //Bar height
             
             
@@ -270,8 +270,8 @@
 
 
         UIBezierPath *progressline = [UIBezierPath bezierPath];
         UIBezierPath *progressline = [UIBezierPath bezierPath];
 
 
-        [progressline moveToPoint:CGPointMake(_chartMargin, self.frame.size.height - xLabelHeight - _chartMargin)];
-        [progressline addLineToPoint:CGPointMake(self.frame.size.width - _chartMargin,  self.frame.size.height - xLabelHeight - _chartMargin)];
+        [progressline moveToPoint:CGPointMake(_chartMargin, self.frame.size.height - kXLabelHeight - _chartMargin)];
+        [progressline addLineToPoint:CGPointMake(self.frame.size.width - _chartMargin,  self.frame.size.height - kXLabelHeight - _chartMargin)];
 
 
         [progressline setLineWidth:1.0];
         [progressline setLineWidth:1.0];
         [progressline setLineCapStyle:kCGLineCapSquare];
         [progressline setLineCapStyle:kCGLineCapSquare];
@@ -302,7 +302,7 @@
 
 
         UIBezierPath *progressLeftline = [UIBezierPath bezierPath];
         UIBezierPath *progressLeftline = [UIBezierPath bezierPath];
 
 
-        [progressLeftline moveToPoint:CGPointMake(_chartMargin, self.frame.size.height - xLabelHeight - _chartMargin)];
+        [progressLeftline moveToPoint:CGPointMake(_chartMargin, self.frame.size.height - kXLabelHeight - _chartMargin)];
         [progressLeftline addLineToPoint:CGPointMake(_chartMargin,  _chartMargin)];
         [progressLeftline addLineToPoint:CGPointMake(_chartMargin,  _chartMargin)];
 
 
         [progressLeftline setLineWidth:1.0];
         [progressLeftline setLineWidth:1.0];

@@ -7,6 +7,7 @@
 //
 //
 
 
 #import <Foundation/Foundation.h>
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 
 /*
 /*
  *  System Versioning Preprocessor Macros
  *  System Versioning Preprocessor Macros

@@ -7,6 +7,7 @@
 //
 //
 
 
 #import "PNColor.h"
 #import "PNColor.h"
+#import <UIKit/UIKit.h>
 
 
 @implementation PNColor
 @implementation PNColor
 
 

@@ -4,6 +4,7 @@
 //
 //
 
 
 #import <Foundation/Foundation.h>
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 
 typedef NS_ENUM(NSUInteger, PNLineChartPointStyle) {
 typedef NS_ENUM(NSUInteger, PNLineChartPointStyle) {
     PNLineChartPointStyleNone = 0,
     PNLineChartPointStyleNone = 0,

@@ -4,7 +4,7 @@
 //
 //
 
 
 #import <Foundation/Foundation.h>
 #import <Foundation/Foundation.h>
-
+#import <UIKit/UIKit.h>
 
 
 @interface PNLineChartDataItem : NSObject
 @interface PNLineChartDataItem : NSObject
 
 

@@ -7,6 +7,7 @@
 //
 //
 
 
 #import <Foundation/Foundation.h>
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 
 @interface PNPieChartDataItem : NSObject
 @interface PNPieChartDataItem : NSObject
 
 

@@ -7,6 +7,7 @@
 //
 //
 
 
 #import "PNPieChartDataItem.h"
 #import "PNPieChartDataItem.h"
+#import <UIKit/UIKit.h>
 
 
 @implementation PNPieChartDataItem
 @implementation PNPieChartDataItem
 
 

@@ -7,6 +7,7 @@
 //
 //
 
 
 #import <Foundation/Foundation.h>
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 
 typedef NS_ENUM(NSUInteger, PNScatterChartPointStyle) {
 typedef NS_ENUM(NSUInteger, PNScatterChartPointStyle) {
     PNScatterChartPointStyleCircle = 0,
     PNScatterChartPointStyleCircle = 0,

@@ -7,6 +7,7 @@
 //
 //
 
 
 #import <Foundation/Foundation.h>
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 
 @interface PNScatterChartDataItem : NSObject
 @interface PNScatterChartDataItem : NSObject