Merge pull request #544 from danielgindi/viewport-bugs

Viewport bugfixes in LineChart
PhilJay · Apr 12, 2015 · 65c6189 · 65c6189
2 parents 847e6c3 + 791a487
commit 65c6189
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/MPChartLib/src/com/github/mikephil/charting/renderer/LineChartRenderer.java b/MPChartLib/src/com/github/mikephil/charting/renderer/LineChartRenderer.java
@@ -168,8 +168,8 @@ protected void drawCubic(Canvas c, LineDataSet dataSet, List<Entry> entries) {
             prevDx = (next.getXIndex() - cur.getXIndex()) * intensity;
             prevDy = (next.getVal() - cur.getVal()) * intensity;
 
-            cur = entries.get(1);
-            next = entries.get((entries.size() > 2) ? 2 : 1);
+            cur = entries.get(minx + 1);
+            next = entries.get(minx + (size - minx > 2 ? 2 : 1));
             curDx = (next.getXIndex() - prev.getXIndex()) * intensity;
             curDy = (next.getVal() - prev.getVal()) * intensity;
 

diff --git a/MPChartLib/src/com/github/mikephil/charting/utils/ViewPortHandler.java b/MPChartLib/src/com/github/mikephil/charting/utils/ViewPortHandler.java
@@ -379,6 +379,7 @@ public boolean isInBoundsLeft(float x) {
     }
 
     public boolean isInBoundsRight(float x) {
+        x = (float)((int)(x * 100.f)) / 100.f;
         return mContentRect.right >= x ? true : false;
     }
 
@@ -387,6 +388,7 @@ public boolean isInBoundsTop(float y) {
     }
 
     public boolean isInBoundsBottom(float y) {
+        y = (float)((int)(y * 100.f)) / 100.f;
         return mContentRect.bottom >= y ? true : false;
     }