aboutsummaryrefslogtreecommitdiff
path: root/MPChartLib
diff options
context:
space:
mode:
authorPhilipp Jahoda <phil.jahoda@gmail.com>2016-08-11 12:46:52 +0200
committerPhilipp Jahoda <phil.jahoda@gmail.com>2016-08-11 12:46:52 +0200
commite158ef15e23bb8f00f4cf064a181bd1a018d604b (patch)
tree5937508584650bcb3e90f712644e7d4cbfc1a253 /MPChartLib
parent788539001ff66550fe895d2868c3a4b1a56df02c (diff)
downloadMPAndroidChart-e158ef15e23bb8f00f4cf064a181bd1a018d604b.tar.gz
Renaming of setAxisMinValue etc to setAxisMinimum for consistency
Diffstat (limited to 'MPChartLib')
-rw-r--r--MPChartLib/src/main/java/com/github/mikephil/charting/components/AxisBase.java30
-rw-r--r--MPChartLib/src/main/java/com/github/mikephil/charting/components/YAxis.java6
2 files changed, 28 insertions, 8 deletions
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 bc729f11..a579549f 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
@@ -5,8 +5,8 @@ import android.graphics.Color;
import android.graphics.DashPathEffect;
import android.util.Log;
-import com.github.mikephil.charting.formatter.IAxisValueFormatter;
import com.github.mikephil.charting.formatter.DefaultAxisValueFormatter;
+import com.github.mikephil.charting.formatter.IAxisValueFormatter;
import com.github.mikephil.charting.utils.Utils;
import java.util.ArrayList;
@@ -542,7 +542,7 @@ public abstract class AxisBase extends ComponentBase {
* and the calculation is
* done automatically.
*/
- public void resetAxisMaxValue() {
+ public void resetAxisMaximum() {
mCustomAxisMax = false;
}
@@ -560,7 +560,7 @@ public abstract class AxisBase extends ComponentBase {
* and the calculation is
* done automatically.
*/
- public void resetAxisMinValue() {
+ public void resetAxisMinimum() {
mCustomAxisMin = false;
}
@@ -582,26 +582,46 @@ public abstract class AxisBase extends ComponentBase {
*
* @param min
*/
- public void setAxisMinValue(float min) {
+ public void setAxisMinimum(float min) {
mCustomAxisMin = true;
mAxisMinimum = min;
this.mAxisRange = Math.abs(mAxisMaximum - min);
}
/**
+ * Use setAxisMinimum(...) instead.
+ *
+ * @param min
+ */
+ @Deprecated
+ public void setAxisMinValue(float min) {
+ setAxisMinimum(min);
+ }
+
+ /**
* Set a custom maximum value for this axis. If set, this value will not be calculated
* automatically depending on
* the provided data. Use resetAxisMaxValue() to undo this.
*
* @param max
*/
- public void setAxisMaxValue(float max) {
+ public void setAxisMaximum(float max) {
mCustomAxisMax = true;
mAxisMaximum = max;
this.mAxisRange = Math.abs(max - mAxisMinimum);
}
/**
+ * Use setAxisMaximum(...) instead.
+ *
+ * @param max
+ */
+ @Deprecated
+ public void setAxisMaxValue(float max) {
+ setAxisMaximum(max);
+ }
+
+ /**
* Calculates the minimum / maximum and range values of the axis with the given
* minimum and maximum values from the chart data.
*
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/components/YAxis.java b/MPChartLib/src/main/java/com/github/mikephil/charting/components/YAxis.java
index 21dc5f73..82d77c4c 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/components/YAxis.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/components/YAxis.java
@@ -201,16 +201,16 @@ public class YAxis extends AxisBase {
/**
* This method is deprecated.
- * Use setAxisMinValue(...) / setAxisMaxValue(...) instead.
+ * Use setAxisMinimum(...) / setAxisMaximum(...) instead.
*
* @param startAtZero
*/
@Deprecated
public void setStartAtZero(boolean startAtZero) {
if (startAtZero)
- setAxisMinValue(0f);
+ setAxisMinimum(0f);
else
- resetAxisMinValue();
+ resetAxisMinimum();
}
/**