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
 
 

@@ -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,7 +95,7 @@
     
     
     [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) {
@@ -104,7 +104,7 @@
         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{