Adds ability to set human rounding in X separately from Y.

paulpjoby · Apr 4, 2017 · e85ac64 · e85ac64
1 parent 98b3b10
commit e85ac64
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 13 deletions.
diff --git a/src/main/java/com/jjoe64/graphview/GridLabelRenderer.java b/src/main/java/com/jjoe64/graphview/GridLabelRenderer.java
@@ -324,6 +324,13 @@ public void setSecondScaleLabelVerticalWidth(Integer newWidth) {
         mLabelVerticalSecondScaleWidth = newWidth;
     }
 
+    /**
+     * activate or deactivate human rounding of the
+     * horizontal axis. GraphView tries to fit the labels
+     * to display numbers that can be divided by 1, 2, or 5.
+     */
+    private boolean mHumanRoundingY;
+
     /**
      * activate or deactivate human rounding of the
      * horizontal axis. GraphView tries to fit the labels
@@ -332,7 +339,7 @@ public void setSecondScaleLabelVerticalWidth(Integer newWidth) {
      * By default this is enabled. It makes sense to deactivate it
      * when using Dates on the x axis.
      */
-    private boolean mHumanRounding;
+    private boolean mHumanRoundingX;
 
     /**
      * create the default grid label renderer.
@@ -346,7 +353,8 @@ public GridLabelRenderer(GraphView graphView) {
         resetStyles();
         mNumVerticalLabels = 5;
         mNumHorizontalLabels = 5;
-        mHumanRounding = true;
+        mHumanRoundingX = true;
+        mHumanRoundingY = true;
     }
 
     /**
@@ -436,8 +444,18 @@ public void reloadStyles() {
 
      * @return if human rounding is enabled
      */
-    public boolean isHumanRounding() {
-        return mHumanRounding;
+    public boolean isHumanRoundingX() {
+        return mHumanRoundingX;
+    }
+
+    /**
+     * GraphView tries to fit the labels
+     * to display numbers that can be divided by 1, 2, or 5.
+     *
+     * @return if human rounding is enabled
+     */
+    public boolean isHumanRoundingY() {
+        return mHumanRoundingY;
     }
 
     /**
@@ -448,10 +466,12 @@ public boolean isHumanRounding() {
      * By default this is enabled. It makes sense to deactivate it
      * when using Dates on the x axis.
      *
-     * @param humanRounding false to deactivate
+     * @param humanRoundingX false to deactivate
+     * @param humanRoundingY false to deactivate
      */
-    public void setHumanRounding(boolean humanRounding) {
-        this.mHumanRounding = humanRounding;
+    public void setHumanRounding(boolean humanRoundingX, boolean humanRoundingY) {
+        this.mHumanRoundingX = humanRoundingX;
+        this.mHumanRoundingY = humanRoundingY;
     }
 
     /**
@@ -692,7 +712,7 @@ protected boolean adjustVertical(boolean changeBounds) {
         }
 
         // human rounding to have nice numbers (1, 2, 5, ...)
-        if (isHumanRounding()) {
+        if (isHumanRoundingY()) {
             exactSteps = humanRound(exactSteps, changeBounds);
         } else if (mStepsVertical != null && mStepsVertical.size() > 1) {
             // else choose other nice steps that previous
@@ -831,7 +851,7 @@ protected boolean adjustHorizontal(boolean changeBounds) {
         }
 
         // human rounding to have nice numbers (1, 2, 5, ...)
-        if (isHumanRounding()) {
+        if (isHumanRoundingX()) {
             exactSteps = humanRound(exactSteps, false);
         } else if (mStepsHorizontal != null && mStepsHorizontal.size() > 1) {
             // else choose other nice steps that previous

diff --git a/src/main/java/com/jjoe64/graphview/Viewport.java b/src/main/java/com/jjoe64/graphview/Viewport.java
@@ -50,14 +50,14 @@ public class Viewport {
     /**
      * this reference value is used to generate the
      * vertical labels. It is used when the y axis bounds
-     * is set manual and humanRounding=false. it will be the minValueY value.
+     * is set manual and humanRoundingY=false. it will be the minValueY value.
      */
     protected double referenceY = Double.NaN;
 
     /**
      * this reference value is used to generate the
      * horizontal labels. It is used when the x axis bounds
-     * is set manual and humanRounding=false. it will be the minValueX value.
+     * is set manual and humanRoundingX=false. it will be the minValueX value.
      */
     protected double referenceX = Double.NaN;
 
@@ -83,7 +83,7 @@ public class Viewport {
     protected double getReferenceX() {
         // if the bounds is manual then we take the
         // original manual min y value as reference
-        if (isXAxisBoundsManual() && !mGraphView.getGridLabelRenderer().isHumanRounding()) {
+        if (isXAxisBoundsManual() && !mGraphView.getGridLabelRenderer().isHumanRoundingX()) {
             if (Double.isNaN(referenceX)) {
                 referenceX = getMinX(false);
             }
@@ -1263,7 +1263,7 @@ public void setScrollableY(boolean scrollableY) {
     protected double getReferenceY() {
         // if the bounds is manual then we take the
         // original manual min y value as reference
-        if (isYAxisBoundsManual() && !mGraphView.getGridLabelRenderer().isHumanRounding()) {
+        if (isYAxisBoundsManual() && !mGraphView.getGridLabelRenderer().isHumanRoundingY()) {
             if (Double.isNaN(referenceY)) {
                 referenceY = getMinY(false);
             }