diff options
author | Mick A <mick.ashton@flare-esports.net> | 2018-05-09 09:12:49 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-09 09:12:49 -0600 |
commit | 1485cdc6875a4f85e223a93c169dd2e37740846d (patch) | |
tree | c60b28402724c306e39202e074fe5e729937b3f5 /MPChartLib/src/main/java/com | |
parent | 53de181607d0d3376acc035cca70b7bb9b806731 (diff) | |
parent | c97b8d531d5584b767d0587805c1c95018cf92d6 (diff) | |
download | MPAndroidChart-1485cdc6875a4f85e223a93c169dd2e37740846d.tar.gz |
Merge pull request #3451 from davidgoli/add-grid-lines-on-top-of-data
Add option to draw limit lines on top of data
Diffstat (limited to 'MPChartLib/src/main/java/com')
-rw-r--r-- | MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarLineChartBase.java | 20 | ||||
-rw-r--r-- | MPChartLib/src/main/java/com/github/mikephil/charting/components/AxisBase.java | 17 |
2 files changed, 34 insertions, 3 deletions
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarLineChartBase.java b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarLineChartBase.java index 1cca83dd..0b0219e4 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarLineChartBase.java +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarLineChartBase.java @@ -212,9 +212,14 @@ public abstract class BarLineChartBase<T extends BarLineScatterCandleBubbleData< mAxisRendererLeft.renderAxisLine(canvas); mAxisRendererRight.renderAxisLine(canvas); - mXAxisRenderer.renderGridLines(canvas); - mAxisRendererLeft.renderGridLines(canvas); - mAxisRendererRight.renderGridLines(canvas); + if (mXAxis.isDrawGridLinesBehindDataEnabled()) + mXAxisRenderer.renderGridLines(canvas); + + if (mAxisLeft.isDrawGridLinesBehindDataEnabled()) + mAxisRendererLeft.renderGridLines(canvas); + + if (mAxisRight.isDrawGridLinesBehindDataEnabled()) + mAxisRendererRight.renderGridLines(canvas); if (mXAxis.isEnabled() && mXAxis.isDrawLimitLinesBehindDataEnabled()) mXAxisRenderer.renderLimitLines(canvas); @@ -231,6 +236,15 @@ public abstract class BarLineChartBase<T extends BarLineScatterCandleBubbleData< mRenderer.drawData(canvas); + if (!mXAxis.isDrawGridLinesBehindDataEnabled()) + mXAxisRenderer.renderGridLines(canvas); + + if (!mAxisLeft.isDrawGridLinesBehindDataEnabled()) + mAxisRendererLeft.renderGridLines(canvas); + + if (!mAxisRight.isDrawGridLinesBehindDataEnabled()) + mAxisRendererRight.renderGridLines(canvas); + // if highlighting is enabled if (valuesToHighlight()) mRenderer.drawHighlighted(canvas, mIndicesToHighlight); diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/components/AxisBase.java b/MPChartLib/src/main/java/com/github/mikephil/charting/components/AxisBase.java index 40835f73..3c8028c2 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/components/AxisBase.java +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/components/AxisBase.java @@ -113,6 +113,11 @@ public abstract class AxisBase extends ComponentBase { protected boolean mDrawLimitLineBehindData = false; /** + * flag indicating the grid lines layer depth + */ + protected boolean mDrawGridLinesBehindData = true; + + /** * Extra spacing for `axisMinimum` to be added to automatically calculated `axisMinimum` */ protected float mSpaceMin = 0.f; @@ -445,6 +450,18 @@ public abstract class AxisBase extends ComponentBase { } /** + * If this is set to false, the grid lines are draw on top of the actual data, + * otherwise behind. Default: true + * + * @param enabled + */ + public void setDrawGridLinesBehindData(boolean enabled) { mDrawGridLinesBehindData = enabled; } + + public boolean isDrawGridLinesBehindDataEnabled() { + return mDrawGridLinesBehindData; + } + + /** * Returns the longest formatted label (in terms of characters), this axis * contains. * |