resetZoom()

MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarLineChartBase.java

@@ -571,17 +571,17 @@ public void computeScroll() {
      * VIEWPORT
      */
 
-    protected Matrix mZoomInMatrixBuffer = new Matrix();
+    protected Matrix mZoomMatrixBuffer = new Matrix();
 
     /**
-     * Zooms in by 1.4f, into the charts center. center.
+     * Zooms in by 1.4f, into the charts center.
      */
     public void zoomIn() {
 
         MPPointF center = mViewPortHandler.getContentCenter();
 
-        mViewPortHandler.zoomIn(center.x, -center.y, mZoomInMatrixBuffer);
-        mViewPortHandler.refresh(mZoomInMatrixBuffer, this, false);
+        mViewPortHandler.zoomIn(center.x, -center.y, mZoomMatrixBuffer);
+        mViewPortHandler.refresh(mZoomMatrixBuffer, this, false);
 
         MPPointF.recycleInstance(center);
 
@@ -592,17 +592,15 @@ public void zoomIn() {
         postInvalidate();
     }
 
-    protected Matrix mZoomOutMatrixBuffer = new Matrix();
-
     /**
-     * Zooms out by 0.7f, from the charts center. center.
+     * Zooms out by 0.7f, from the charts center.
      */
     public void zoomOut() {
 
         MPPointF center = mViewPortHandler.getContentCenter();
 
-        mViewPortHandler.zoomOut(center.x, -center.y, mZoomOutMatrixBuffer);
-        mViewPortHandler.refresh(mZoomOutMatrixBuffer, this, false);
+        mViewPortHandler.zoomOut(center.x, -center.y, mZoomMatrixBuffer);
+        mViewPortHandler.refresh(mZoomMatrixBuffer, this, false);
 
         MPPointF.recycleInstance(center);
 
@@ -613,7 +611,20 @@ public void zoomOut() {
         postInvalidate();
     }
 
-    protected Matrix mZoomMatrixBuffer = new Matrix();
+    /**
+     * Zooms out to original size.
+     */
+    public void resetZoom() {
+
+        mViewPortHandler.resetZoom(mZoomMatrixBuffer);
+        mViewPortHandler.refresh(mZoomMatrixBuffer, this, false);
+
+        // Range might have changed, which means that Y-axis labels
+        // could have changed in size, affecting Y-axis size.
+        // So we need to recalculate offsets.
+        calculateOffsets();
+        postInvalidate();
+    }
 
     /**
      * Zooms in or out by the given scale factor. x and y are the coordinates
@@ -625,9 +636,9 @@ public void zoomOut() {
      * @param y
      */
     public void zoom(float scaleX, float scaleY, float x, float y) {
-        Matrix save = mZoomMatrixBuffer;
-        mViewPortHandler.zoom(scaleX, scaleY, x, -y, save);
-        mViewPortHandler.refresh(save, this, false);
+
+        mViewPortHandler.zoom(scaleX, scaleY, x, -y, mZoomMatrixBuffer);
+        mViewPortHandler.refresh(mZoomMatrixBuffer, this, false);
 
         // Range might have changed, which means that Y-axis labels
         // could have changed in size, affecting Y-axis size.

MPChartLib/src/main/java/com/github/mikephil/charting/utils/ViewPortHandler.java

@@ -223,6 +223,16 @@ public void zoomOut(float x, float y, Matrix outputMatrix) {
         outputMatrix.postScale(0.7f, 0.7f, x, y);
     }
 
+    /**
+     * Zooms out to original size.
+     * @param outputMatrix
+     */
+    public void resetZoom(Matrix outputMatrix) {
+        outputMatrix.reset();
+        outputMatrix.set(mMatrixTouch);
+        outputMatrix.postScale(1.0f, 1.0f, 0.0f, 0.0f);
+    }
+
     /**
      * Post-scales by the specified scale factors.
      *