Merge branch 'icons3' of https://github.com/abjurato/Charts into abjurato-icons3

Author: danielgindi

Charts.xcodeproj/project.pbxproj

@@ -160,6 +160,7 @@
 06B3C0F81D99F85400B1DF43 /* LineChartTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B3C0F41D99F85400B1DF43 /* LineChartTests.swift */; };
 06B3C0F91D99F85400B1DF43 /* ChartsRealmTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B3C0F61D99F85400B1DF43 /* ChartsRealmTest.swift */; };
 5B56A9CD1D905EB300F58178 /* Description.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B56A9CC1D905EB300F58178 /* Description.swift */; };
+D8A58A411DCE2EF8007BB012 /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D8A58A401DCE2EF8007BB012 /* Media.xcassets */; };
 5BF8813B1DDC4DF70033370C /* IndexAxisValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BF8813A1DDC4DF70033370C /* IndexAxisValueFormatter.swift */; };
 /* End PBXBuildFile section */
 
@@ -338,6 +339,7 @@
 06B3C0F41D99F85400B1DF43 /* LineChartTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LineChartTests.swift; sourceTree = "<group>"; };
 06B3C0F61D99F85400B1DF43 /* ChartsRealmTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartsRealmTest.swift; sourceTree = "<group>"; };
 5B56A9CC1D905EB300F58178 /* Description.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Description.swift; sourceTree = "<group>"; };
+D8A58A401DCE2EF8007BB012 /* Media.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Media.xcassets; path = Charts/ChartsTests/Media.xcassets; sourceTree = SOURCE_ROOT; };
 5BF8813A1DDC4DF70033370C /* IndexAxisValueFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IndexAxisValueFormatter.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -740,6 +742,7 @@
 isa = PBXGroup;
 children = (
 06B121111D81201C00D14B02 /* Info.plist */,
+D8A58A401DCE2EF8007BB012 /* Media.xcassets */,
 );
 name = "Supporting Files";
 sourceTree = "<group>";
@@ -894,6 +897,7 @@
 isa = PBXResourcesBuildPhase;
 buildActionMask = 2147483647;
 files = (
+D8A58A411DCE2EF8007BB012 /* Media.xcassets in Resources */,
 );
 runOnlyForDeploymentPostprocessing = 0;
 };

Charts/ChartsTests/Media.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}

Charts/ChartsTests/Media.xcassets/icon.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "filename" : "star-2.png",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "star-1.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "star.png",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}

Charts/ChartsTests/Media.xcassets/icon.imageset/star-1.png

@@ -83,6 +83,16 @@ - (void)handleOption:(NSString *)key forChartView:(ChartViewBase *)chartView
  [chartView setNeedsDisplay];
  }
 
+ if ([key isEqualToString:@"toggleIcons"])
+ {
+ for (id<IChartDataSet> set in chartView.data.dataSets)
+ {
+ set.drawIconsEnabled = !set.isDrawIconsEnabled;
+ }
+ 
+ [chartView setNeedsDisplay];
+ }
+ 
  if ([key isEqualToString:@"toggleHighlight"])
  {
  chartView.data.highlightEnabled = !chartView.data.isHighlightEnabled;

Charts/ChartsTests/Media.xcassets/icon.imageset/star-2.png

@@ -33,6 +33,7 @@ - (void)viewDidLoad
 
  self.options = @[
  @{@"key": @"toggleValues", @"label": @"Toggle Values"},
+ @{@"key": @"toggleIcons", @"label": @"Toggle Icons"},
  @{@"key": @"toggleHighlight", @"label": @"Toggle Highlight"},
  @{@"key": @"animateX", @"label": @"Animate X"},
  @{@"key": @"animateY", @"label": @"Animate Y"},
@@ -136,7 +137,11 @@ - (void)setDataCount:(int)count range:(double)range
  {
  double mult = (range + 1);
  double val = (double) (arc4random_uniform(mult));
- [yVals addObject:[[BarChartDataEntry alloc] initWithX:(double)i y:val]];
+ if (arc4random_uniform(100) < 25) {
+ [yVals addObject:[[BarChartDataEntry alloc] initWithX:val y:i data: [UIImage imageNamed:@"icon"]]];
+ } else {
+ [yVals addObject:[[BarChartDataEntry alloc] initWithX:val y:i]];
+ }
  }
 
  BarChartDataSet *set1 = nil;

Charts/ChartsTests/Media.xcassets/icon.imageset/star.png

@@ -32,6 +32,7 @@ - (void)viewDidLoad
 
  self.options = @[
  @{@"key": @"toggleValues", @"label": @"Toggle Values"},
+ @{@"key": @"toggleIcons", @"label": @"Toggle Icons"},
  @{@"key": @"toggleHighlight", @"label": @"Toggle Highlight"},
  @{@"key": @"animateX", @"label": @"Animate X"},
  @{@"key": @"animateY", @"label": @"Animate Y"},
@@ -103,11 +104,11 @@ - (void)setDataCount:(int)count range:(double)range
  {
  double val = (double) (arc4random_uniform(range));
  double size = (double) (arc4random_uniform(range));
- [yVals1 addObject:[[BubbleChartDataEntry alloc] initWithX:i y:val size:size]];
+ [yVals1 addObject:[[BubbleChartDataEntry alloc] initWithX:i y:val size:size data: [UIImage imageNamed:@"icon"]]];
 
  val = (double) (arc4random_uniform(range));
  size = (double) (arc4random_uniform(range));
- [yVals2 addObject:[[BubbleChartDataEntry alloc] initWithX:i y:val size:size]];
+ [yVals2 addObject:[[BubbleChartDataEntry alloc] initWithX:i y:val size:size data: [UIImage imageNamed:@"icon"]]];
 
  val = (double) (arc4random_uniform(range));
  size = (double) (arc4random_uniform(range));
@@ -118,6 +119,7 @@ - (void)setDataCount:(int)count range:(double)range
  [set1 setColor:ChartColorTemplates.colorful[0] alpha:0.50f];
  [set1 setDrawValuesEnabled:YES];
  BubbleChartDataSet *set2 = [[BubbleChartDataSet alloc] initWithValues:yVals2 label:@"DS 2"];
+ set1.iconsOffset = CGSizeMake(0, 15);
  [set2 setColor:ChartColorTemplates.colorful[1] alpha:0.50f];
  [set2 setDrawValuesEnabled:YES];
  BubbleChartDataSet *set3 = [[BubbleChartDataSet alloc] initWithValues:yVals3 label:@"DS 3"];

ChartsDemo/Classes/DemoBaseViewController.m

@@ -32,6 +32,7 @@ - (void)viewDidLoad
 
  self.options = @[
  @{@"key": @"toggleValues", @"label": @"Toggle Values"},
+ @{@"key": @"toggleIcons", @"label": @"Toggle Icons"},
  @{@"key": @"toggleHighlight", @"label": @"Toggle Highlight"},
  @{@"key": @"animateX", @"label": @"Animate X"},
  @{@"key": @"animateY", @"label": @"Animate Y"},
@@ -100,7 +101,7 @@ - (void)setDataCount:(int)count range:(double)range
  double open = (double) (arc4random_uniform(6)) + 1.0;
  double close = (double) (arc4random_uniform(6)) + 1.0;
  BOOL even = i % 2 == 0;
- [yVals1 addObject:[[CandleChartDataEntry alloc] initWithX:i shadowH:val + high shadowL:val - low open:even ? val + open : val - open close:even ? val - close : val + close]];
+ [yVals1 addObject:[[CandleChartDataEntry alloc] initWithX:i shadowH:val + high shadowL:val - low open:even ? val + open : val - open close:even ? val - close : val + close data: [UIImage imageNamed:@"icon"]]];
  }
 
  CandleChartDataSet *set1 = [[CandleChartDataSet alloc] initWithValues:yVals1 label:@"Data Set"];