Introducing zero line which can be drawn regardless of grid lines

PhilJay · PhilJay · commit 28775755ef56 · 2016-02-10T11:09:35.000+01:00
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartPositiveNegative.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartPositiveNegative.java
@@ -66,6 +66,7 @@ protected void onCreate(Bundle savedInstanceState) {
         left.setSpaceBottom(25f);
         left.setDrawAxisLine(false);
         left.setDrawGridLines(false);
+        left.setDrawZeroLine(true); // draw a zero line
         mChart.getAxisRight().setEnabled(false);
         mChart.getLegend().setEnabled(false);
 
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/StackedBarActivityNegative.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/StackedBarActivityNegative.java
@@ -62,6 +62,8 @@ protected void onCreate(Bundle savedInstanceState) {
         mChart.getAxisRight().setStartAtZero(false);
         mChart.getAxisRight().setAxisMaxValue(25f);
         mChart.getAxisRight().setAxisMinValue(-25f);
+        mChart.getAxisRight().setDrawGridLines(false);
+        mChart.getAxisRight().setDrawZeroLine(true);
         mChart.getAxisRight().setLabelCount(7, false);
         mChart.getAxisRight().setValueFormatter(new CustomFormatter());
         mChart.getAxisRight().setTextSize(9f);
diff --git a/MPChartLib/src/com/github/mikephil/charting/components/AxisBase.java b/MPChartLib/src/com/github/mikephil/charting/components/AxisBase.java
@@ -12,48 +12,62 @@
 
 /**
  * Baseclass of all labels.
- * 
+ *
  * @author Philipp Jahoda
  */
 public abstract class AxisBase extends ComponentBase {
 
-	private int mGridColor = Color.GRAY;
+    private int mGridColor = Color.GRAY;
 
     private float mGridLineWidth = 1f;
 
     private int mAxisLineColor = Color.GRAY;
 
     private float mAxisLineWidth = 1f;
 
-    /** flag indicating if the grid lines for this axis should be drawn */
+    /**
+     * flag indicating if the grid lines for this axis should be drawn
+     */
     protected boolean mDrawGridLines = true;
 
-    /** flag that indicates if the line alongside the axis is drawn or not */
+    /**
+     * flag that indicates if the line alongside the axis is drawn or not
+     */
     protected boolean mDrawAxisLine = true;
 
-    /** flag that indicates of the labels of this axis should be drawn or not */
+    /**
+     * flag that indicates of the labels of this axis should be drawn or not
+     */
     protected boolean mDrawLabels = true;
 
-    /** the path effect of the grid lines that makes dashed lines possible */
+    /**
+     * the path effect of the grid lines that makes dashed lines possible
+     */
     private DashPathEffect mGridDashPathEffect = null;
 
-	/** array of limit lines that can be set for the axis */
-	protected List<LimitLine> mLimitLines;
+    /**
+     * array of limit lines that can be set for the axis
+     */
+    protected List<LimitLine> mLimitLines;
 
-	/** flag indicating the limit lines layer depth */
-	protected boolean mDrawLimitLineBehindData = false;
+    /**
+     * flag indicating the limit lines layer depth
+     */
+    protected boolean mDrawLimitLineBehindData = false;
 
-    /** default constructor */
+    /**
+     * default constructor
+     */
     public AxisBase() {
         this.mTextSize = Utils.convertDpToPixel(10f);
         this.mXOffset = Utils.convertDpToPixel(5f);
         this.mYOffset = Utils.convertDpToPixel(5f);
-		this.mLimitLines = new ArrayList<LimitLine>();
-	}
+        this.mLimitLines = new ArrayList<LimitLine>();
+    }
 
     /**
      * Set this to true to enable drawing the grid lines for this axis.
-     * 
+     *
      * @param enabled
      */
     public void setDrawGridLines(boolean enabled) {
@@ -62,7 +76,7 @@ public void setDrawGridLines(boolean enabled) {
 
     /**
      * Returns true if drawing grid lines is enabled for this axis.
-     * 
+     *
      * @return
      */
     public boolean isDrawGridLinesEnabled() {
@@ -71,7 +85,7 @@ public boolean isDrawGridLinesEnabled() {
 
     /**
      * Set this to true if the line alongside the axis should be drawn or not.
-     * 
+     *
      * @param enabled
      */
     public void setDrawAxisLine(boolean enabled) {
@@ -80,7 +94,7 @@ public void setDrawAxisLine(boolean enabled) {
 
     /**
      * Returns true if the line alongside the axis should be drawn.
-     * 
+     *
      * @return
      */
     public boolean isDrawAxisLineEnabled() {
@@ -90,7 +104,7 @@ public boolean isDrawAxisLineEnabled() {
     /**
      * Sets the color of the grid lines for this axis (the horizontal lines
      * coming from each label).
-     * 
+     *
      * @param color
      */
     public void setGridColor(int color) {
@@ -100,7 +114,7 @@ public void setGridColor(int color) {
     /**
      * Returns the color of the grid lines for this axis (the horizontal lines
      * coming from each label).
-     * 
+     *
      * @return
      */
     public int getGridColor() {
@@ -109,7 +123,7 @@ public int getGridColor() {
 
     /**
      * Sets the width of the border surrounding the chart in dp.
-     * 
+     *
      * @param width
      */
     public void setAxisLineWidth(float width) {
@@ -118,7 +132,7 @@ public void setAxisLineWidth(float width) {
 
     /**
      * Returns the width of the axis line (line alongside the axis).
-     * 
+     *
      * @return
      */
     public float getAxisLineWidth() {
@@ -128,7 +142,7 @@ public float getAxisLineWidth() {
     /**
      * Sets the width of the grid lines that are drawn away from each axis
      * label.
-     * 
+     *
      * @param width
      */
     public void setGridLineWidth(float width) {
@@ -138,7 +152,7 @@ public void setGridLineWidth(float width) {
     /**
      * Returns the width of the grid lines that are drawn away from each axis
      * label.
-     * 
+     *
      * @return
      */
     public float getGridLineWidth() {
@@ -147,7 +161,7 @@ public float getGridLineWidth() {
 
     /**
      * Sets the color of the border surrounding the chart.
-     * 
+     *
      * @param color
      */
     public void setAxisLineColor(int color) {
@@ -156,7 +170,7 @@ public void setAxisLineColor(int color) {
 
     /**
      * Returns the color of the axis line (line alongside the axis).
-     * 
+     *
      * @return
      */
     public int getAxisLineColor() {
@@ -166,7 +180,7 @@ public int getAxisLineColor() {
     /**
      * Set this to true to enable drawing the labels of this axis (this will not
      * affect drawing the grid lines or axis lines).
-     * 
+     *
      * @param enabled
      */
     public void setDrawLabels(boolean enabled) {
@@ -175,70 +189,70 @@ public void setDrawLabels(boolean enabled) {
 
     /**
      * Returns true if drawing the labels is enabled for this axis.
-     * 
+     *
      * @return
      */
     public boolean isDrawLabelsEnabled() {
         return mDrawLabels;
     }
 
-	/**
-	 * Adds a new LimitLine to this axis.
-	 *
-	 * @param l
-	 */
-	public void addLimitLine(LimitLine l) {
-		mLimitLines.add(l);
-
-		if (mLimitLines.size() > 6) {
-			Log.e("MPAndroiChart",
-					"Warning! You have more than 6 LimitLines on your axis, do you really want that?");
-		}
-	}
-
-	/**
-	 * Removes the specified LimitLine from the axis.
-	 *
-	 * @param l
-	 */
-	public void removeLimitLine(LimitLine l) {
-		mLimitLines.remove(l);
-	}
-
-	/**
-	 * Removes all LimitLines from the axis.
-	 */
-	public void removeAllLimitLines() {
-		mLimitLines.clear();
-	}
-
-	/**
-	 * Returns the LimitLines of this axis.
-	 *
-	 * @return
-	 */
-	public List<LimitLine> getLimitLines() {
-		return mLimitLines;
-	}
-
-	/**
-	 * If this is set to true, the LimitLines are drawn behind the actual data,
-	 * otherwise on top. Default: false
-	 *
-	 * @param enabled
-	 */
-	public void setDrawLimitLinesBehindData(boolean enabled) {
-		mDrawLimitLineBehindData = enabled;
-	}
-
-	public boolean isDrawLimitLinesBehindDataEnabled() {
-		return mDrawLimitLineBehindData;
-	}
-
-	/**
+    /**
+     * Adds a new LimitLine to this axis.
+     *
+     * @param l
+     */
+    public void addLimitLine(LimitLine l) {
+        mLimitLines.add(l);
+
+        if (mLimitLines.size() > 6) {
+            Log.e("MPAndroiChart",
+                    "Warning! You have more than 6 LimitLines on your axis, do you really want that?");
+        }
+    }
+
+    /**
+     * Removes the specified LimitLine from the axis.
+     *
+     * @param l
+     */
+    public void removeLimitLine(LimitLine l) {
+        mLimitLines.remove(l);
+    }
+
+    /**
+     * Removes all LimitLines from the axis.
+     */
+    public void removeAllLimitLines() {
+        mLimitLines.clear();
+    }
+
+    /**
+     * Returns the LimitLines of this axis.
+     *
+     * @return
+     */
+    public List<LimitLine> getLimitLines() {
+        return mLimitLines;
+    }
+
+    /**
+     * If this is set to true, the LimitLines are drawn behind the actual data,
+     * otherwise on top. Default: false
+     *
+     * @param enabled
+     */
+    public void setDrawLimitLinesBehindData(boolean enabled) {
+        mDrawLimitLineBehindData = enabled;
+    }
+
+    public boolean isDrawLimitLinesBehindDataEnabled() {
+        return mDrawLimitLineBehindData;
+    }
+
+    /**
      * Returns the longest formatted label (in terms of characters), this axis
      * contains.
-     * 
+     *
      * @return
      */
     public abstract String getLongestLabel();
@@ -248,12 +262,12 @@ public boolean isDrawLimitLinesBehindDataEnabled() {
      * "- - - - - -". THIS ONLY WORKS IF HARDWARE-ACCELERATION IS TURNED OFF.
      * Keep in mind that hardware acceleration boosts performance.
      *
-     * @param lineLength the length of the line pieces
+     * @param lineLength  the length of the line pieces
      * @param spaceLength the length of space in between the pieces
-     * @param phase offset, in degrees (normally, use 0)
+     * @param phase       offset, in degrees (normally, use 0)
      */
     public void enableGridDashedLine(float lineLength, float spaceLength, float phase) {
-        mGridDashPathEffect = new DashPathEffect(new float[] {
+        mGridDashPathEffect = new DashPathEffect(new float[]{
                 lineLength, spaceLength
         }, phase);
     }
diff --git a/MPChartLib/src/com/github/mikephil/charting/components/YAxis.java b/MPChartLib/src/com/github/mikephil/charting/components/YAxis.java
@@ -67,6 +67,11 @@ public class YAxis extends AxisBase {
      */
     protected boolean mForceLabels = false;
 
+    /**
+     * flag that indicates if the zero-line should be drawn regardless of other grid lines
+     */
+    protected boolean mDrawZeroLine = true;
+
     /**
      * custom minimum value this axis represents
      */
@@ -346,6 +351,20 @@ public float getSpaceBottom() {
         return mSpacePercentBottom;
     }
 
+    public boolean isDrawZeroLineEnabled() {
+        return mDrawZeroLine;
+    }
+
+    /**
+     * Set this to true to draw the zero-line regardless of weather other
+     * grid-lines are enabled or not.
+     *
+     * @param mDrawZeroLine
+     */
+    public void setDrawZeroLine(boolean mDrawZeroLine) {
+        this.mDrawZeroLine = mDrawZeroLine;
+    }
+
     /**
      * This is for normal (not horizontal) charts horizontal spacing.
      *
diff --git a/MPChartLib/src/com/github/mikephil/charting/renderer/YAxisRenderer.java b/MPChartLib/src/com/github/mikephil/charting/renderer/YAxisRenderer.java
diff --git a/MPChartLib/src/com/github/mikephil/charting/renderer/YAxisRendererHorizontalBarChart.java b/MPChartLib/src/com/github/mikephil/charting/renderer/YAxisRendererHorizontalBarChart.java
