fix drawing out of bound negative value axis labels issue

liuxuan30 · Jun 30, 2015 · 226221c · 226221c
1 parent 6e0256e
commit 226221c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/Charts/Classes/Renderers/ChartYAxisRenderer.swift b/Charts/Classes/Renderers/ChartYAxisRenderer.swift
@@ -230,6 +230,11 @@ public class ChartYAxisRenderer: ChartAxisRendererBase
             pt.x = fixedPosition
             pt.y += offset
 
+            if (pt.y > viewPortHandler.contentRect.height)
+            {
+                continue
+            }
+
             ChartUtils.drawText(context: context, text: text, point: pt, align: textAlign, attributes: [NSFontAttributeName: labelFont, NSForegroundColorAttributeName: labelTextColor])
         }
     }

diff --git a/Charts/Classes/Renderers/ChartYAxisRendererHorizontalBarChart.swift b/Charts/Classes/Renderers/ChartYAxisRendererHorizontalBarChart.swift
@@ -159,6 +159,11 @@ public class ChartYAxisRendererHorizontalBarChart: ChartYAxisRenderer
                 return
             }
 
+            if (positions[i].x < viewPortHandler.contentRect.origin.x)
+            {
+                continue
+            }
+
             ChartUtils.drawText(context: context, text: text, point: CGPoint(x: positions[i].x, y: fixedPosition - offset), align: .Center, attributes: [NSFontAttributeName: labelFont, NSForegroundColorAttributeName: labelTextColor])
         }
     }
-Original file line number
+Diff line change
@@ Expand Up @@
                     return
                 }
+                if (positions[i].x < viewPortHandler.contentRect.origin.x)
+                {
+                    continue
+                }
                 ChartUtils.drawText(context: context, text: text, point: CGPoint(x: positions[i].x, y: fixedPosition - offset), align: .Center, attributes: [NSFontAttributeName: labelFont, NSForegroundColorAttributeName: labelTextColor])
             }
         }
@@ Expand Down @@