Added IndexAxisValueFormatter, to allow for easy x-axis labels like MPAndroidChart 2.0

danielgindi · danielgindi · commit 4cb83a7b9156 · 2016-11-16T11:19:50.000+02:00
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivityMultiDataset.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivityMultiDataset.java
@@ -96,11 +96,6 @@ protected void onCreate(Bundle savedInstanceState) {
             public String getFormattedValue(float value, AxisBase axis) {
                 return String.valueOf((int) value);
             }
-
-            @Override
-            public int getDecimalDigits() {
-                return 0;
-            }
         });
 
         YAxis leftAxis = mChart.getAxisLeft();
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartPositiveNegative.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartPositiveNegative.java
@@ -90,11 +90,6 @@ protected void onCreate(Bundle savedInstanceState) {
             public String getFormattedValue(float value, AxisBase axis) {
                 return data.get(Math.min(Math.max((int) value, 0), data.size()-1)).xAxisValue;
             }
-
-            @Override
-            public int getDecimalDigits() {
-                return 0;
-            }
         });
 
         setData(data);
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/CombinedChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/CombinedChartActivity.java
@@ -84,11 +84,6 @@ protected void onCreate(Bundle savedInstanceState) {
             public String getFormattedValue(float value, AxisBase axis) {
                 return mMonths[(int) value % mMonths.length];
             }
-
-            @Override
-            public int getDecimalDigits() {
-                return 0;
-            }
         });
 
         CombinedData data = new CombinedData();
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartTime.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartTime.java
@@ -100,11 +100,6 @@ public String getFormattedValue(float value, AxisBase axis) {
                 long millis = TimeUnit.HOURS.toMillis((long) value);
                 return mFormat.format(new Date(millis));
             }
-
-            @Override
-            public int getDecimalDigits() {
-                return 0;
-            }
         });
 
         YAxis leftAxis = mChart.getAxisLeft();
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/RadarChartActivitry.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/RadarChartActivitry.java
@@ -81,11 +81,6 @@ protected void onCreate(Bundle savedInstanceState) {
             public String getFormattedValue(float value, AxisBase axis) {
                 return mActivities[(int) value % mActivities.length];
             }
-
-            @Override
-            public int getDecimalDigits() {
-                return 0;
-            }
         });
         xAxis.setTextColor(Color.WHITE);
 
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/StackedBarActivityNegative.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/StackedBarActivityNegative.java
@@ -85,11 +85,6 @@ protected void onCreate(Bundle savedInstanceState) {
             public String getFormattedValue(float value, AxisBase axis) {
                 return format.format(value) + "-" + format.format(value + 10);
             }
-
-            @Override
-            public int getDecimalDigits() {
-                return 0;
-            }
         });
 
         Legend l = mChart.getLegend();
@@ -243,10 +238,5 @@ public String getFormattedValue(float value, Entry entry, int dataSetIndex, View
         public String getFormattedValue(float value, AxisBase axis) {
             return mFormat.format(Math.abs(value)) + "m";
         }
-
-        @Override
-        public int getDecimalDigits() {
-            return 0;
-        }
     }
 }
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/DayAxisValueFormatter.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/DayAxisValueFormatter.java
@@ -136,9 +136,4 @@ else if (days <= 1458)
             return 2020;
 
     }
-
-    @Override
-    public int getDecimalDigits() {
-        return 0;
-    }
 }
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/MyAxisValueFormatter.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/MyAxisValueFormatter.java
@@ -18,9 +18,4 @@ public MyAxisValueFormatter() {
     public String getFormattedValue(float value, AxisBase axis) {
         return mFormat.format(value) + " $";
     }
-
-    @Override
-    public int getDecimalDigits() {
-        return 1;
-    }
 }
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/MyCustomXAxisValueFormatter.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/MyCustomXAxisValueFormatter.java
@@ -37,9 +37,4 @@ else if (xScale > 1)
         else
             return mFormat.format(value);
     }
-
-    @Override
-    public int getDecimalDigits() {
-        return 1;
-    }
 }
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/YearXAxisFormatter.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/YearXAxisFormatter.java
@@ -24,9 +24,4 @@ public String getFormattedValue(float value, AxisBase axis) {
         float percent = value / axis.mAxisRange;
         return mMonths[(int) (mMonths.length * percent)];
     }
-
-    @Override
-    public int getDecimalDigits() {
-        return 0;
-    }
 }
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/realm/RealmWikiExample.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/realm/RealmWikiExample.java
@@ -90,11 +90,6 @@ private void setData() {
             public String getFormattedValue(float value, AxisBase axis) {
                 return results.get((int) value).getPlayerName();
             }
-
-            @Override
-            public int getDecimalDigits() {
-                return 0;
-            }
         };
 
         lineChart.getXAxis().setValueFormatter(formatter);
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
@@ -496,12 +496,10 @@ public void setValueFormatter(IAxisValueFormatter f) {
      */
     public IAxisValueFormatter getValueFormatter() {
 
-        if (mAxisValueFormatter == null) {
+        if (mAxisValueFormatter == null ||
+                (mAxisValueFormatter instanceof DefaultAxisValueFormatter &&
+                        ((DefaultAxisValueFormatter)mAxisValueFormatter).getDecimalDigits() != mDecimals))
             mAxisValueFormatter = new DefaultAxisValueFormatter(mDecimals);
-        } else if (mAxisValueFormatter.getDecimalDigits() != mDecimals && mAxisValueFormatter instanceof
-                DefaultAxisValueFormatter) {
-            mAxisValueFormatter = new DefaultAxisValueFormatter(mDecimals);
-        }
 
         return mAxisValueFormatter;
     }
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/DefaultAxisValueFormatter.java b/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/DefaultAxisValueFormatter.java
@@ -45,7 +45,11 @@ public String getFormattedValue(float value, AxisBase axis) {
         return mFormat.format(value);
     }
 
-    @Override
+    /**
+     * Returns the number of decimal digits this formatter uses or -1, if unspecified.
+     *
+     * @return
+     */
     public int getDecimalDigits() {
         return digits;
     }
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/IAxisValueFormatter.java b/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/IAxisValueFormatter.java
@@ -20,11 +20,4 @@ public interface IAxisValueFormatter
      * @return
      */
     String getFormattedValue(float value, AxisBase axis);
-
-    /**
-     * Returns the number of decimal digits this formatter uses or -1, if unspecified.
-     *
-     * @return
-     */
-    int getDecimalDigits();
 }
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/IndexAxisValueFormatter.java b/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/IndexAxisValueFormatter.java
@@ -0,0 +1,69 @@
+
+package com.github.mikephil.charting.formatter;
+
+import com.github.mikephil.charting.components.AxisBase;
+import com.github.mikephil.charting.data.Entry;
+import com.github.mikephil.charting.utils.ViewPortHandler;
+
+import java.text.DecimalFormat;
+import java.util.Arrays;
+import java.util.Collection;
+
+/**
+ * This formatter is used for passing an array of x-axis labels, on whole x steps.
+ */
+public class IndexAxisValueFormatter implements IAxisValueFormatter
+{
+    private String[] mValues = new String[] {};
+    private int mValueCount = 0;
+
+    /**
+     * An empty constructor.
+     * Use `setValues` to set the axis labels.
+     */
+    public IndexAxisValueFormatter() {
+    }
+
+    /**
+     * Constructor that specifies axis labels.
+     *
+     * @param values The values string array
+     */
+    public IndexAxisValueFormatter(String[] values) {
+        if (values != null)
+            setValues(values);
+    }
+
+    /**
+     * Constructor that specifies axis labels.
+     *
+     * @param values The values string array
+     */
+    public IndexAxisValueFormatter(Collection<String> values) {
+        if (values != null)
+            setValues(values.toArray(new String[values.size()]));
+    }
+
+    public String getFormattedValue(float value, AxisBase axis) {
+        int index = Math.round(value);
+
+        if (index < 0 || index >= mValueCount || index != (int)value)
+            return "";
+
+        return mValues[index];
+    }
+
+    public String[] getValues()
+    {
+        return mValues;
+    }
+
+    public void setValues(String[] values)
+    {
+        if (values == null)
+            values = new String[] {};
+
+        this.mValues = values;
+        this.mValueCount = values.length;
+    }
+}
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/LargeValueFormatter.java b/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/LargeValueFormatter.java
@@ -93,7 +93,6 @@ private String makePretty(double number) {
         return r;
     }
 
-    @Override
     public int getDecimalDigits() {
         return 0;
     }
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/PercentFormatter.java b/MPChartLib/src/main/java/com/github/mikephil/charting/formatter/PercentFormatter.java
@@ -43,7 +43,6 @@ public String getFormattedValue(float value, AxisBase axis) {
         return mFormat.format(value) + " %";
     }
 
-    @Override
     public int getDecimalDigits() {
         return 1;
     }

Original file line number	Diff line number	Diff line change
`@@ -85,11 +85,6 @@ protected void onCreate(Bundle savedInstanceState) {`
`85`	`85`	`public String getFormattedValue(float value, AxisBase axis) {`
`86`	`86`	`return format.format(value) + "-" + format.format(value + 10);`
`87`	`87`	`}`
`88`		`-`
`89`		`- @Override`
`90`		`- public int getDecimalDigits() {`
`91`		`- return 0;`
`92`		`- }`
`93`	`88`	`});`
`94`	`89`
`95`	`90`	`Legend l = mChart.getLegend();`
`@@ -243,10 +238,5 @@ public String getFormattedValue(float value, Entry entry, int dataSetIndex, View`
`243`	`238`	`public String getFormattedValue(float value, AxisBase axis) {`
`244`	`239`	`return mFormat.format(Math.abs(value)) + "m";`
`245`	`240`	`}`
`246`		`-`
`247`		`- @Override`
`248`		`- public int getDecimalDigits() {`
`249`		`- return 0;`
`250`		`- }`
`251`	`241`	`}`
`252`	`242`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,9 +136,4 @@ else if (days <= 1458)`
`136`	`136`	`return 2020;`
`137`	`137`
`138`	`138`	`}`
`139`		`-`
`140`		`- @Override`
`141`		`- public int getDecimalDigits() {`
`142`		`- return 0;`
`143`		`- }`
`144`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,4 @@ public MyAxisValueFormatter() {`
`18`	`18`	`public String getFormattedValue(float value, AxisBase axis) {`
`19`	`19`	`return mFormat.format(value) + " $";`
`20`	`20`	`}`
`21`		`-`
`22`		`- @Override`
`23`		`- public int getDecimalDigits() {`
`24`		`- return 1;`
`25`		`- }`
`26`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,4 @@ else if (xScale > 1)`
`37`	`37`	`else`
`38`	`38`	`return mFormat.format(value);`
`39`	`39`	`}`
`40`		`-`
`41`		`- @Override`
`42`		`- public int getDecimalDigits() {`
`43`		`- return 1;`
`44`		`- }`
`45`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,4 @@ public String getFormattedValue(float value, AxisBase axis) {`
`24`	`24`	`float percent = value / axis.mAxisRange;`
`25`	`25`	`return mMonths[(int) (mMonths.length * percent)];`
`26`	`26`	`}`
`27`		`-`
`28`		`- @Override`
`29`		`- public int getDecimalDigits() {`
`30`		`- return 0;`
`31`		`- }`
`32`	`27`	`}`