Fix issue #1484

PhilJay · Feb 20, 2016 · 19a98c2 · 19a98c2 · PhilJay · Feb 20, 2016
1 parent 72cabd1
commit 19a98c2
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 15 deletions.
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivity.java
@@ -87,6 +87,7 @@ protected void onCreate(Bundle savedInstanceState) {
         xAxis.setTypeface(mTf);
         xAxis.setDrawGridLines(false);
         xAxis.setSpaceBetweenLabels(2);
+        xAxis.setLabelRotationAngle(90);
 
         YAxisValueFormatter custom = new MyYAxisValueFormatter();
 

diff --git a/MPChartLib/src/com/github/mikephil/charting/renderer/XAxisRenderer.java b/MPChartLib/src/com/github/mikephil/charting/renderer/XAxisRenderer.java
@@ -85,6 +85,8 @@ public void renderAxisLabels(Canvas c) {
         mAxisLabelPaint.setTextSize(mXAxis.getTextSize());
         mAxisLabelPaint.setColor(mXAxis.getTextColor());
 
+
+
         if (mXAxis.getPosition() == XAxisPosition.TOP) {
 
             drawLabels(c, mViewPortHandler.contentTop() - yoffset,
@@ -148,6 +150,7 @@ public void renderAxisLine(Canvas c) {
     protected void drawLabels(Canvas c, float pos, PointF anchor) {
 
         final float labelRotationAngleDegrees = mXAxis.getLabelRotationAngle();
+        final float normalizedLineHeight = Utils.calcTextHeight(mAxisLabelPaint, "Q");
 
         // pre allocate to save performance (dont allocate in loop)
         float[] position = new float[] {
@@ -182,14 +185,14 @@ protected void drawLabels(Canvas c, float pos, PointF anchor) {
                     }
                 }
 
-                drawLabel(c, label, i, position[0], pos, anchor, labelRotationAngleDegrees);
+                drawLabel(c, label, i, position[0], pos, anchor, labelRotationAngleDegrees, normalizedLineHeight);
             }
         }
     }
 
-    protected void drawLabel(Canvas c, String label, int xIndex, float x, float y, PointF anchor, float angleDegrees) {
+    protected void drawLabel(Canvas c, String label, int xIndex, float x, float y, PointF anchor, float angleDegrees, float normalizedLineHeight) {
         String formattedLabel = mXAxis.getValueFormatter().getXValue(label, xIndex, mViewPortHandler);
-        Utils.drawText(c, formattedLabel, x, y, mAxisLabelPaint, anchor, angleDegrees);
+        Utils.drawText(c, formattedLabel, x, y, mAxisLabelPaint, anchor, angleDegrees, normalizedLineHeight);
     }
 
     @Override

diff --git a/MPChartLib/src/com/github/mikephil/charting/renderer/XAxisRendererBarChart.java b/MPChartLib/src/com/github/mikephil/charting/renderer/XAxisRendererBarChart.java
@@ -31,6 +31,7 @@ public XAxisRendererBarChart(ViewPortHandler viewPortHandler, XAxis xAxis, Trans
     protected void drawLabels(Canvas c, float pos, PointF anchor) {
 
         final float labelRotationAngleDegrees = mXAxis.getLabelRotationAngle();
+        final float normalizedLineHeight = Utils.calcTextHeight(mAxisLabelPaint, "Q");
 
         // pre allocate to save performance (dont allocate in loop)
         float[] position = new float[] {
@@ -76,7 +77,7 @@ protected void drawLabels(Canvas c, float pos, PointF anchor) {
                     }
                 }
 
-                drawLabel(c, label, i, position[0], pos, anchor, labelRotationAngleDegrees);
+                drawLabel(c, label, i, position[0], pos, anchor, labelRotationAngleDegrees, normalizedLineHeight);
             }
         }
     }

diff --git a/MPChartLib/src/com/github/mikephil/charting/renderer/XAxisRendererHorizontalBarChart.java b/MPChartLib/src/com/github/mikephil/charting/renderer/XAxisRendererHorizontalBarChart.java
@@ -101,6 +101,7 @@ public void renderAxisLabels(Canvas c) {
     protected void drawLabels(Canvas c, float pos, PointF anchor) {
 
         final float labelRotationAngleDegrees = mXAxis.getLabelRotationAngle();
+        final float normalizedLineHeight = Utils.calcTextHeight(mAxisLabelPaint, "Q");
 
         // pre allocate to save performance (dont allocate in loop)
         float[] position = new float[] {
@@ -125,7 +126,7 @@ protected void drawLabels(Canvas c, float pos, PointF anchor) {
             if (mViewPortHandler.isInBoundsY(position[1])) {
 
                 String label = mXAxis.getValues().get(i);
-                drawLabel(c, label, i, pos, position[1], anchor, labelRotationAngleDegrees);
+                drawLabel(c, label, i, pos, position[1], anchor, labelRotationAngleDegrees, normalizedLineHeight);
             }
         }
     }

diff --git a/MPChartLib/src/com/github/mikephil/charting/renderer/XAxisRendererRadarChart.java b/MPChartLib/src/com/github/mikephil/charting/renderer/XAxisRendererRadarChart.java
@@ -26,6 +26,7 @@ public void renderAxisLabels(Canvas c) {
             return;
 
         final float labelRotationAngleDegrees = mXAxis.getLabelRotationAngle();
+        final float normalizedLineHeight = Utils.calcTextHeight(mAxisLabelPaint, "Q");
         final PointF drawLabelAnchor = new PointF(0.5f, 0.0f);
 
         mAxisLabelPaint.setTypeface(mXAxis.getTypeface());
@@ -50,7 +51,7 @@ public void renderAxisLabels(Canvas c) {
                     + mXAxis.mLabelRotatedWidth / 2f, angle);
 
             drawLabel(c, label, i, p.x, p.y - mXAxis.mLabelRotatedHeight / 2.f,
-                    drawLabelAnchor, labelRotationAngleDegrees);
+                    drawLabelAnchor, labelRotationAngleDegrees, normalizedLineHeight);
         }
     }
 

diff --git a/MPChartLib/src/com/github/mikephil/charting/utils/Utils.java b/MPChartLib/src/com/github/mikephil/charting/utils/Utils.java
@@ -527,29 +527,30 @@ public static float getNormalizedAngle(float angle) {
 
     public static void drawText(Canvas c, String text, float x, float y,
                                 Paint paint,
-                                PointF anchor, float angleDegrees) {
+                                PointF anchor, float angleDegrees, float normalizedLineHeight) {
 
         float drawOffsetX = 0.f;
         float drawOffsetY = 0.f;
 
         paint.getTextBounds(text, 0, text.length(), mDrawTextRectBuffer);
 
-        final float lineHeight = mDrawTextRectBuffer.height();
-
-                // Android sometimes has pre-padding
+        // Android sometimes has pre-padding
         drawOffsetX -= mDrawTextRectBuffer.left;
 
-        // Android does not snap the bounds to line boundaries,
-        //  and draws from bottom to top.
-        // And we want to normalize it.
-        drawOffsetY += lineHeight;
 
         // To have a consistent point of reference, we always draw left-aligned
         Paint.Align originalTextAlign = paint.getTextAlign();
         paint.setTextAlign(Paint.Align.LEFT);
 
         if (angleDegrees != 0.f) {
 
+            float lineHeight = mDrawTextRectBuffer.height();
+
+            // Android does not snap the bounds to line boundaries,
+            //  and draws from bottom to top.
+            // And we want to normalize it.
+            drawOffsetY += lineHeight;
+
             // Move the text drawing rect in a way that it always rotates around its center
             drawOffsetX -= mDrawTextRectBuffer.width() * 0.5f;
             drawOffsetY -= lineHeight * 0.5f;
@@ -577,10 +578,16 @@ public static void drawText(Canvas c, String text, float x, float y,
             c.restore();
         }
         else {
+
+            // Android does not snap the bounds to line boundaries,
+            //  and draws from bottom to top.
+            // And we want to normalize it.
+            drawOffsetY += normalizedLineHeight;
+
             if (anchor.x != 0.f || anchor.y != 0.f) {
 
                 drawOffsetX -= mDrawTextRectBuffer.width() * anchor.x;
-                drawOffsetY -= lineHeight * anchor.y;
+                drawOffsetY -= normalizedLineHeight * anchor.y;
             }
 
             drawOffsetX += x;