Add support for lines

Author: papjul

MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRenderer.java

@@ -178,16 +178,16 @@ protected void drawLabels(Canvas c, float pos, MPPointF anchor) {
         final float labelRotationAngleDegrees = mXAxis.getLabelRotationAngle();
         boolean centeringEnabled = mXAxis.isCenterAxisLabelsEnabled();
 
-        float[] positions = new float[mXAxis.mEntryCount * 2];
+        float[] positions;
 
         if (mXAxis.isShowSpecificLabelPositions()) {
             positions = new float[mXAxis.getSpecificLabelPositions().length * 2];
             for (int i = 0; i < positions.length; i += 2) {
                 positions[i] = mXAxis.getSpecificLabelPositions()[i / 2];
             }
         } else {
+            positions = new float[mXAxis.mEntryCount * 2];
             for (int i = 0; i < positions.length; i += 2) {
-
                 // only fill x values
                 if (centeringEnabled) {
                     positions[i] = mXAxis.mCenteredEntries[i / 2];
@@ -245,15 +245,26 @@ public void renderGridLines(Canvas c) {
 
         int clipRestoreCount = c.save();
         c.clipRect(getGridClippingRect());
-
-        if(mRenderGridLinesBuffer.length != mAxis.mEntryCount * 2){
-            mRenderGridLinesBuffer = new float[mXAxis.mEntryCount * 2];
+        
+        if (mAxis.isShowSpecificLabelPositions()) {
+            if (mRenderGridLinesBuffer.length != mAxis.getSpecificLabelPositions().length * 2) {
+                mRenderGridLinesBuffer = new float[mXAxis.getSpecificLabelPositions().length * 2];
+            }
+        } else {
+            if (mRenderGridLinesBuffer.length != mAxis.mEntryCount * 2) {
+                mRenderGridLinesBuffer = new float[mXAxis.mEntryCount * 2];
+            }
         }
         float[] positions = mRenderGridLinesBuffer;
 
         for (int i = 0; i < positions.length; i += 2) {
-            positions[i] = mXAxis.mEntries[i / 2];
-            positions[i + 1] = mXAxis.mEntries[i / 2];
+            if (mAxis.isShowSpecificLabelPositions()) {
+                positions[i] = mXAxis.getSpecificLabelPositions()[i / 2];
+                positions[i + 1] = mXAxis.getSpecificLabelPositions()[i / 2];
+            } else {
+                positions[i] = mXAxis.mEntries[i / 2];
+                positions[i + 1] = mXAxis.mEntries[i / 2];
+            }
         }
 
         mTrans.pointValuesToPixel(positions);
@@ -264,7 +275,6 @@ public void renderGridLines(Canvas c) {
         gridLinePath.reset();
 
         for (int i = 0; i < positions.length; i += 2) {
-
             drawGridLine(c, positions[i], positions[i + 1], gridLinePath);
         }
 

MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRenderer.java

@@ -120,34 +120,31 @@ public void renderAxisLine(Canvas c) {
      */
     protected void drawYLabels(Canvas c, float fixedPosition, float[] positions, float offset) {
 
-        if (mYAxis.isShowSpecificLabelPositions()) {
-            float[] specificLabelsPositions = new float[mYAxis.getSpecificLabelPositions().length * 2];
-            for (int i = 0; i < mYAxis.getSpecificLabelPositions().length; i++) {
-                specificLabelsPositions[i * 2 + 1] = mYAxis.getSpecificLabelPositions()[i];
-            }
-            mTrans.pointValuesToPixel(specificLabelsPositions);
+        final int from;
+        final int to;
 
-            for (int i = 0; i < mYAxis.getSpecificLabelPositions().length; i++) {
-                float y = specificLabelsPositions[i * 2 + 1];
-                if (mViewPortHandler.isInBoundsY(y)) {
-                    String text = mYAxis.getValueFormatter().getFormattedValue(mYAxis.getSpecificLabelPositions()[i], mYAxis);
-                    c.drawText(text, fixedPosition, y + offset, mAxisLabelPaint);
-                }
-            }
-            return;
+        if (mYAxis.isShowSpecificLabelPositions()) {
+            from = 0;
+            to = mYAxis.isDrawTopYLabelEntryEnabled()
+                    ? mYAxis.getSpecificLabelPositions().length
+                    : (mYAxis.getSpecificLabelPositions().length - 1);
+        } else {
+            from = mYAxis.isDrawBottomYLabelEntryEnabled() ? 0 : 1;
+            to = mYAxis.isDrawTopYLabelEntryEnabled()
+                    ? mYAxis.mEntryCount
+                    : (mYAxis.mEntryCount - 1);
         }
 
-        final int from = mYAxis.isDrawBottomYLabelEntryEnabled() ? 0 : 1;
-        final int to = mYAxis.isDrawTopYLabelEntryEnabled()
-                ? mYAxis.mEntryCount
-                : (mYAxis.mEntryCount - 1);
-
         float xOffset = mYAxis.getLabelXOffset();
 
         // draw
         for (int i = from; i < to; i++) {
-
-            String text = mYAxis.getFormattedLabel(i);
+            String text;
+            if (mYAxis.isShowSpecificLabelPositions()) {
+                text = mYAxis.getValueFormatter().getFormattedValue(mYAxis.getSpecificLabelPositions()[i], mYAxis);
+            } else {
+                text = mYAxis.getFormattedLabel(i);
+            }
 
             c.drawText(text,
                     fixedPosition + xOffset,
@@ -226,14 +223,24 @@ protected Path linePath(Path p, int i, float[] positions) {
      */
     protected float[] getTransformedPositions() {
 
-        if(mGetTransformedPositionsBuffer.length != mYAxis.mEntryCount * 2){
-            mGetTransformedPositionsBuffer = new float[mYAxis.mEntryCount * 2];
+        if (mYAxis.isShowSpecificLabelPositions()) {
+            if (mGetTransformedPositionsBuffer.length != mYAxis.getSpecificLabelPositions().length * 2) {
+                mGetTransformedPositionsBuffer = new float[mYAxis.getSpecificLabelPositions().length * 2];
+            }
+        } else {
+            if (mGetTransformedPositionsBuffer.length != mYAxis.mEntryCount * 2) {
+                mGetTransformedPositionsBuffer = new float[mYAxis.mEntryCount * 2];
+            }
         }
         float[] positions = mGetTransformedPositionsBuffer;
 
         for (int i = 0; i < positions.length; i += 2) {
             // only fill y values, x values are not needed for y-labels
-            positions[i + 1] = mYAxis.mEntries[i / 2];
+            if (mYAxis.isShowSpecificLabelPositions()) {
+                positions[i + 1] = mYAxis.getSpecificLabelPositions()[i / 2];
+            } else {
+                positions[i + 1] = mYAxis.mEntries[i / 2];
+            }
         }
 
         mTrans.pointValuesToPixel(positions);