Avoid crashes when datasets are empty (fixes #320)

ChartsOrg · Aug 27, 2015 · aa8645c · aa8645c
1 parent f38ad4d
commit aa8645c
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/Charts/Classes/Renderers/BarChartRenderer.swift b/Charts/Classes/Renderers/BarChartRenderer.swift
@@ -293,7 +293,7 @@ public class BarChartRenderer: ChartDataRendererBase
             {
                 var dataSet = dataSets[i] as! BarChartDataSet
 
-                if (!dataSet.isDrawValuesEnabled)
+                if !dataSet.isDrawValuesEnabled || dataSet.entryCount == 0
                 {
                     continue
                 }

diff --git a/Charts/Classes/Renderers/BubbleChartRenderer.swift b/Charts/Classes/Renderers/BubbleChartRenderer.swift
@@ -44,7 +44,7 @@ public class BubbleChartRenderer: ChartDataRendererBase
 
         for set in bubbleData.dataSets as! [BubbleChartDataSet]
         {
-            if (set.isVisible)
+            if set.isVisible && set.entryCount > 0
             {
                 drawDataSet(context: context, dataSet: set)
             }
@@ -152,7 +152,7 @@ public class BubbleChartRenderer: ChartDataRendererBase
 
             for dataSet in dataSets
             {
-                if (!dataSet.isDrawValuesEnabled)
+                if !dataSet.isDrawValuesEnabled || dataSet.entryCount == 0
                 {
                     continue
                 }

diff --git a/Charts/Classes/Renderers/CandleStickChartRenderer.swift b/Charts/Classes/Renderers/CandleStickChartRenderer.swift
@@ -45,7 +45,7 @@ public class CandleStickChartRenderer: LineScatterCandleRadarChartRenderer
 
         for set in candleData.dataSets as! [CandleChartDataSet]
         {
-            if (set.isVisible)
+            if set.isVisible && set.entryCount > 0
             {
                 drawDataSet(context: context, dataSet: set)
             }
@@ -190,7 +190,7 @@ public class CandleStickChartRenderer: LineScatterCandleRadarChartRenderer
             {
                 var dataSet = dataSets[i]
                 
-                if (!dataSet.isDrawValuesEnabled)
+                if !dataSet.isDrawValuesEnabled || dataSet.entryCount == 0
                 {
                     continue
                 }

diff --git a/Charts/Classes/Renderers/HorizontalBarChartRenderer.swift b/Charts/Classes/Renderers/HorizontalBarChartRenderer.swift
@@ -260,7 +260,7 @@ public class HorizontalBarChartRenderer: BarChartRenderer
             {
                 var dataSet = dataSets[i] as! BarChartDataSet
 
-                if (!dataSet.isDrawValuesEnabled)
+                if !dataSet.isDrawValuesEnabled || dataSet.entryCount == 0
                 {
                     continue
                 }

diff --git a/Charts/Classes/Renderers/LineChartRenderer.swift b/Charts/Classes/Renderers/LineChartRenderer.swift
@@ -418,7 +418,7 @@ public class LineChartRenderer: LineScatterCandleRadarChartRenderer
             {
                 var dataSet = dataSets[i] as! LineChartDataSet
 
-                if (!dataSet.isDrawValuesEnabled)
+                if !dataSet.isDrawValuesEnabled || dataSet.entryCount == 0
                 {
                     continue
                 }

diff --git a/Charts/Classes/Renderers/PieChartRenderer.swift b/Charts/Classes/Renderers/PieChartRenderer.swift
@@ -50,7 +50,7 @@ public class PieChartRenderer: ChartDataRendererBase
             {
                 for set in pieData!.dataSets as! [PieChartDataSet]
                 {
-                    if (set.isVisible)
+                    if set.isVisible && set.entryCount > 0
                     {
                         drawDataSet(context: context, dataSet: set)
                     }

diff --git a/Charts/Classes/Renderers/RadarChartRenderer.swift b/Charts/Classes/Renderers/RadarChartRenderer.swift
@@ -36,7 +36,7 @@ public class RadarChartRenderer: LineScatterCandleRadarChartRenderer
             {
                 for set in radarData!.dataSets as! [RadarChartDataSet]
                 {
-                    if (set.isVisible)
+                    if set.isVisible && set.entryCount > 0
                     {
                         drawDataSet(context: context, dataSet: set)
                     }
@@ -133,7 +133,7 @@ public class RadarChartRenderer: LineScatterCandleRadarChartRenderer
         {
             var dataSet = data.getDataSetByIndex(i) as! RadarChartDataSet
 
-            if (!dataSet.isDrawValuesEnabled)
+            if !dataSet.isDrawValuesEnabled || dataSet.entryCount == 0
             {
                 continue
             }

diff --git a/Charts/Classes/Renderers/ScatterChartRenderer.swift b/Charts/Classes/Renderers/ScatterChartRenderer.swift
@@ -191,7 +191,7 @@ public class ScatterChartRenderer: LineScatterCandleRadarChartRenderer
             {
                 var dataSet = dataSets[i]
 
-                if (!dataSet.isDrawValuesEnabled)
+                if !dataSet.isDrawValuesEnabled || dataSet.entryCount == 0
                 {
                     continue
                 }