Oleg Anghelov

adding views to corresponding arrays

@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 _labels = [NSMutableArray array]; 33 _labels = [NSMutableArray array];
34 _bars = [NSMutableArray array]; 34 _bars = [NSMutableArray array];
35 } 35 }
36 - 36 +
37 return self; 37 return self;
38 } 38 }
39 39
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 { 41 {
42 _yValues = yValues; 42 _yValues = yValues;
43 [self setYLabels:yValues]; 43 [self setYLabels:yValues];
44 - 44 +
45 _xLabelWidth = (self.frame.size.width - chartMargin*2)/[_yValues count]; 45 _xLabelWidth = (self.frame.size.width - chartMargin*2)/[_yValues count];
46 } 46 }
47 47
@@ -53,37 +53,38 @@ @@ -53,37 +53,38 @@
53 if (value > max) { 53 if (value > max) {
54 max = value; 54 max = value;
55 } 55 }
56 - 56 +
57 } 57 }
58 - 58 +
59 //Min value for Y label 59 //Min value for Y label
60 if (max < 5) { 60 if (max < 5) {
61 max = 5; 61 max = 5;
62 } 62 }
63 - 63 +
64 _yValueMax = (int)max; 64 _yValueMax = (int)max;
65 - 65 +
66 - 66 +
67 } 67 }
68 68
69 -(void)setXLabels:(NSArray *)xLabels 69 -(void)setXLabels:(NSArray *)xLabels
70 { 70 {
71 [self viewCleanupForCollection:_labels]; 71 [self viewCleanupForCollection:_labels];
72 _xLabels = xLabels; 72 _xLabels = xLabels;
73 - 73 +
74 if (_showLabel) { 74 if (_showLabel) {
75 _xLabelWidth = (self.frame.size.width - chartMargin*2)/[xLabels count]; 75 _xLabelWidth = (self.frame.size.width - chartMargin*2)/[xLabels count];
76 - 76 +
77 for(int index = 0; index < xLabels.count; index++) 77 for(int index = 0; index < xLabels.count; index++)
78 { 78 {
79 NSString* labelText = xLabels[index]; 79 NSString* labelText = xLabels[index];
80 PNChartLabel * label = [[PNChartLabel alloc] initWithFrame:CGRectMake((index * _xLabelWidth + chartMargin), self.frame.size.height - 30.0, _xLabelWidth, 20.0)]; 80 PNChartLabel * label = [[PNChartLabel alloc] initWithFrame:CGRectMake((index * _xLabelWidth + chartMargin), self.frame.size.height - 30.0, _xLabelWidth, 20.0)];
81 [label setTextAlignment:NSTextAlignmentCenter]; 81 [label setTextAlignment:NSTextAlignmentCenter];
82 label.text = labelText; 82 label.text = labelText;
  83 + [_labels addObject:label];
83 [self addSubview:label]; 84 [self addSubview:label];
84 } 85 }
85 } 86 }
86 - 87 +
87 } 88 }
88 89
89 -(void)setStrokeColor:(UIColor *)strokeColor 90 -(void)setStrokeColor:(UIColor *)strokeColor
@@ -96,10 +97,10 @@ @@ -96,10 +97,10 @@
96 [self viewCleanupForCollection:_bars]; 97 [self viewCleanupForCollection:_bars];
97 CGFloat chartCavanHeight = self.frame.size.height - chartMargin * 2 - 40.0; 98 CGFloat chartCavanHeight = self.frame.size.height - chartMargin * 2 - 40.0;
98 NSInteger index = 0; 99 NSInteger index = 0;
99 - 100 +
100 for (NSString * valueString in _yValues) { 101 for (NSString * valueString in _yValues) {
101 float value = [valueString floatValue]; 102 float value = [valueString floatValue];
102 - 103 +
103 float grade = (float)value / (float)_yValueMax; 104 float grade = (float)value / (float)_yValueMax;
104 PNBar * bar; 105 PNBar * bar;
105 if (_showLabel) { 106 if (_showLabel) {
@@ -110,8 +111,9 @@ @@ -110,8 +111,9 @@
110 bar.backgroundColor = _barBackgroundColor; 111 bar.backgroundColor = _barBackgroundColor;
111 bar.barColor = [self barColorAtIndex:index]; 112 bar.barColor = [self barColorAtIndex:index];
112 bar.grade = grade; 113 bar.grade = grade;
  114 + [_bars addObject:bar];
113 [self addSubview:bar]; 115 [self addSubview:bar];
114 - 116 +
115 index += 1; 117 index += 1;
116 } 118 }
117 } 119 }
@@ -135,4 +137,4 @@ @@ -135,4 +137,4 @@
135 } 137 }
136 } 138 }
137 139
138 -@end 140 +@end