Macro based distances

@@ -12,6 +12,7 @@
 #define xLabelMargin    15
 #define xLabelMargin    15
 #define yLabelMargin    15
 #define yLabelMargin    15
 #define yLabelHeight    11
 #define yLabelHeight    11
+#define xLabelHeight    20
 
 
 @interface PNBarChart : UIView
 @interface PNBarChart : UIView
 
 

@@ -33,7 +33,7 @@
         _labels              = [NSMutableArray array];
         _labels              = [NSMutableArray array];
         _bars                = [NSMutableArray array];
         _bars                = [NSMutableArray array];
     }
     }
-
+    
     return self;
     return self;
 }
 }
 
 
@@ -41,7 +41,7 @@
 {
 {
     _yValues = yValues;
     _yValues = yValues;
     [self setYLabels:yValues];
     [self setYLabels:yValues];
-
+    
     _xLabelWidth = (self.frame.size.width - chartMargin*2)/[_yValues count];
     _xLabelWidth = (self.frame.size.width - chartMargin*2)/[_yValues count];
 }
 }
 
 
@@ -53,21 +53,21 @@
         if (value > max) {
         if (value > max) {
             max = value;
             max = value;
         }
         }
-
+        
     }
     }
-
+    
     //Min value for Y label
     //Min value for Y label
     if (max < 5) {
     if (max < 5) {
         max = 5;
         max = 5;
     }
     }
-
+    
     _yValueMax = (int)max;
     _yValueMax = (int)max;
 }
 }
 
 
 -(void)setXLabels:(NSArray *)xLabels
 -(void)setXLabels:(NSArray *)xLabels
 {
 {
     _xLabels = xLabels;
     _xLabels = xLabels;
-
+    
     if (_showLabel) {
     if (_showLabel) {
         _xLabelWidth = (self.frame.size.width - chartMargin*2)/[xLabels count];
         _xLabelWidth = (self.frame.size.width - chartMargin*2)/[xLabels count];
     }
     }
@@ -75,7 +75,7 @@
 
 
 -(void)setStrokeColor:(UIColor *)strokeColor
 -(void)setStrokeColor:(UIColor *)strokeColor
 {
 {
-    _strokeColor = strokeColor;
+	_strokeColor = strokeColor;
 }
 }
 
 
 -(void)strokeChart
 -(void)strokeChart
@@ -85,7 +85,7 @@
     for(int index = 0; index < _xLabels.count; index++)
     for(int index = 0; index < _xLabels.count; index++)
     {
     {
         NSString* labelText = _xLabels[index];
         NSString* labelText = _xLabels[index];
-        PNChartLabel * label = [[PNChartLabel alloc] initWithFrame:CGRectMake((index *  _xLabelWidth + chartMargin), self.frame.size.height - 30.0, _xLabelWidth, 20.0)];
+        PNChartLabel * label = [[PNChartLabel alloc] initWithFrame:CGRectMake((index *  _xLabelWidth + chartMargin), self.frame.size.height - xLabelHeight - chartMargin, _xLabelWidth, xLabelHeight)];
         [label setTextAlignment:NSTextAlignmentCenter];
         [label setTextAlignment:NSTextAlignmentCenter];
         label.text = labelText;
         label.text = labelText;
         [_labels addObject:label];
         [_labels addObject:label];
@@ -95,16 +95,16 @@
     
     
     [self viewCleanupForCollection:_bars];
     [self viewCleanupForCollection:_bars];
     
     
-    CGFloat chartCavanHeight = self.frame.size.height - chartMargin * 2 - 40.0;
+    CGFloat chartCavanHeight = self.frame.size.height - chartMargin*2 - xLabelHeight*2;
     NSInteger index = 0;
     NSInteger index = 0;
     
     
     for (NSString * valueString in _yValues) {
     for (NSString * valueString in _yValues) {
         float value = [valueString floatValue];
         float value = [valueString floatValue];
-
+        
         float grade = (float)value / (float)_yValueMax;
         float grade = (float)value / (float)_yValueMax;
         PNBar * bar;
         PNBar * bar;
         if (_showLabel) {
         if (_showLabel) {
-            bar = [[PNBar alloc] initWithFrame:CGRectMake((index *  _xLabelWidth + chartMargin + _xLabelWidth * 0.25), self.frame.size.height - chartCavanHeight - 30.0, _xLabelWidth * 0.5, chartCavanHeight)];
+            bar = [[PNBar alloc] initWithFrame:CGRectMake((index *  _xLabelWidth + chartMargin + _xLabelWidth * 0.25), self.frame.size.height - chartCavanHeight - xLabelHeight - chartMargin, _xLabelWidth * 0.5, chartCavanHeight)];
             
             
         }
         }
         else{
         else{
@@ -115,7 +115,7 @@
         bar.grade = grade;
         bar.grade = grade;
         [_bars addObject:bar];
         [_bars addObject:bar];
         [self addSubview:bar];
         [self addSubview:bar];
-
+        
         index += 1;
         index += 1;
     }
     }
 }
 }