Merge pull request #229 from thedazed/master

Add prefix/suffix public property for y label values

@@ -46,6 +46,12 @@ typedef NSString *(^PNYLabelFormatter)(CGFloat yLabelValue);
 /** Formats the ylabel text. */
 /** Formats the ylabel text. */
 @property (copy) PNYLabelFormatter yLabelFormatter;
 @property (copy) PNYLabelFormatter yLabelFormatter;
 
 
+/** Prefix to y label values, none if unset. */
+@property (nonatomic) NSString *yLabelPrefix;
+
+/** Suffix to y label values, none if unset. */
+@property (nonatomic) NSString *yLabelSuffix;
+
 @property (nonatomic) CGFloat chartMargin;
 @property (nonatomic) CGFloat chartMargin;
 
 
 /** Controls whether labels should be displayed. */
 /** Controls whether labels should be displayed. */

@@ -119,7 +119,7 @@
     label.font = _labelFont;
     label.font = _labelFont;
     label.textColor = _labelTextColor;
     label.textColor = _labelTextColor;
     [label setTextAlignment:NSTextAlignmentRight];
     [label setTextAlignment:NSTextAlignmentRight];
-    label.text = labelText;
+    label.text = [NSString stringWithFormat:@"%@%@%@", _yLabelPrefix, labelText, _yLabelSuffix];
     [self addSubview:label];
     [self addSubview:label];
     
     
     [_yChartLabels addObject:label];
     [_yChartLabels addObject:label];

@@ -38,6 +38,9 @@
 /** Show absolute values not relative i.e. percentages */
 /** Show absolute values not relative i.e. percentages */
 @property (nonatomic) BOOL showAbsoluteValues;
 @property (nonatomic) BOOL showAbsoluteValues;
 
 
+/** Default YES. */
+@property (nonatomic) BOOL shouldHighlightSectorOnTouch;
+
 @property (nonatomic, weak) id<PNChartDelegate> delegate;
 @property (nonatomic, weak) id<PNChartDelegate> delegate;
 
 
 - (void)strokeChart;
 - (void)strokeChart;

@@ -56,6 +56,7 @@
         _descriptionTextShadowColor  = [[UIColor blackColor] colorWithAlphaComponent:0.4];
         _descriptionTextShadowColor  = [[UIColor blackColor] colorWithAlphaComponent:0.4];
         _descriptionTextShadowOffset =  CGSizeMake(0, 1);
         _descriptionTextShadowOffset =  CGSizeMake(0, 1);
         _duration = 1.0;
         _duration = 1.0;
+        _shouldHighlightSectorOnTouch = YES;
         
         
         [super setupDefaultValues];
         [super setupDefaultValues];
         [self loadDefault];
         [self loadDefault];
@@ -277,26 +278,30 @@
         [self.delegate userClickedOnPieIndexItem:index];
         [self.delegate userClickedOnPieIndexItem:index];
     }
     }
     
     
-    if (self.sectorHighlight) {
-        [self.sectorHighlight removeFromSuperlayer];
+    if (self.shouldHighlightSectorOnTouch) {
+        
+        if (self.sectorHighlight) {
+            [self.sectorHighlight removeFromSuperlayer];
+        }
+        
+        PNPieChartDataItem *currentItem = [self dataItemForIndex:index];
+        
+        CGFloat red,green,blue,alpha;
+        UIColor *old = currentItem.color;
+        [old getRed:&red green:&green blue:&blue alpha:&alpha];
+        alpha /= 2;
+        UIColor *newColor = [UIColor colorWithRed:red green:green blue:blue alpha:alpha];
+        
+        CGFloat startPercnetage = [self startPercentageForItemAtIndex:index];
+        CGFloat endPercentage   = [self endPercentageForItemAtIndex:index];
+        self.sectorHighlight =	[self newCircleLayerWithRadius:_outerCircleRadius + 5
+                                                  borderWidth:10
+                                                    fillColor:[UIColor clearColor]
+                                                  borderColor:newColor
+                                              startPercentage:startPercnetage
+                                                endPercentage:endPercentage];
+        [_contentView.layer addSublayer:self.sectorHighlight];
     }
     }
-    PNPieChartDataItem *currentItem = [self dataItemForIndex:index];
-    
-    CGFloat red,green,blue,alpha;
-    UIColor *old = currentItem.color;
-    [old getRed:&red green:&green blue:&blue alpha:&alpha];
-    alpha /= 2;
-    UIColor *newColor = [UIColor colorWithRed:red green:green blue:blue alpha:alpha];
-    
-    CGFloat startPercnetage = [self startPercentageForItemAtIndex:index];
-    CGFloat endPercentage   = [self endPercentageForItemAtIndex:index];
-    self.sectorHighlight =	[self newCircleLayerWithRadius:_outerCircleRadius + 5
-                                              borderWidth:10
-                                                fillColor:[UIColor clearColor]
-                                              borderColor:newColor
-                                          startPercentage:startPercnetage
-                                            endPercentage:endPercentage];
-    [_contentView.layer addSublayer:self.sectorHighlight];
 }
 }
 
 
 - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
 - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event