Merge pull request #159 from lunzii/master

Add setAxisXLabel/setAxisYLabel

@@ -24,7 +24,8 @@
 @property (nonatomic) UIColor *axisColor;
 @property (nonatomic) UIColor *axisColor;
 @property (nonatomic) CGFloat axisWidth;
 @property (nonatomic) CGFloat axisWidth;
 
 
-/** String formatter for float values in y-axis labels. If not set, defaults to @"%1.f" */
+/** String formatter for float values in x-axis/y-axis labels. If not set, defaults to @"%1.f" */
+@property (nonatomic, strong) NSString *xLabelFormat;
 @property (nonatomic, strong) NSString *yLabelFormat;
 @property (nonatomic, strong) NSString *yLabelFormat;
 
 
 /** Default is true. */
 /** Default is true. */
@@ -53,6 +54,8 @@
 
 
 - (void) setAxisXWithMinimumValue:(CGFloat)minVal andMaxValue:(CGFloat)maxVal toTicks:(int)numberOfTicks;
 - (void) setAxisXWithMinimumValue:(CGFloat)minVal andMaxValue:(CGFloat)maxVal toTicks:(int)numberOfTicks;
 - (void) setAxisYWithMinimumValue:(CGFloat)minVal andMaxValue:(CGFloat)maxVal toTicks:(int)numberOfTicks;
 - (void) setAxisYWithMinimumValue:(CGFloat)minVal andMaxValue:(CGFloat)maxVal toTicks:(int)numberOfTicks;
+- (void) setAxisXLabel:(NSArray *)array;
+- (void) setAxisYLabel:(NSArray *)array;
 - (void) setup;
 - (void) setup;
 - (void) drawLineFromPoint : (CGPoint) startPoint ToPoint : (CGPoint) endPoint WithLineWith : (CGFloat) lineWidth AndWithColor : (UIColor*) color;
 - (void) drawLineFromPoint : (CGPoint) startPoint ToPoint : (CGPoint) endPoint WithLineWith : (CGFloat) lineWidth AndWithColor : (UIColor*) color;
 
 

@@ -123,7 +123,7 @@
     _AxisX_partNumber = numberOfTicks - 1;
     _AxisX_partNumber = numberOfTicks - 1;
     _AxisX_step = (float)((maxVal - minVal)/_AxisX_partNumber);
     _AxisX_step = (float)((maxVal - minVal)/_AxisX_partNumber);
     
     
-    NSString *LabelFormat = self.yLabelFormat ? : @"%1.f";
+    NSString *LabelFormat = self.xLabelFormat ? : @"%1.f";
     CGFloat tempValue = minVal ;
     CGFloat tempValue = minVal ;
     UILabel *label = [[UILabel alloc] init];
     UILabel *label = [[UILabel alloc] init];
     label.text = [NSString stringWithFormat:LabelFormat,minVal] ;
     label.text = [NSString stringWithFormat:LabelFormat,minVal] ;
@@ -156,6 +156,28 @@
     }
     }
 }
 }
 
 
+- (void)setAxisXLabel:(NSArray *)array {
+    if(array.count == ++_AxisX_partNumber){
+        [_axisX_labels removeAllObjects];
+        for(int i=0;i<array.count;i++){
+            UILabel *label = [[UILabel alloc] init];
+            label.text = [array objectAtIndex:i];
+            [_axisX_labels addObject:label];
+        }
+    }
+}
+
+- (void)setAxisYLabel:(NSArray *)array {
+    if(array.count == ++_AxisY_partNumber){
+        [_axisY_labels removeAllObjects];
+        for(int i=0;i<array.count;i++){
+            UILabel *label = [[UILabel alloc] init];
+            label.text = [array objectAtIndex:i];
+            [_axisY_labels addObject:label];
+        }
+    }
+}
+
 - (void) vectorXSetup
 - (void) vectorXSetup
 {
 {
     _AxisX_partNumber += 1;
     _AxisX_partNumber += 1;

@@ -129,8 +129,11 @@
         self.titleLabel.text = @"Scatter Chart";
         self.titleLabel.text = @"Scatter Chart";
         
         
         self.scatterChart = [[PNScatterChart alloc] initWithFrame:CGRectMake(SCREEN_WIDTH /6.0 - 30, 135, 280, 200)];
         self.scatterChart = [[PNScatterChart alloc] initWithFrame:CGRectMake(SCREEN_WIDTH /6.0 - 30, 135, 280, 200)];
+//        self.scatterChart.yLabelFormat = @"xxx %1.1f";
         [self.scatterChart setAxisXWithMinimumValue:20 andMaxValue:100 toTicks:6];
         [self.scatterChart setAxisXWithMinimumValue:20 andMaxValue:100 toTicks:6];
         [self.scatterChart setAxisYWithMinimumValue:30 andMaxValue:50 toTicks:5];
         [self.scatterChart setAxisYWithMinimumValue:30 andMaxValue:50 toTicks:5];
+        [self.scatterChart setAxisXLabel:@[@"x1", @"x2", @"x3", @"x4", @"x5", @"x6"]];
+        [self.scatterChart setAxisYLabel:@[@"y1", @"y2", @"y3", @"y4", @"y5"]];
 
 
         NSArray * data01Array = [self randomSetOfObjects];
         NSArray * data01Array = [self randomSetOfObjects];
         PNScatterChartData *data01 = [PNScatterChartData new];
         PNScatterChartData *data01 = [PNScatterChartData new];
@@ -141,6 +144,7 @@
         data01.inflexionPointStyle = PNScatterChartPointStyleCircle;
         data01.inflexionPointStyle = PNScatterChartPointStyleCircle;
         __block NSMutableArray *XAr1 = [NSMutableArray arrayWithArray:[data01Array objectAtIndex:0]];
         __block NSMutableArray *XAr1 = [NSMutableArray arrayWithArray:[data01Array objectAtIndex:0]];
         __block NSMutableArray *YAr1 = [NSMutableArray arrayWithArray:[data01Array objectAtIndex:1]];
         __block NSMutableArray *YAr1 = [NSMutableArray arrayWithArray:[data01Array objectAtIndex:1]];
+
         data01.getData = ^(NSUInteger index) {
         data01.getData = ^(NSUInteger index) {
             CGFloat xValue = [[XAr1 objectAtIndex:index] floatValue];
             CGFloat xValue = [[XAr1 objectAtIndex:index] floatValue];
             CGFloat yValue = [[YAr1 objectAtIndex:index] floatValue];
             CGFloat yValue = [[YAr1 objectAtIndex:index] floatValue];