horizontal legend view fixes, and values shown in percentage for pie and stack charts on touch

dhirenthirani · dhirenthirani · commit 7d64a00b56a0 · 2016-06-13T10:41:55.000+05:30
diff --git a/dr-charts.xcodeproj/project.xcworkspace/xcuserdata/zomato.xcuserdatad/UserInterfaceState.xcuserstate b/dr-charts.xcodeproj/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];
                 }

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,8 @@ - (void)touchesBegan:(NSSet<UITouch > )touches withEvent:(UIEvent *)event{`
`156`	`156`	`touchedLayer = shapeLayer;`
`157`	`157`
`158`	`158`	`NSString *data = [shapeLayer valueForKey:@"data"];`
`159`		`- [self showMarkerWithData:data withTouchedPoint:touchPoint];`
	`159`	`+ NSString dataPercentage = [NSString stringWithFormat:@"%0.2f%%",(data.floatValue/totalCount)100];`
	`160`	`+ [self showMarkerWithData:dataPercentage withTouchedPoint:touchPoint];`
`160`	`161`	`if ([self.delegate respondsToSelector:@selector(didTapOnHorizontalStackBarChartWithValue:)]) {`
`161`	`162`	`[self.delegate didTapOnHorizontalStackBarChartWithValue:data];`
`162`	`163`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ - (void)createLegend{`
`64`	`64`
`65`	`65`	`if (width >= WIDTH(self)) {`
`66`	`66`	`height = height + LEGEND_VIEW + INNER_PADDING;`
`67`		`- width = 0;`
	`67`	`+ width += LEGEND_VIEW + size.width + 2*INNER_PADDING;`
`68`	`68`	`x = 0;`
`69`	`69`	`}`
`70`	`70`
`@@ -128,7 +128,7 @@ + (CGFloat)getLegendHeightWithLegendArray:(NSMutableArray *)legendArray legendTy`
`128`	`128`
`129`	`129`	`if (width >= viewWidth) {`
`130`	`130`	`height = height + LEGEND_VIEW + INNER_PADDING;`
`131`		`- width = 0;`
	`131`	`+ width += LEGEND_VIEW + size.width + 2*INNER_PADDING;`
`132`	`132`	`x = 0;`
`133`	`133`	`}`
`134`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,8 @@ - (void)touchesBegan:(NSSet<UITouch > )touches withEvent:(UIEvent *)event{`
`160`	`160`	`touchedLayer = shapeLayer;`
`161`	`161`
`162`	`162`	`NSString *data = [shapeLayer valueForKey:@"data"];`
`163`		`- [self showMarkerWithData:data withTouchedPoint:touchPoint];`
	`163`	`+ NSString dataPercentage = [NSString stringWithFormat:@"%0.2f%%",(data.floatValue/self.totalCount.floatValue)100];`
	`164`	`+ [self showMarkerWithData:dataPercentage withTouchedPoint:touchPoint];`
`164`	`165`	`if ([self.delegate respondsToSelector:@selector(didTapOnPieChartWithValue:)]) {`
`165`	`166`	`[self.delegate didTapOnPieChartWithValue:data];`
`166`	`167`	`}`