aboutsummaryrefslogtreecommitdiff
path: root/MPChartLib/src
diff options
context:
space:
mode:
authorDaniel Cohen Gindi <danielgindi@gmail.com>2020-01-22 13:04:11 +0200
committerDaniel Cohen Gindi <danielgindi@gmail.com>2020-01-22 13:04:11 +0200
commit7752efef7e09a7b782c490ee034bb0295d51f004 (patch)
tree408fd8ce5a745adf1d03efaa75dd51231bd84ee6 /MPChartLib/src
parent58545bbbfa04b053d10784df9e041c4fc3d08b9d (diff)
downloadMPAndroidChart-7752efef7e09a7b782c490ee034bb0295d51f004.tar.gz
Support for labelXOffset for YAxis label
Diffstat (limited to 'MPChartLib/src')
-rw-r--r--MPChartLib/src/main/java/com/github/mikephil/charting/charts/RadarChart.java1
-rw-r--r--MPChartLib/src/main/java/com/github/mikephil/charting/components/YAxis.java21
-rw-r--r--MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRenderer.java7
-rw-r--r--MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererHorizontalBarChart.java7
-rw-r--r--MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererRadarChart.java4
5 files changed, 37 insertions, 3 deletions
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/RadarChart.java b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/RadarChart.java
index 3c9aec0d..8c088539 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/RadarChart.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/RadarChart.java
@@ -84,6 +84,7 @@ public class RadarChart extends PieRadarChartBase<RadarData> {
super.init();
mYAxis = new YAxis(AxisDependency.LEFT);
+ mYAxis.setLabelXOffset(10f);
mWebLineWidth = Utils.convertDpToPixel(1.5f);
mInnerWebLineWidth = Utils.convertDpToPixel(0.75f);
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
index 030603f5..a4e58c1b 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/components/YAxis.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/components/YAxis.java
@@ -74,6 +74,11 @@ public class YAxis extends AxisBase {
private YAxisLabelPosition mPosition = YAxisLabelPosition.OUTSIDE_CHART;
/**
+ * the horizontal offset of the y-label
+ */
+ private float mXLabelOffset = 0.0f;
+
+ /**
* enum for the position of the y-labels relative to the chart
*/
public enum YAxisLabelPosition {
@@ -175,6 +180,22 @@ public class YAxis extends AxisBase {
}
/**
+ * returns the horizontal offset of the y-label
+ */
+ public float getLabelXOffset() {
+ return mXLabelOffset;
+ }
+
+ /**
+ * sets the horizontal offset of the y-label
+ *
+ * @param xOffset
+ */
+ public void setLabelXOffset(float xOffset) {
+ mXLabelOffset = xOffset;
+ }
+
+ /**
* returns true if drawing the top y-axis label entry is enabled
*
* @return
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
index a2bf6797..53cca7ee 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRenderer.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRenderer.java
@@ -119,12 +119,17 @@ public class YAxisRenderer extends AxisRenderer {
? mYAxis.mEntryCount
: (mYAxis.mEntryCount - 1);
+ float xOffset = mYAxis.getLabelXOffset();
+
// draw
for (int i = from; i < to; i++) {
String text = mYAxis.getFormattedLabel(i);
- c.drawText(text, fixedPosition, positions[i * 2 + 1] + offset, mAxisLabelPaint);
+ c.drawText(text,
+ fixedPosition + xOffset,
+ 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
index 71275b03..fedf8054 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererHorizontalBarChart.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererHorizontalBarChart.java
@@ -142,11 +142,16 @@ public class YAxisRendererHorizontalBarChart extends YAxisRenderer {
? mYAxis.mEntryCount
: (mYAxis.mEntryCount - 1);
+ float xOffset = mYAxis.getLabelXOffset();
+
for (int i = from; i < to; i++) {
String text = mYAxis.getFormattedLabel(i);
- c.drawText(text, positions[i * 2], fixedPosition - offset, mAxisLabelPaint);
+ c.drawText(text,
+ positions[i * 2],
+ fixedPosition - offset + xOffset,
+ 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
index e3f69d79..f7b1ad9e 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererRadarChart.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererRadarChart.java
@@ -163,6 +163,8 @@ public class YAxisRendererRadarChart extends YAxisRenderer {
? mYAxis.mEntryCount
: (mYAxis.mEntryCount - 1);
+ float xOffset = mYAxis.getLabelXOffset();
+
for (int j = from; j < to; j++) {
float r = (mYAxis.mEntries[j] - mYAxis.mAxisMinimum) * factor;
@@ -171,7 +173,7 @@ public class YAxisRendererRadarChart extends YAxisRenderer {
String label = mYAxis.getFormattedLabel(j);
- c.drawText(label, pOut.x + 10, pOut.y, mAxisLabelPaint);
+ c.drawText(label, pOut.x + xOffset, pOut.y, mAxisLabelPaint);
}
MPPointF.recycleInstance(center);
MPPointF.recycleInstance(pOut);