Merge pull request #694 from danielgindi/auto-scale-y-axis

Auto scale y axis
PhilJay · May 31, 2015 · 9fdd30b · 9fdd30b
2 parents 2ac47ea + 6606853
commit 9fdd30b
Show file tree

Hide file tree

Showing 28 changed files with 257 additions and 62 deletions.
diff --git a/MPChartExample/res/menu/bar.xml b/MPChartExample/res/menu/bar.xml
@@ -45,5 +45,9 @@
         android:id="@+id/actionTogglePinch"
         android:title="Toggle PinchZoom">
     </item>
+    <item
+        android:id="@+id/actionToggleAutoScaleMinMax"
+        android:title="Toggle auto scale min/max">
+    </item>
 
 </menu>
diff --git a/MPChartExample/res/menu/bubble.xml b/MPChartExample/res/menu/bubble.xml
@@ -41,5 +41,9 @@
         android:id="@+id/actionTogglePinch"
         android:title="Toggle PinchZoom">
     </item>
+    <item
+        android:id="@+id/actionToggleAutoScaleMinMax"
+        android:title="Toggle auto scale min/max">
+    </item>
 
 </menu>
diff --git a/MPChartExample/res/menu/candle.xml b/MPChartExample/res/menu/candle.xml
@@ -33,5 +33,9 @@
         android:id="@+id/actionTogglePinch"
         android:title="Toggle PinchZoom">
     </item>
+    <item
+        android:id="@+id/actionToggleAutoScaleMinMax"
+        android:title="Toggle auto scale min/max">
+    </item>
 
 </menu>
diff --git a/MPChartExample/res/menu/draw.xml b/MPChartExample/res/menu/draw.xml
@@ -37,4 +37,8 @@
         android:id="@+id/actionTogglePinch"
         android:title="Toggle PinchZoom">
     </item>
+    <item
+        android:id="@+id/actionToggleAutoScaleMinMax"
+        android:title="Toggle auto scale min/max">
+    </item>
 </menu>
diff --git a/MPChartExample/res/menu/line.xml b/MPChartExample/res/menu/line.xml
@@ -49,8 +49,12 @@
         android:id="@+id/actionSave"
         android:title="Save to SD-Card">
     </item>
-<item
+    <item
         android:id="@+id/actionTogglePinch"
         android:title="Toggle PinchZoom">
     </item>
+    <item
+        android:id="@+id/actionToggleAutoScaleMinMax"
+        android:title="Toggle auto scale min/max">
+    </item>
 </menu>
diff --git a/MPChartExample/res/menu/scatter.xml b/MPChartExample/res/menu/scatter.xml
@@ -41,5 +41,9 @@
         android:id="@+id/actionTogglePinch"
         android:title="Toggle PinchZoom">
     </item>
+    <item
+        android:id="@+id/actionToggleAutoScaleMinMax"
+        android:title="Toggle auto scale min/max">
+    </item>
 
 </menu>
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/AnotherBarActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/AnotherBarActivity.java
@@ -120,6 +120,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 mChart.invalidate();
                 break;
             }
+            case R.id.actionToggleAutoScaleMinMax: {
+                mChart.setAutoScaleMinMaxEnabled(!mChart.isAutoScaleMinMaxEnabled());
+                mChart.notifyDataSetChanged();
+                break;
+            }
             case R.id.actionToggleHighlightArrow: {
                 if (mChart.isDrawHighlightArrowEnabled())
                     mChart.setDrawHighlightArrow(false);

diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivity.java
@@ -165,6 +165,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 mChart.invalidate();
                 break;
             }
+            case R.id.actionToggleAutoScaleMinMax: {
+                mChart.setAutoScaleMinMaxEnabled(!mChart.isAutoScaleMinMaxEnabled());
+                mChart.notifyDataSetChanged();
+                break;
+            }
             case R.id.actionToggleHighlightArrow: {
                 if (mChart.isDrawHighlightArrowEnabled())
                     mChart.setDrawHighlightArrow(false);

diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivityMultiDataset.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivityMultiDataset.java
@@ -126,6 +126,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 mChart.invalidate();
                 break;
             }
+            case R.id.actionToggleAutoScaleMinMax: {
+                mChart.setAutoScaleMinMaxEnabled(!mChart.isAutoScaleMinMaxEnabled());
+                mChart.notifyDataSetChanged();
+                break;
+            }
             case R.id.actionToggleHighlight: {
                 if (mChart.isHighlightEnabled())
                     mChart.setHighlightEnabled(false);

diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivitySinus.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivitySinus.java
@@ -146,6 +146,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 mChart.invalidate();
                 break;
             }
+            case R.id.actionToggleAutoScaleMinMax: {
+                mChart.setAutoScaleMinMaxEnabled(!mChart.isAutoScaleMinMaxEnabled());
+                mChart.notifyDataSetChanged();
+                break;
+            }
             case R.id.actionToggleHighlightArrow: {
                 if (mChart.isDrawHighlightArrowEnabled())
                     mChart.setDrawHighlightArrow(false);

diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/BubbleChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/BubbleChartActivity.java
@@ -132,6 +132,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 mChart.invalidate();
                 break;
             }
+            case R.id.actionToggleAutoScaleMinMax: {
+                mChart.setAutoScaleMinMaxEnabled(!mChart.isAutoScaleMinMaxEnabled());
+                mChart.notifyDataSetChanged();
+                break;
+            }
             case R.id.actionToggleStartzero: {
                 mChart.getAxisLeft().setStartAtZero(!mChart.getAxisLeft().isStartAtZeroEnabled());
                 mChart.getAxisRight().setStartAtZero(!mChart.getAxisRight().isStartAtZeroEnabled());

diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/CandleStickChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/CandleStickChartActivity.java
@@ -117,6 +117,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 mChart.invalidate();
                 break;
             }
+            case R.id.actionToggleAutoScaleMinMax: {
+                mChart.setAutoScaleMinMaxEnabled(!mChart.isAutoScaleMinMaxEnabled());
+                mChart.notifyDataSetChanged();
+                break;
+            }
             case R.id.actionToggleStartzero: {
                 mChart.getAxisLeft().setStartAtZero(!mChart.getAxisLeft().isStartAtZeroEnabled());
                 mChart.getAxisRight().setStartAtZero(!mChart.getAxisRight().isStartAtZeroEnabled());

diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/CubicLineChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/CubicLineChartActivity.java
@@ -178,6 +178,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 mChart.invalidate();
                 break;
             }
+            case R.id.actionToggleAutoScaleMinMax: {
+                mChart.setAutoScaleMinMaxEnabled(!mChart.isAutoScaleMinMaxEnabled());
+                mChart.notifyDataSetChanged();
+                break;
+            }
             case R.id.animateX: {
                 mChart.animateX(3000);
                 break;

diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/DrawChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/DrawChartActivity.java
@@ -141,6 +141,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 mChart.invalidate();
                 break;
             }
+            case R.id.actionToggleAutoScaleMinMax: {
+                mChart.setAutoScaleMinMaxEnabled(!mChart.isAutoScaleMinMaxEnabled());
+                mChart.notifyDataSetChanged();
+                break;
+            }
             case R.id.actionSave: {
                 // mChart.saveToGallery("title"+System.currentTimeMillis());
                 mChart.saveToPath("title" + System.currentTimeMillis(), "");

diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/HorizontalBarChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/HorizontalBarChartActivity.java
@@ -156,6 +156,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 mChart.invalidate();
                 break;
             }
+            case R.id.actionToggleAutoScaleMinMax: {
+                mChart.setAutoScaleMinMaxEnabled(!mChart.isAutoScaleMinMaxEnabled());
+                mChart.notifyDataSetChanged();
+                break;
+            }
             case R.id.actionToggleHighlightArrow: {
                 if (mChart.isDrawHighlightArrowEnabled())
                     mChart.setDrawHighlightArrow(false);

diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/InvertedLineChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/InvertedLineChartActivity.java
@@ -198,6 +198,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 mChart.invalidate();
                 break;
             }
+            case R.id.actionToggleAutoScaleMinMax: {
+                mChart.setAutoScaleMinMaxEnabled(!mChart.isAutoScaleMinMaxEnabled());
+                mChart.notifyDataSetChanged();
+                break;
+            }
             case R.id.actionToggleFilter: {
 
                 // the angle of filtering is 35°

diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartActivity1.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartActivity1.java
@@ -240,6 +240,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 mChart.invalidate();
                 break;
             }
+            case R.id.actionToggleAutoScaleMinMax: {
+                mChart.setAutoScaleMinMaxEnabled(!mChart.isAutoScaleMinMaxEnabled());
+                mChart.notifyDataSetChanged();
+                break;
+            }
             case R.id.animateX: {
                 mChart.animateX(3000);
                 break;

diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartActivity2.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartActivity2.java
@@ -206,6 +206,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 mChart.invalidate();
                 break;
             }
+            case R.id.actionToggleAutoScaleMinMax: {
+                mChart.setAutoScaleMinMaxEnabled(!mChart.isAutoScaleMinMaxEnabled());
+                mChart.notifyDataSetChanged();
+                break;
+            }
             case R.id.animateX: {
                 mChart.animateX(3000);
                 break;

diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/MultiLineChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/MultiLineChartActivity.java
@@ -103,6 +103,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 mChart.invalidate();
                 break;
             }
+            case R.id.actionToggleAutoScaleMinMax: {
+                mChart.setAutoScaleMinMaxEnabled(!mChart.isAutoScaleMinMaxEnabled());
+                mChart.notifyDataSetChanged();
+                break;
+            }
             case R.id.actionToggleHighlight: {
                 if (mChart.isHighlightEnabled())
                     mChart.setHighlightEnabled(false);

diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/ScatterChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/ScatterChartActivity.java
@@ -125,6 +125,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 mChart.invalidate();
                 break;
             }
+            case R.id.actionToggleAutoScaleMinMax: {
+                mChart.setAutoScaleMinMaxEnabled(!mChart.isAutoScaleMinMaxEnabled());
+                mChart.notifyDataSetChanged();
+                break;
+            }
             case R.id.actionToggleStartzero: {
                 mChart.getAxisLeft().setStartAtZero(!mChart.getAxisLeft().isStartAtZeroEnabled());
                 mChart.getAxisRight().setStartAtZero(!mChart.getAxisRight().isStartAtZeroEnabled());

diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/StackedBarActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/StackedBarActivity.java
@@ -136,6 +136,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 mChart.invalidate();
                 break;
             }
+            case R.id.actionToggleAutoScaleMinMax: {
+                mChart.setAutoScaleMinMaxEnabled(!mChart.isAutoScaleMinMaxEnabled());
+                mChart.notifyDataSetChanged();
+                break;
+            }
             case R.id.actionToggleHighlightArrow: {
                 if (mChart.isDrawHighlightArrowEnabled())
                     mChart.setDrawHighlightArrow(false);

diff --git a/MPChartLib/src/com/github/mikephil/charting/charts/BarLineChartBase.java b/MPChartLib/src/com/github/mikephil/charting/charts/BarLineChartBase.java
@@ -54,6 +54,11 @@ public abstract class BarLineChartBase<T extends BarLineScatterCandleData<? exte
     /** the maximum number of entried to which values will be drawn */
     protected int mMaxVisibleCount = 100;
 
+    /** flag that indicates if auto scaling on the y axis is enabled */
+    private boolean mAutoScaleMinMaxEnabled = false;
+    private Integer mAutoScaleLastLowestVisibleXIndex = null;
+    private Integer mAutoScaleLastHighestVisibleXIndex = null;
+
     /**
      * flag that indicates if pinch-zoom is enabled. if true, both x and y axis
      * can be scaled with 2 fingers, if false, x and y axis can be scaled
@@ -192,6 +197,23 @@ protected void onDraw(Canvas canvas) {
         mAxisRendererLeft.renderAxisLine(canvas);
         mAxisRendererRight.renderAxisLine(canvas);
 
+        if (mAutoScaleMinMaxEnabled) {
+            final int lowestVisibleXIndex = getLowestVisibleXIndex();
+            final int highestVisibleXIndex = getHighestVisibleXIndex();
+
+            if (mAutoScaleLastLowestVisibleXIndex == null ||
+                    mAutoScaleLastLowestVisibleXIndex != lowestVisibleXIndex ||
+                    mAutoScaleLastHighestVisibleXIndex == null ||
+                    mAutoScaleLastHighestVisibleXIndex != highestVisibleXIndex) {
+
+                calcMinMax();
+                calculateOffsets();
+
+                mAutoScaleLastLowestVisibleXIndex = lowestVisibleXIndex;
+                mAutoScaleLastHighestVisibleXIndex = highestVisibleXIndex;
+            }
+        }
+
         // make sure the graph values and grid cannot be drawn outside the
         // content-rect
         int clipRestoreCount = canvas.save();
@@ -314,6 +336,9 @@ public void notifyDataSetChanged() {
     @Override
     protected void calcMinMax() {
 
+        if (mAutoScaleMinMaxEnabled)
+            mData.calcMinMax(getLowestVisibleXIndex(), getHighestVisibleXIndex());
+
         float minLeft = mData.getYMin(AxisDependency.LEFT);
         float maxLeft = mData.getYMax(AxisDependency.LEFT);
         float minRight = mData.getYMin(AxisDependency.RIGHT);
@@ -1376,6 +1401,24 @@ public boolean isAnyAxisInverted() {
         return false;
     }
 
+    /**
+     * flag that indicates if auto scaling on the y axis is enabled.
+     * @param enabled if yes, the y axis automatically adjusts to the
+     *                min and max y values of the current x axis range
+     *                whenever the viewport changes
+     */
+    public void setAutoScaleMinMaxEnabled(boolean enabled) {
+        mAutoScaleMinMaxEnabled = enabled;
+    }
+
+    /**
+     * @default false
+     * @return true if auto scaling on the y axis is enabled.
+     */
+    public boolean isAutoScaleMinMaxEnabled() {
+        return mAutoScaleMinMaxEnabled;
+    }
+
     @Override
     public void setPaint(Paint p, int which) {
         super.setPaint(p, which);

diff --git a/MPChartLib/src/com/github/mikephil/charting/data/BubbleDataSet.java b/MPChartLib/src/com/github/mikephil/charting/data/BubbleDataSet.java
@@ -46,13 +46,30 @@ public void setColor(int color, int alpha) {
     }
 
     @Override
-    protected void calcMinMax() {
-
+    protected void calcMinMax(int start, int end) {
+        if (mYVals.size() == 0)
+            return;
+
         final List<BubbleEntry> entries = getYVals();
 
+        int endValue;
+
+        if (end == 0)
+            endValue = mYVals.size() - 1;
+        else
+            endValue = end;
+
+        mLastStart = start;
+        mLastEnd = endValue;
+
+        mYMin = yMin(entries.get(start));
+        mYMax = yMax(entries.get(start));
+
         // need chart width to guess this properly
 
-        for (BubbleEntry entry : entries) {
+        for (int i = start; i <= endValue; i++) {
+
+            final BubbleEntry entry = entries.get(i);
 
             final float ymin = yMin(entry);
             final float ymax = yMax(entry);

diff --git a/MPChartLib/src/com/github/mikephil/charting/data/CandleDataSet.java b/MPChartLib/src/com/github/mikephil/charting/data/CandleDataSet.java
@@ -66,19 +66,28 @@ public DataSet<CandleEntry> copy() {
     }
 
     @Override
-    protected void calcMinMax() {
+    protected void calcMinMax(int start, int end) {
         // super.calcMinMax();
 
-        if (mYVals.size() == 0) {
+        if (mYVals.size() == 0)
             return;
-        }
 
         List<CandleEntry> entries = mYVals;
 
-        mYMin = entries.get(0).getLow();
-        mYMax = entries.get(0).getHigh();
+        int endValue;
+
+        if (end == 0)
+            endValue = mYVals.size() - 1;
+        else
+            endValue = end;
+
+        mLastStart = start;
+        mLastEnd = endValue;
+
+        mYMin = mYVals.get(start).getLow();
+        mYMax = mYVals.get(start).getHigh();
 
-        for (int i = 0; i < entries.size(); i++) {
+        for (int i = start + 1; i <= endValue; i++) {
 
             CandleEntry e = entries.get(i);