horizontal legend view fixes, and values shown in percentage for pie …

…and stack charts on touch
Zomato · Jun 13, 2016 · 7d64a00 · 7d64a00
1 parent e141bee
commit 7d64a00
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/...codeproj/project.xcworkspace/xcuserdata/zomato.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/zomato.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/dr-charts/Classes/HorizontalStackChart/HorizontalStackBarChart.m b/dr-charts/Classes/HorizontalStackChart/HorizontalStackBarChart.m
@@ -156,7 +156,8 @@ - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event{
                 touchedLayer = shapeLayer;
 
                 NSString *data = [shapeLayer valueForKey:@"data"];
-                [self showMarkerWithData:data withTouchedPoint:touchPoint];
+                NSString *dataPercentage = [NSString stringWithFormat:@"%0.2f%%",(data.floatValue/totalCount)*100];
+                [self showMarkerWithData:dataPercentage withTouchedPoint:touchPoint];
                 if ([self.delegate respondsToSelector:@selector(didTapOnHorizontalStackBarChartWithValue:)]) {
                     [self.delegate didTapOnHorizontalStackBarChartWithValue:data];
                 }

diff --git a/dr-charts/Classes/Legend/LegendView.m b/dr-charts/Classes/Legend/LegendView.m
@@ -64,7 +64,7 @@ - (void)createLegend{
 
             if (width >= WIDTH(self)) {
                 height = height + LEGEND_VIEW + INNER_PADDING;
-                width = 0;
+                width += LEGEND_VIEW + size.width + 2*INNER_PADDING;
                 x = 0;
             }
 
@@ -128,7 +128,7 @@ + (CGFloat)getLegendHeightWithLegendArray:(NSMutableArray *)legendArray legendTy
 
             if (width >= viewWidth) {
                 height = height + LEGEND_VIEW + INNER_PADDING;
-                width = 0;
+                width += LEGEND_VIEW + size.width + 2*INNER_PADDING;
                 x = 0;
             }
         }

diff --git a/dr-charts/Classes/PieChart/PieChart.m b/dr-charts/Classes/PieChart/PieChart.m
@@ -160,7 +160,8 @@ - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event{
                 touchedLayer = shapeLayer;
 
                 NSString *data = [shapeLayer valueForKey:@"data"];
-                [self showMarkerWithData:data withTouchedPoint:touchPoint];
+                NSString *dataPercentage = [NSString stringWithFormat:@"%0.2f%%",(data.floatValue/self.totalCount.floatValue)*100];
+                [self showMarkerWithData:dataPercentage withTouchedPoint:touchPoint];
                 if ([self.delegate respondsToSelector:@selector(didTapOnPieChartWithValue:)]) {
                     [self.delegate didTapOnPieChartWithValue:data];
                 }