Merge branch 'multiple-selection' of https://github.com/jerrygdm/PNChart into je…

…rrygdm-multiple-selection

@@ -46,6 +46,9 @@
 
 
 @property (nonatomic, weak) id<PNChartDelegate> delegate;
 @property (nonatomic, weak) id<PNChartDelegate> delegate;
 
 
+/** Multiple selection */
+@property (nonatomic, assign) BOOL enableMultipleSelection;
+
 - (void)strokeChart;
 - (void)strokeChart;
 
 
 @end
 @end

@@ -23,6 +23,8 @@
 @property (nonatomic) NSMutableArray *descriptionLabels;
 @property (nonatomic) NSMutableArray *descriptionLabels;
 @property (strong, nonatomic) CAShapeLayer *sectorHighlight;
 @property (strong, nonatomic) CAShapeLayer *sectorHighlight;
 
 
+@property (nonatomic, strong) NSMutableDictionary *selectedItems;
+
 - (void)loadDefault;
 - (void)loadDefault;
 
 
 - (UILabel *)descriptionLabelForItemAtIndex:(NSUInteger)index;
 - (UILabel *)descriptionLabelForItemAtIndex:(NSUInteger)index;
@@ -48,6 +50,7 @@
     self = [self initWithFrame:frame];
     self = [self initWithFrame:frame];
     if(self){
     if(self){
         _items = [NSArray arrayWithArray:items];
         _items = [NSArray arrayWithArray:items];
+        _selectedItems = [NSMutableDictionary dictionary];
         _outerCircleRadius  = CGRectGetWidth(self.bounds) / 2;
         _outerCircleRadius  = CGRectGetWidth(self.bounds) / 2;
         _innerCircleRadius  = CGRectGetWidth(self.bounds) / 6;
         _innerCircleRadius  = CGRectGetWidth(self.bounds) / 6;
         
         
@@ -57,6 +60,7 @@
         _descriptionTextShadowOffset =  CGSizeMake(0, 1);
         _descriptionTextShadowOffset =  CGSizeMake(0, 1);
         _duration = 1.0;
         _duration = 1.0;
         _shouldHighlightSectorOnTouch = YES;
         _shouldHighlightSectorOnTouch = YES;
+        _enableMultipleSelection = NO;
         
         
         [super setupDefaultValues];
         [super setupDefaultValues];
         [self loadDefault];
         [self loadDefault];
@@ -279,15 +283,17 @@
     while (percentage > [self endPercentageForItemAtIndex:index]) {
     while (percentage > [self endPercentageForItemAtIndex:index]) {
         index ++;
         index ++;
     }
     }
-
+    
     if ([self.delegate respondsToSelector:@selector(userClickedOnPieIndexItem:)]) {
     if ([self.delegate respondsToSelector:@selector(userClickedOnPieIndexItem:)]) {
         [self.delegate userClickedOnPieIndexItem:index];
         [self.delegate userClickedOnPieIndexItem:index];
     }
     }
     
     
-    if (self.shouldHighlightSectorOnTouch) {
-        
-        if (self.sectorHighlight) {
-            [self.sectorHighlight removeFromSuperlayer];
+    if (self.shouldHighlightSectorOnTouch)
+    {
+        if (!self.enableMultipleSelection)
+        {
+            if (self.sectorHighlight)
+                [self.sectorHighlight removeFromSuperlayer];
         }
         }
         
         
         PNPieChartDataItem *currentItem = [self dataItemForIndex:index];
         PNPieChartDataItem *currentItem = [self dataItemForIndex:index];
@@ -300,13 +306,33 @@
         
         
         CGFloat startPercnetage = [self startPercentageForItemAtIndex:index];
         CGFloat startPercnetage = [self startPercentageForItemAtIndex:index];
         CGFloat endPercentage   = [self endPercentageForItemAtIndex:index];
         CGFloat endPercentage   = [self endPercentageForItemAtIndex:index];
-        self.sectorHighlight =	[self newCircleLayerWithRadius:_outerCircleRadius + 5
+        
+        self.sectorHighlight = [self newCircleLayerWithRadius:_outerCircleRadius + 5
                                                   borderWidth:10
                                                   borderWidth:10
                                                     fillColor:[UIColor clearColor]
                                                     fillColor:[UIColor clearColor]
                                                   borderColor:newColor
                                                   borderColor:newColor
                                               startPercentage:startPercnetage
                                               startPercentage:startPercnetage
                                                 endPercentage:endPercentage];
                                                 endPercentage:endPercentage];
-        [_contentView.layer addSublayer:self.sectorHighlight];
+        
+        if (self.enableMultipleSelection)
+        {
+            NSString *dictIndex = [NSString stringWithFormat:@"%d", index];
+            CAShapeLayer *indexShape = [self.selectedItems valueForKey:dictIndex];
+            if (indexShape)
+            {
+                [indexShape removeFromSuperlayer];
+                [self.selectedItems removeObjectForKey:dictIndex];
+            }
+            else
+            {
+                [self.selectedItems setObject:self.sectorHighlight forKey:dictIndex];
+                [_contentView.layer addSublayer:self.sectorHighlight];
+            }
+        }
+        else
+        {
+            [_contentView.layer addSublayer:self.sectorHighlight];
+        }
     }
     }
 }
 }
 
 
@@ -397,7 +423,7 @@
         x += self.legendStyle == PNLegendItemStyleStacked ? 0 : labelsize.width + beforeLabel;
         x += self.legendStyle == PNLegendItemStyleStacked ? 0 : labelsize.width + beforeLabel;
         y += self.legendStyle == PNLegendItemStyleStacked ? labelsize.height : 0;
         y += self.legendStyle == PNLegendItemStyleStacked ? labelsize.height : 0;
         
         
-
+        
         totalHeight = self.legendStyle == PNLegendItemStyleSerial ? fmaxf(totalHeight, rowMaxHeight + y) : totalHeight + labelsize.height;
         totalHeight = self.legendStyle == PNLegendItemStyleSerial ? fmaxf(totalHeight, rowMaxHeight + y) : totalHeight + labelsize.height;
         [legendViews addObject:label];
         [legendViews addObject:label];
         counter ++;
         counter ++;
@@ -422,7 +448,7 @@
     CGContextRef context = UIGraphicsGetCurrentContext();
     CGContextRef context = UIGraphicsGetCurrentContext();
     
     
     CGContextAddArc(context, size/2, size/ 2, size/2, 0, M_PI*2, YES);
     CGContextAddArc(context, size/2, size/ 2, size/2, 0, M_PI*2, YES);
-
+    
     
     
     //Set some fill color
     //Set some fill color
     CGContextSetFillColorWithColor(context, color.CGColor);
     CGContextSetFillColorWithColor(context, color.CGColor);

-<?xml version='1.0' encoding='UTF-8'?><Workspace version='1.0'><FileRef location='group:PNChartDemo.xcodeproj'/><FileRef location='group:Pods/Pods.xcodeproj'/></Workspace>
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:PNChartDemo.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
+</Workspace>

@@ -25,12 +25,13 @@
 @property (weak, nonatomic) IBOutlet UIButton *changeValueButton;
 @property (weak, nonatomic) IBOutlet UIButton *changeValueButton;
 
 
 @property (weak, nonatomic) IBOutlet UISwitch *leftSwitch;
 @property (weak, nonatomic) IBOutlet UISwitch *leftSwitch;
+@property (weak, nonatomic) IBOutlet UISwitch *centerSwitch;
 @property (weak, nonatomic) IBOutlet UISwitch *rightSwitch;
 @property (weak, nonatomic) IBOutlet UISwitch *rightSwitch;
 @property (weak, nonatomic) IBOutlet UILabel *leftLabel;
 @property (weak, nonatomic) IBOutlet UILabel *leftLabel;
 @property (weak, nonatomic) IBOutlet UILabel *rightLabel;
 @property (weak, nonatomic) IBOutlet UILabel *rightLabel;
 
 
 - (IBAction)rightSwitchChanged:(id)sender;
 - (IBAction)rightSwitchChanged:(id)sender;
 - (IBAction)leftSwitchChanged:(id)sender;
 - (IBAction)leftSwitchChanged:(id)sender;
-
+- (IBAction)rightSwitchChanged:(id)sender;
 
 
 @end
 @end

@@ -344,6 +344,15 @@
     }
     }
 }
 }
 
 
+- (IBAction)centerSwitchChanged:(id)sender
+{
+    if (self.pieChart)
+    {
+        [self.pieChart setEnableMultipleSelection:self.centerSwitch.on];
+        [self.pieChart strokeChart];
+    }
+}
+
 - (IBAction)leftSwitchChanged:(id)sender {
 - (IBAction)leftSwitchChanged:(id)sender {
     if ([self.title isEqualToString:@"Pie Chart"]){
     if ([self.title isEqualToString:@"Pie Chart"]){
         UISwitch *showRelative = (UISwitch*) sender;
         UISwitch *showRelative = (UISwitch*) sender;

 PODS:
 PODS:
-  - Expecta (0.4.2)
+  - Expecta (1.0.2)
   - UICountingLabel (1.2.0)
   - UICountingLabel (1.2.0)
 
 
 DEPENDENCIES:
 DEPENDENCIES:
@@ -7,7 +7,7 @@ DEPENDENCIES:
   - UICountingLabel (~> 1.2.0)
   - UICountingLabel (~> 1.2.0)
 
 
 SPEC CHECKSUMS:
 SPEC CHECKSUMS:
-  Expecta: 78b4e8b0c8291fa4524d7f74016b6065c2e391ec
+  Expecta: 54e8a3530add08f4f0208c111355eda7cde74a53
   UICountingLabel: 1db4e7d023e1762171eb226d6dff47a7a84f27aa
   UICountingLabel: 1db4e7d023e1762171eb226d6dff47a7a84f27aa
 
 
-COCOAPODS: 0.38.2
+COCOAPODS: 0.35.0