drawBottomYLabelEntryEnabled

danielgindi · danielgindi · commit 34e7f4497962 · 2016-12-19T21:56:03.000+02:00
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/components/YAxis.java b/MPChartLib/src/main/java/com/github/mikephil/charting/components/YAxis.java
@@ -18,6 +18,11 @@
  */
 public class YAxis extends AxisBase {
 
+    /**
+     * indicates if the bottom y-label entry is drawn or not
+     */
+    private boolean mDrawBottomYLabelEntry = true;
+
     /**
      * indicates if the top y-label entry is drawn or not
      */
@@ -168,6 +173,15 @@ public boolean isDrawTopYLabelEntryEnabled() {
         return mDrawTopYLabelEntry;
     }
 
+    /**
+     * returns true if drawing the bottom y-axis label entry is enabled
+     *
+     * @return
+     */
+    public boolean isDrawBottomYLabelEntryEnabled() {
+        return mDrawBottomYLabelEntry;
+    }
+
     /**
      * set this to true to enable drawing the top y-label entry. Disabling this can be helpful
      * when the top y-label and
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRenderer.java b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRenderer.java
@@ -114,14 +114,16 @@ public void renderAxisLine(Canvas c) {
      */
     protected void drawYLabels(Canvas c, float fixedPosition, float[] positions, float offset) {
 
+        final int from = mYAxis.isDrawBottomYLabelEntryEnabled() ? 0 : 1;
+        final int to = mYAxis.isDrawTopYLabelEntryEnabled()
+                ? mYAxis.mEntryCount
+                : (mYAxis.mEntryCount - 1);
+
         // draw
-        for (int i = 0; i < mYAxis.mEntryCount; i++) {
+        for (int i = from; i < to; i++) {
 
             String text = mYAxis.getFormattedLabel(i);
 
-            if (!mYAxis.isDrawTopYLabelEntryEnabled() && i >= mYAxis.mEntryCount - 1)
-                return;
-
             c.drawText(text, fixedPosition, positions[i * 2 + 1] + offset, mAxisLabelPaint);
         }
     }
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererHorizontalBarChart.java b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererHorizontalBarChart.java
@@ -137,12 +137,14 @@ protected void drawYLabels(Canvas c, float fixedPosition, float[] positions, flo
         mAxisLabelPaint.setTextSize(mYAxis.getTextSize());
         mAxisLabelPaint.setColor(mYAxis.getTextColor());
 
-        for (int i = 0; i < mYAxis.mEntryCount; i++) {
+        final int from = mYAxis.isDrawBottomYLabelEntryEnabled() ? 0 : 1;
+        final int to = mYAxis.isDrawTopYLabelEntryEnabled()
+                ? mYAxis.mEntryCount
+                : (mYAxis.mEntryCount - 1);
 
-            String text = mYAxis.getFormattedLabel(i);
+        for (int i = from; i < to; i++) {
 
-            if (!mYAxis.isDrawTopYLabelEntryEnabled() && i >= mYAxis.mEntryCount - 1)
-                return;
+            String text = mYAxis.getFormattedLabel(i);
 
             c.drawText(text, positions[i * 2], fixedPosition - offset, mAxisLabelPaint);
         }
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererRadarChart.java b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererRadarChart.java
@@ -156,12 +156,12 @@ public void renderAxisLabels(Canvas c) {
         MPPointF pOut = MPPointF.getInstance(0,0);
         float factor = mChart.getFactor();
 
-        int labelCount = mYAxis.mEntryCount;
+        final int from = mYAxis.isDrawBottomYLabelEntryEnabled() ? 0 : 1;
+        final int to = mYAxis.isDrawTopYLabelEntryEnabled()
+                ? mYAxis.mEntryCount
+                : (mYAxis.mEntryCount - 1);
 
-        for (int j = 0; j < labelCount; j++) {
-
-            if (j == labelCount - 1 && mYAxis.isDrawTopYLabelEntryEnabled() == false)
-                break;
+        for (int j = from; j < to; j++) {
 
             float r = (mYAxis.mEntries[j] - mYAxis.mAxisMinimum) * factor;
 
