kevin

Fix Line Chart x labels position and size

@@ -11,7 +11,6 @@ @@ -11,7 +11,6 @@
11 #import <QuartzCore/QuartzCore.h> 11 #import <QuartzCore/QuartzCore.h>
12 12
13 #define chartMargin 10 13 #define chartMargin 10
14 -#define xLabelMargin 15  
15 #define yLabelMargin 15 14 #define yLabelMargin 15
16 #define yLabelHeight 11 15 #define yLabelHeight 11
17 16
@@ -75,11 +75,11 @@ @@ -75,11 +75,11 @@
75 -(void)setXLabels:(NSArray *)xLabels 75 -(void)setXLabels:(NSArray *)xLabels
76 { 76 {
77 _xLabels = xLabels; 77 _xLabels = xLabels;
78 - _xLabelWidth = (self.frame.size.width - chartMargin - 30.0 - ([xLabels count] -1) * xLabelMargin)/[xLabels count]; 78 + _xLabelWidth = (self.frame.size.width - chartMargin - 30.0)/[xLabels count];
79 79
80 for (NSString * labelText in xLabels) { 80 for (NSString * labelText in xLabels) {
81 NSInteger index = [xLabels indexOfObject:labelText]; 81 NSInteger index = [xLabels indexOfObject:labelText];
82 - PNChartLabel * label = [[PNChartLabel alloc] initWithFrame:CGRectMake(index * (xLabelMargin + _xLabelWidth) + 30.0, self.frame.size.height - 30.0, _xLabelWidth, 20.0)]; 82 + PNChartLabel * label = [[PNChartLabel alloc] initWithFrame:CGRectMake(index * _xLabelWidth + 30.0, self.frame.size.height - 30.0, _xLabelWidth, 20.0)];
83 [label setTextAlignment:NSTextAlignmentCenter]; 83 [label setTextAlignment:NSTextAlignmentCenter];
84 label.text = labelText; 84 label.text = labelText;
85 [self addSubview:label]; 85 [self addSubview:label];
@@ -101,7 +101,7 @@ @@ -101,7 +101,7 @@
101 101
102 CGFloat firstValue = [[_yValues objectAtIndex:0] floatValue]; 102 CGFloat firstValue = [[_yValues objectAtIndex:0] floatValue];
103 103
104 - CGFloat xPosition = (xLabelMargin + _xLabelWidth) ; 104 + CGFloat xPosition = _xLabelWidth ;
105 105
106 CGFloat chartCavanHeight = self.frame.size.height - chartMargin * 2 - 40.0; 106 CGFloat chartCavanHeight = self.frame.size.height - chartMargin * 2 - 40.0;
107 107