CGPoint is more appropriate here

Author: danielgindi

ChartsDemo/Classes/Demos/BubbleChartViewController.m

@@ -119,7 +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);
+ set1.iconsOffset = CGPointMake(0, 15);
  [set2 setColor:ChartColorTemplates.colorful[1] alpha:0.50f];
  [set2 setDrawValuesEnabled:YES];
  BubbleChartDataSet *set3 = [[BubbleChartDataSet alloc] initWithValues:yVals3 label:@"DS 3"];

ChartsDemo/Classes/Demos/PieChartViewController.m

@@ -99,7 +99,7 @@ - (void)setDataCount:(int)count range:(double)range
 
  PieChartDataSet *dataSet = [[PieChartDataSet alloc] initWithValues:values label:@"Election Results"];
  dataSet.sliceSpace = 2.0;
- dataSet.iconsOffset = CGSizeMake(0, 40);
+ dataSet.iconsOffset = CGPointMake(0, 40);
 
  // add a lot of colors
 

Source/Charts/Data/Implementations/ChartBaseDataSet.swift

@@ -370,8 +370,12 @@ open class ChartBaseDataSet: NSObject, IChartDataSet
  return drawIconsEnabled
  }
 
- /// Offset of icons drawn on the chart. For all charts except Pie and Radar it will be ordinary (x offset,y offset). For Pie and Radar chart it will be (y offset, distance from center offset); so if you want icon to be rendered under value, you should increase width component of CGSize, and if you want icon to be rendered closet to center, you should decrease height component of CGSize.
- open var iconsOffset = CGSize(width: 0,height: 0)
+ /// Offset of icons drawn on the chart. 
+ ///
+ /// For all charts except Pie and Radar it will be ordinary (x offset,y offset).
+ ///
+ /// For Pie and Radar chart it will be (y offset, distance from center offset); so if you want icon to be rendered under value, you should increase X component of CGPoint, and if you want icon to be rendered closet to center, you should decrease height component of CGPoint.
+ open var iconsOffset = CGPoint(x: 0, y: 0)
 
  /// Set the visibility of this DataSet. If not visible, the DataSet will not be drawn to the chart upon refreshing it.
  open var visible = true

Source/Charts/Data/Interfaces/IChartDataSet.swift

@@ -241,8 +241,12 @@ public protocol IChartDataSet
  /// Returns true if y-icon drawing is enabled, false if not
  var isDrawIconsEnabled: Bool { get }
 
- /// Offset of icons drawn on the chart. For all charts except Pie and Radar it will be ordinary (x offset,y offset). For Pie and Radar chart it will be (y offset, distance from center offset); so if you want icon to be rendered under value, you should increase width component of CGSize, and if you want icon to be rendered closet to center, you should decrease height component of CGSize.
- var iconsOffset: CGSize { get set }
+ /// Offset of icons drawn on the chart.
+ ///
+ /// For all charts except Pie and Radar it will be ordinary (x offset,y offset).
+ ///
+ /// For Pie and Radar chart it will be (y offset, distance from center offset); so if you want icon to be rendered under value, you should increase X component of CGPoint, and if you want icon to be rendered closet to center, you should decrease height component of CGPoint.
+ var iconsOffset: CGPoint { get set }
 
  /// Set the visibility of this DataSet. If not visible, the DataSet will not be drawn to the chart upon refreshing it.
  var visible: Bool { get set }

Source/Charts/Renderers/BarChartRenderer.swift

@@ -604,7 +604,7 @@ open class BarChartRenderer: BarLineScatterCandleBubbleRenderer
  }
 
  /// Draws an icon at the specified x and y position.
- open func drawIcon(context: CGContext, icon: NSUIImage?, xPos: CGFloat, yPos: CGFloat, offset: CGSize)
+ open func drawIcon(context: CGContext, icon: NSUIImage?, xPos: CGFloat, yPos: CGFloat, offset: CGPoint)
  {
  let point = CGPoint(x: xPos, y: yPos)
  if let iconImage = icon

Source/Charts/Renderers/PieChartRenderer.swift

@@ -532,14 +532,14 @@ open class PieChartRenderer: DataRenderer
  {
  // calculate the icon's position
 
- let x = (labelRadius + dataSet.iconsOffset.height) * sliceXBase + center.x
- let y = (labelRadius + dataSet.iconsOffset.height) * sliceYBase + center.y
+ let x = (labelRadius + dataSet.iconsOffset.y) * sliceXBase + center.x
+ let y = (labelRadius + dataSet.iconsOffset.y) * sliceYBase + center.y
 
  ChartUtils.drawImage(context: context,
  image: icon,
- point: CGPoint(x:x, y:y),
+ point: CGPoint(x: x, y: y),
  expectedSize: icon.size,
- offset: CGSize(width: 0, height: dataSet.iconsOffset.width))
+ offset: CGPoint(x: 0, y: dataSet.iconsOffset.x))
  }
 
  xIndex += 1

Source/Charts/Renderers/RadarChartRenderer.swift

@@ -201,14 +201,14 @@ open class RadarChartRenderer: LineRadarRenderer
  {
  let pIcon = ChartUtils.getPosition(
  center: center,
- dist: CGFloat(e.y) * factor * CGFloat(phaseY) + dataSet.iconsOffset.height,
+ dist: CGFloat(e.y) * factor * CGFloat(phaseY) + dataSet.iconsOffset.y,
  angle: sliceangle * CGFloat(j) * CGFloat(phaseX) + chart.rotationAngle)
 
  ChartUtils.drawImage(context: context,
  image: icon,
  point: pIcon,
  expectedSize: icon.size,
- offset: CGSize(width: 0, height: dataSet.iconsOffset.width))
+ offset: CGPoint(x: 0, y: dataSet.iconsOffset.x))
  }
 
  }

Source/Charts/Utils/ChartUtils.swift

@@ -80,12 +80,12 @@ open class ChartUtils
  )
  }
 
- open class func drawImage(context: CGContext, image: NSUIImage, point: CGPoint, expectedSize: CGSize, offset: CGSize)
+ open class func drawImage(context: CGContext, image: NSUIImage, point: CGPoint, expectedSize: CGSize, offset: CGPoint)
  {
  var drawOffset = CGPoint()
- drawOffset.x += point.x + offset.width
+ drawOffset.x += point.x + offset.x
  drawOffset.x -= expectedSize.width / 2
- drawOffset.y += point.y + offset.height
+ drawOffset.y += point.y + offset.y
  drawOffset.y -= expectedSize.height / 2
 
  NSUIGraphicsPushContext(context)

Tests/Charts/BarChartTests.swift

@@ -29,7 +29,7 @@ class BarChartTests: FBSnapshotTestCase
 
  dataSet = BarChartDataSet(values: entries, label: "Bar chart unit test data")
  dataSet.drawIconsEnabled = false
- dataSet.iconsOffset = CGSize(width: 0, height: -10.0)
+ dataSet.iconsOffset = CGPoint(x: 0, y: -10.0)
 
  let data = BarChartData(dataSet: dataSet)
  data.barWidth = 0.85

Tests/Charts/LineChartTests.swift

@@ -29,7 +29,7 @@ class LineChartTests: FBSnapshotTestCase
 
  dataSet = LineChartDataSet(values: entries, label: "First unit test data")
  dataSet.drawIconsEnabled = false
- dataSet.iconsOffset = CGSize(width: 0, height: 20.0)
+ dataSet.iconsOffset = CGPoint(x: 0, y: 20.0)
 
  chart = LineChartView(frame: CGRect(x: 0, y: 0, width: 480, height: 350))
  chart.backgroundColor = NSUIColor.clear