New X shape for Scatter

sutext · Feb 9, 2016 · dc7ba3d · dc7ba3d
1 parent daa8103
commit dc7ba3d
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 18 deletions.
diff --git a/Charts/Classes/Data/Implementations/Standard/ScatterChartDataSet.swift b/Charts/Classes/Data/Implementations/Standard/ScatterChartDataSet.swift
@@ -19,10 +19,11 @@ public class ScatterChartDataSet: LineScatterCandleRadarChartDataSet, IScatterCh
     @objc
     public enum ScatterShape: Int
     {
-        case Cross
-        case Triangle
-        case Circle
         case Square
+        case Circle
+        case Triangle
+        case Cross
+        case X
         case Custom
     }
 

diff --git a/Charts/Classes/Renderers/ScatterChartRenderer.swift b/Charts/Classes/Renderers/ScatterChartRenderer.swift
@@ -163,21 +163,6 @@ public class ScatterChartRenderer: LineScatterCandleRadarChartRenderer
                     CGContextFillEllipseInRect(context, rect)
                 }
             }
-            else if (shape == .Cross)
-            {
-                CGContextSetStrokeColorWithColor(context, dataSet.colorAt(j).CGColor)
-                _lineSegments[0].x = point.x - shapeHalf
-                _lineSegments[0].y = point.y
-                _lineSegments[1].x = point.x + shapeHalf
-                _lineSegments[1].y = point.y
-                CGContextStrokeLineSegments(context, _lineSegments, 2)
-
-                _lineSegments[0].x = point.x
-                _lineSegments[0].y = point.y - shapeHalf
-                _lineSegments[1].x = point.x
-                _lineSegments[1].y = point.y + shapeHalf
-                CGContextStrokeLineSegments(context, _lineSegments, 2)
-            }
             else if (shape == .Triangle)
             {
                 CGContextSetFillColorWithColor(context, dataSet.colorAt(j).CGColor)
@@ -216,6 +201,36 @@ public class ScatterChartRenderer: LineScatterCandleRadarChartRenderer
                     CGContextFillPath(context)
                 }
             }
+            else if (shape == .Cross)
+            {
+                CGContextSetStrokeColorWithColor(context, dataSet.colorAt(j).CGColor)
+                _lineSegments[0].x = point.x - shapeHalf
+                _lineSegments[0].y = point.y
+                _lineSegments[1].x = point.x + shapeHalf
+                _lineSegments[1].y = point.y
+                CGContextStrokeLineSegments(context, _lineSegments, 2)
+
+                _lineSegments[0].x = point.x
+                _lineSegments[0].y = point.y - shapeHalf
+                _lineSegments[1].x = point.x
+                _lineSegments[1].y = point.y + shapeHalf
+                CGContextStrokeLineSegments(context, _lineSegments, 2)
+            }
+            else if (shape == .X)
+            {
+                CGContextSetStrokeColorWithColor(context, dataSet.colorAt(j).CGColor)
+                _lineSegments[0].x = point.x - shapeHalf
+                _lineSegments[0].y = point.y - shapeHalf
+                _lineSegments[1].x = point.x + shapeHalf
+                _lineSegments[1].y = point.y + shapeHalf
+                CGContextStrokeLineSegments(context, _lineSegments, 2)
+
+                _lineSegments[0].x = point.x + shapeHalf
+                _lineSegments[0].y = point.y - shapeHalf
+                _lineSegments[1].x = point.x - shapeHalf
+                _lineSegments[1].y = point.y + shapeHalf
+                CGContextStrokeLineSegments(context, _lineSegments, 2)
+            }
             else if (shape == .Custom)
             {
                 CGContextSetFillColorWithColor(context, dataSet.colorAt(j).CGColor)