organicmaps/MPAndroidChart
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

If we are at it - rename those interfaces too

Browse source 
FillFormatter -> IFillFormatter
ValueFormatter -> IValueFormatter
AxisValueFormatter -> IAxisValueFormatter
This commit is contained in:
Daniel Cohen Gindi 2016-08-09 15:44:03 +03:00
parent 02bf21df50
commit 18eec8f0e6
37 changed files with 106 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivity.java
View file

@ -2,8 +2,6 @@
package com.xxmassdeveloper.mpchartexample;
import android.annotation.SuppressLint;
import android.graphics.PointF;
import android.graphics.Rect;
import android.graphics.RectF;
import android.os.Bundle;
import android.util.Log;
@ -28,7 +26,7 @@ import com.github.mikephil.charting.data.BarData;
import com.github.mikephil.charting.data.BarDataSet;
import com.github.mikephil.charting.data.BarEntry;
import com.github.mikephil.charting.data.Entry;
import com.github.mikephil.charting.formatter.AxisValueFormatter;
import com.github.mikephil.charting.formatter.IAxisValueFormatter;
import com.github.mikephil.charting.highlight.Highlight;
import com.github.mikephil.charting.interfaces.datasets.IBarDataSet;
import com.github.mikephil.charting.interfaces.datasets.IDataSet;
@ -80,7 +78,7 @@ public class BarChartActivity extends DemoBase implements OnSeekBarChangeListene
mChart.setDrawGridBackground(false);
// mChart.setDrawYLabels(false);
AxisValueFormatter xAxisFormatter = new DayAxisValueFormatter(mChart);
IAxisValueFormatter xAxisFormatter = new DayAxisValueFormatter(mChart);
XAxis xAxis = mChart.getXAxis();
xAxis.setPosition(XAxisPosition.BOTTOM);
@ -90,7 +88,7 @@ public class BarChartActivity extends DemoBase implements OnSeekBarChangeListene
xAxis.setLabelCount(7);
xAxis.setValueFormatter(xAxisFormatter);
AxisValueFormatter custom = new MyAxisValueFormatter();
IAxisValueFormatter custom = new MyAxisValueFormatter();
YAxis leftAxis = mChart.getAxisLeft();
leftAxis.setTypeface(mTfLight);

4
MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivityMultiDataset.java
View file

@ -21,7 +21,7 @@ import com.github.mikephil.charting.data.BarData;
import com.github.mikephil.charting.data.BarDataSet;
import com.github.mikephil.charting.data.BarEntry;
import com.github.mikephil.charting.data.Entry;
import com.github.mikephil.charting.formatter.AxisValueFormatter;
import com.github.mikephil.charting.formatter.IAxisValueFormatter;
import com.github.mikephil.charting.formatter.LargeValueFormatter;
import com.github.mikephil.charting.highlight.Highlight;
import com.github.mikephil.charting.interfaces.datasets.IBarDataSet;
@ -87,7 +87,7 @@ public class BarChartActivityMultiDataset extends DemoBase implements OnSeekBarC
xl.setTypeface(mTfLight);
xl.setGranularity(1f);
xl.setCenterAxisLabels(true);
xl.setValueFormatter(new AxisValueFormatter() {
xl.setValueFormatter(new IAxisValueFormatter() {
@Override
public String getFormattedValue(float value, AxisBase axis) {
return String.valueOf((int) value);

8
MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartPositiveNegative.java
View file

@ -15,7 +15,8 @@ import com.github.mikephil.charting.data.BarData;
import com.github.mikephil.charting.data.BarDataSet;
import com.github.mikephil.charting.data.BarEntry;
import com.github.mikephil.charting.data.Entry;
import com.github.mikephil.charting.formatter.AxisValueFormatter;
import com.github.mikephil.charting.formatter.IAxisValueFormatter;
import com.github.mikephil.charting.formatter.IValueFormatter;
import com.github.mikephil.charting.utils.ViewPortHandler;
import com.xxmassdeveloper.mpchartexample.notimportant.DemoBase;
@ -86,7 +87,7 @@ public class BarChartPositiveNegative extends DemoBase {
data.add(new Data(3.5f, -442.3f, "01-01"));
data.add(new Data(4.5f, -2280.1f, "01-02"));
xAxis.setValueFormatter(new AxisValueFormatter() {
xAxis.setValueFormatter(new IAxisValueFormatter() {
@Override
public String getFormattedValue(float value, AxisBase axis) {
return data.get(Math.min(Math.max((int) value, 0), data.size()-1)).xAxisValue;
@ -162,7 +163,8 @@ public class BarChartPositiveNegative extends DemoBase {
}
}
private class ValueFormatter implements com.github.mikephil.charting.formatter.ValueFormatter {
private class ValueFormatter implements IValueFormatter
{
private DecimalFormat mFormat;

6
MPChartExample/src/com/xxmassdeveloper/mpchartexample/CombinedChartActivity.java
View file

@ -2,7 +2,6 @@
package com.xxmassdeveloper.mpchartexample;
import android.graphics.Color;
import android.graphics.Paint;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
@ -30,13 +29,12 @@ import com.github.mikephil.charting.data.LineData;
import com.github.mikephil.charting.data.LineDataSet;
import com.github.mikephil.charting.data.ScatterData;
import com.github.mikephil.charting.data.ScatterDataSet;
import com.github.mikephil.charting.formatter.AxisValueFormatter;
import com.github.mikephil.charting.formatter.IAxisValueFormatter;
import com.github.mikephil.charting.interfaces.datasets.IDataSet;
import com.github.mikephil.charting.utils.ColorTemplate;
import com.xxmassdeveloper.mpchartexample.notimportant.DemoBase;
import java.util.ArrayList;
import java.util.Arrays;
public class CombinedChartActivity extends DemoBase {
@ -78,7 +76,7 @@ public class CombinedChartActivity extends DemoBase {
xAxis.setPosition(XAxisPosition.BOTH_SIDED);
xAxis.setAxisMinValue(0f);
xAxis.setGranularity(1f);
xAxis.setValueFormatter(new AxisValueFormatter() {
xAxis.setValueFormatter(new IAxisValueFormatter() {
@Override
public String getFormattedValue(float value, AxisBase axis) {
return mMonths[(int) value % mMonths.length];

4
MPChartExample/src/com/xxmassdeveloper/mpchartexample/CubicLineChartActivity.java
View file

@ -17,7 +17,7 @@ import com.github.mikephil.charting.components.YAxis;
import com.github.mikephil.charting.data.Entry;
import com.github.mikephil.charting.data.LineData;
import com.github.mikephil.charting.data.LineDataSet;
import com.github.mikephil.charting.formatter.FillFormatter;
import com.github.mikephil.charting.formatter.IFillFormatter;
import com.github.mikephil.charting.interfaces.dataprovider.LineDataProvider;
import com.github.mikephil.charting.interfaces.datasets.IDataSet;
import com.github.mikephil.charting.interfaces.datasets.ILineDataSet;
@ -294,7 +294,7 @@ public class CubicLineChartActivity extends DemoBase implements OnSeekBarChangeL
set1.setFillColor(Color.WHITE);
set1.setFillAlpha(100);
set1.setDrawHorizontalHighlightIndicator(false);
set1.setFillFormatter(new FillFormatter() {
set1.setFillFormatter(new IFillFormatter() {
@Override
public float getFillLinePosition(ILineDataSet dataSet, LineDataProvider dataProvider) {
return -10;

6
MPChartExample/src/com/xxmassdeveloper/mpchartexample/FilledLineActivity.java
View file

@ -12,7 +12,7 @@ import com.github.mikephil.charting.components.YAxis;
import com.github.mikephil.charting.data.Entry;
import com.github.mikephil.charting.data.LineData;
import com.github.mikephil.charting.data.LineDataSet;
import com.github.mikephil.charting.formatter.FillFormatter;
import com.github.mikephil.charting.formatter.IFillFormatter;
import com.github.mikephil.charting.interfaces.dataprovider.LineDataProvider;
import com.github.mikephil.charting.interfaces.datasets.ILineDataSet;
import com.xxmassdeveloper.mpchartexample.notimportant.DemoBase;
@ -109,7 +109,7 @@ public class FilledLineActivity extends DemoBase {
set1.setFillColor(Color.WHITE);
set1.setHighLightColor(Color.rgb(244, 117, 117));
set1.setDrawCircleHole(false);
set1.setFillFormatter(new FillFormatter() {
set1.setFillFormatter(new IFillFormatter() {
@Override
public float getFillLinePosition(ILineDataSet dataSet, LineDataProvider dataProvider) {
return mChart.getAxisLeft().getAxisMinimum();
@ -128,7 +128,7 @@ public class FilledLineActivity extends DemoBase {
set2.setFillColor(Color.WHITE);
set2.setDrawCircleHole(false);
set2.setHighLightColor(Color.rgb(244, 117, 117));
set2.setFillFormatter(new FillFormatter() {
set2.setFillFormatter(new IFillFormatter() {
@Override
public float getFillLinePosition(ILineDataSet dataSet, LineDataProvider dataProvider) {
return mChart.getAxisLeft().getAxisMaximum();

4
MPChartExample/src/com/xxmassdeveloper/mpchartexample/LineChartTime.java
View file

@ -20,7 +20,7 @@ import com.github.mikephil.charting.components.YAxis.AxisDependency;
import com.github.mikephil.charting.data.Entry;
import com.github.mikephil.charting.data.LineData;
import com.github.mikephil.charting.data.LineDataSet;
import com.github.mikephil.charting.formatter.AxisValueFormatter;
import com.github.mikephil.charting.formatter.IAxisValueFormatter;
import com.github.mikephil.charting.interfaces.datasets.ILineDataSet;
import com.github.mikephil.charting.utils.ColorTemplate;
import com.xxmassdeveloper.mpchartexample.notimportant.DemoBase;
@ -89,7 +89,7 @@ public class LineChartTime extends DemoBase implements OnSeekBarChangeListener {
xAxis.setTextColor(Color.rgb(255, 192, 56));
xAxis.setCenterAxisLabels(true);
xAxis.setGranularity(60000L); // one minute in millis
xAxis.setValueFormatter(new AxisValueFormatter() {
xAxis.setValueFormatter(new IAxisValueFormatter() {
private SimpleDateFormat mFormat = new SimpleDateFormat("dd MMM HH:mm");

5
MPChartExample/src/com/xxmassdeveloper/mpchartexample/RadarChartActivitry.java
View file

@ -14,14 +14,13 @@ import com.github.mikephil.charting.charts.RadarChart;
import com.github.mikephil.charting.components.AxisBase;
import com.github.mikephil.charting.components.Legend;
import com.github.mikephil.charting.components.Legend.LegendPosition;
import com.github.mikephil.charting.components.MarkerImage;
import com.github.mikephil.charting.components.MarkerView;
import com.github.mikephil.charting.components.XAxis;
import com.github.mikephil.charting.components.YAxis;
import com.github.mikephil.charting.data.RadarData;
import com.github.mikephil.charting.data.RadarDataSet;
import com.github.mikephil.charting.data.RadarEntry;
import com.github.mikephil.charting.formatter.AxisValueFormatter;
import com.github.mikephil.charting.formatter.IAxisValueFormatter;
import com.github.mikephil.charting.interfaces.datasets.IDataSet;
import com.github.mikephil.charting.interfaces.datasets.IRadarDataSet;
import com.xxmassdeveloper.mpchartexample.custom.RadarMarkerView;
@ -74,7 +73,7 @@ public class RadarChartActivitry extends DemoBase {
xAxis.setTextSize(9f);
xAxis.setYOffset(0f);
xAxis.setXOffset(0f);
xAxis.setValueFormatter(new AxisValueFormatter() {
xAxis.setValueFormatter(new IAxisValueFormatter() {
private String[] mActivities = new String[]{"Burger", "Steak", "Salad", "Pasta", "Pizza"};

9
MPChartExample/src/com/xxmassdeveloper/mpchartexample/StackedBarActivityNegative.java
View file

@ -20,8 +20,8 @@ import com.github.mikephil.charting.data.BarData;
import com.github.mikephil.charting.data.BarDataSet;
import com.github.mikephil.charting.data.BarEntry;
import com.github.mikephil.charting.data.Entry;
import com.github.mikephil.charting.formatter.ValueFormatter;
import com.github.mikephil.charting.formatter.AxisValueFormatter;
import com.github.mikephil.charting.formatter.IValueFormatter;
import com.github.mikephil.charting.formatter.IAxisValueFormatter;
import com.github.mikephil.charting.highlight.Highlight;
import com.github.mikephil.charting.interfaces.datasets.IBarDataSet;
import com.github.mikephil.charting.listener.OnChartValueSelectedListener;
@ -77,7 +77,7 @@ public class StackedBarActivityNegative extends DemoBase implements
xAxis.setCenterAxisLabels(true);
xAxis.setLabelCount(12);
xAxis.setGranularity(10f);
xAxis.setValueFormatter(new AxisValueFormatter() {
xAxis.setValueFormatter(new IAxisValueFormatter() {
private DecimalFormat format = new DecimalFormat("###");
@ -220,7 +220,8 @@ public class StackedBarActivityNegative extends DemoBase implements
Log.i("NOTING SELECTED", "");
}
private class CustomFormatter implements ValueFormatter, AxisValueFormatter {
private class CustomFormatter implements IValueFormatter, IAxisValueFormatter
{
private DecimalFormat mFormat;

7
MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/DayAxisValueFormatter.java
View file

@ -1,15 +1,14 @@
package com.xxmassdeveloper.mpchartexample.custom;
import com.github.mikephil.charting.charts.BarLineChartBase;
import com.github.mikephil.charting.charts.Chart;
import com.github.mikephil.charting.components.AxisBase;
import com.github.mikephil.charting.formatter.AxisValueFormatter;
import com.github.mikephil.charting.formatter.DefaultAxisValueFormatter;
import com.github.mikephil.charting.formatter.IAxisValueFormatter;
/**
* Created by philipp on 02/06/16.
*/
public class DayAxisValueFormatter implements AxisValueFormatter {
public class DayAxisValueFormatter implements IAxisValueFormatter
{
protected String[] mMonths = new String[]{
"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dec"

5
MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/MyAxisValueFormatter.java
View file

@ -1,11 +1,12 @@
package com.xxmassdeveloper.mpchartexample.custom;
import com.github.mikephil.charting.components.AxisBase;
import com.github.mikephil.charting.formatter.AxisValueFormatter;
import com.github.mikephil.charting.formatter.IAxisValueFormatter;
import java.text.DecimalFormat;
public class MyAxisValueFormatter implements AxisValueFormatter {
public class MyAxisValueFormatter implements IAxisValueFormatter
{
private DecimalFormat mFormat;

5
MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/MyCustomXAxisValueFormatter.java
View file

@ -1,7 +1,7 @@
package com.xxmassdeveloper.mpchartexample.custom;
import com.github.mikephil.charting.components.AxisBase;
import com.github.mikephil.charting.formatter.AxisValueFormatter;
import com.github.mikephil.charting.formatter.IAxisValueFormatter;
import com.github.mikephil.charting.utils.ViewPortHandler;
import java.text.DecimalFormat;
@ -9,7 +9,8 @@ import java.text.DecimalFormat;
/**
* Created by Philipp Jahoda on 14/09/15.
*/
public class MyCustomXAxisValueFormatter implements AxisValueFormatter {
public class MyCustomXAxisValueFormatter implements IAxisValueFormatter
{
private DecimalFormat mFormat;
private ViewPortHandler mViewPortHandler;

5
MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/MyFillFormatter.java
View file

@ -1,13 +1,14 @@
package com.xxmassdeveloper.mpchartexample.custom;
import com.github.mikephil.charting.formatter.FillFormatter;
import com.github.mikephil.charting.formatter.IFillFormatter;
import com.github.mikephil.charting.interfaces.dataprovider.LineDataProvider;
import com.github.mikephil.charting.interfaces.datasets.ILineDataSet;
/**
* Created by Philipp Jahoda on 12/09/15.
*/
public class MyFillFormatter implements FillFormatter {
public class MyFillFormatter implements IFillFormatter
{
private float mFillPos = 0f;

5
MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/MyValueFormatter.java
View file

@ -1,12 +1,13 @@
package com.xxmassdeveloper.mpchartexample.custom;
import com.github.mikephil.charting.data.Entry;
import com.github.mikephil.charting.formatter.ValueFormatter;
import com.github.mikephil.charting.formatter.IValueFormatter;
import com.github.mikephil.charting.utils.ViewPortHandler;
import java.text.DecimalFormat;
public class MyValueFormatter implements ValueFormatter {
public class MyValueFormatter implements IValueFormatter
{
private DecimalFormat mFormat;

8
MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/XYMarkerView.java
View file

@ -5,12 +5,10 @@ import android.content.Context;
import android.widget.TextView;
import com.github.mikephil.charting.components.MarkerView;
import com.github.mikephil.charting.data.CandleEntry;
import com.github.mikephil.charting.data.Entry;
import com.github.mikephil.charting.formatter.AxisValueFormatter;
import com.github.mikephil.charting.formatter.IAxisValueFormatter;
import com.github.mikephil.charting.highlight.Highlight;
import com.github.mikephil.charting.utils.MPPointF;
import com.github.mikephil.charting.utils.Utils;
import com.xxmassdeveloper.mpchartexample.R;
import java.text.DecimalFormat;
@ -23,11 +21,11 @@ import java.text.DecimalFormat;
public class XYMarkerView extends MarkerView {
private TextView tvContent;
private AxisValueFormatter xAxisValueFormatter;
private IAxisValueFormatter xAxisValueFormatter;
private DecimalFormat format;
public XYMarkerView(Context context, AxisValueFormatter xAxisValueFormatter) {
public XYMarkerView(Context context, IAxisValueFormatter xAxisValueFormatter) {
super(context, R.layout.custom_marker_view);
this.xAxisValueFormatter = xAxisValueFormatter;

5
MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/YearXAxisFormatter.java
View file

@ -1,12 +1,13 @@
package com.xxmassdeveloper.mpchartexample.custom;
import com.github.mikephil.charting.components.AxisBase;
import com.github.mikephil.charting.formatter.AxisValueFormatter;
import com.github.mikephil.charting.formatter.IAxisValueFormatter;
/**
* Created by Philipp Jahoda on 14/09/15.
*/
public class YearXAxisFormatter implements AxisValueFormatter {
public class YearXAxisFormatter implements IAxisValueFormatter
{
protected String[] mMonths = new String[]{
"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dec"

7
MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java
View file

@ -33,7 +33,7 @@ import com.github.mikephil.charting.components.XAxis;
import com.github.mikephil.charting.data.ChartData;
import com.github.mikephil.charting.data.Entry;
import com.github.mikephil.charting.formatter.DefaultValueFormatter;
import com.github.mikephil.charting.formatter.ValueFormatter;
import com.github.mikephil.charting.formatter.IValueFormatter;
import com.github.mikephil.charting.highlight.ChartHighlighter;
import com.github.mikephil.charting.highlight.Highlight;
import com.github.mikephil.charting.highlight.IHighlighter;
@ -53,7 +53,6 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
/**
* Baseclass of all Chart-Views.
@ -976,12 +975,12 @@ public abstract class Chart<T extends ChartData<? extends IDataSet<? extends Ent
}
/**
* Returns the default ValueFormatter that has been determined by the chart
* Returns the default IValueFormatter that has been determined by the chart
* considering the provided minimum and maximum values.
*
* @return
*/
public ValueFormatter getDefaultValueFormatter() {
public IValueFormatter getDefaultValueFormatter() {
return mDefaultFormatter;
}

2
MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieChart.java
View file

@ -662,7 +662,7 @@ public class PieChart extends PieRadarChartBase<PieData> {
/**
* If this is enabled, values inside the PieChart are drawn in percent and
* not with their original value. Values provided for the ValueFormatter to
* not with their original value. Values provided for the IValueFormatter to
* format are then provided in percent.
*
* @param enabled

8
MPChartLib/src/main/java/com/github/mikephil/charting/components/AxisBase.java
View file

@ -5,7 +5,7 @@ import android.graphics.Color;
import android.graphics.DashPathEffect;
import android.util.Log;
import com.github.mikephil.charting.formatter.AxisValueFormatter;
import com.github.mikephil.charting.formatter.IAxisValueFormatter;
import com.github.mikephil.charting.formatter.DefaultAxisValueFormatter;
import com.github.mikephil.charting.utils.Utils;
@ -22,7 +22,7 @@ public abstract class AxisBase extends ComponentBase {
/**
* custom formatter that is used instead of the auto-formatter if set
*/
protected AxisValueFormatter mAxisValueFormatter;
protected IAxisValueFormatter mAxisValueFormatter;
private int mGridColor = Color.GRAY;
@ -460,7 +460,7 @@ public abstract class AxisBase extends ComponentBase {
*
* @param f
*/
public void setValueFormatter(AxisValueFormatter f) {
public void setValueFormatter(IAxisValueFormatter f) {
if (f == null)
mAxisValueFormatter = new DefaultAxisValueFormatter(mDecimals);
@ -473,7 +473,7 @@ public abstract class AxisBase extends ComponentBase {
*
* @return
*/
public AxisValueFormatter getValueFormatter() {
public IAxisValueFormatter getValueFormatter() {
if (mAxisValueFormatter == null) {
mAxisValueFormatter = new DefaultAxisValueFormatter(mDecimals);

8
MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseDataSet.java
View file

@ -6,7 +6,7 @@ import android.graphics.Typeface;
import com.github.mikephil.charting.components.YAxis;
import com.github.mikephil.charting.formatter.DefaultValueFormatter;
import com.github.mikephil.charting.formatter.ValueFormatter;
import com.github.mikephil.charting.formatter.IValueFormatter;
import com.github.mikephil.charting.interfaces.datasets.IDataSet;
import com.github.mikephil.charting.utils.ColorTemplate;
import com.github.mikephil.charting.utils.Utils;
@ -49,7 +49,7 @@ public abstract class BaseDataSet<T extends Entry> implements IDataSet<T> {
/**
* custom formatter that is used instead of the auto-formatter if set
*/
protected transient ValueFormatter mValueFormatter;
protected transient IValueFormatter mValueFormatter;
/**
* the typeface used for the value text
@ -257,7 +257,7 @@ public abstract class BaseDataSet<T extends Entry> implements IDataSet<T> {
}
@Override
public void setValueFormatter(ValueFormatter f) {
public void setValueFormatter(IValueFormatter f) {
if (f == null)
return;
@ -266,7 +266,7 @@ public abstract class BaseDataSet<T extends Entry> implements IDataSet<T> {
}
@Override
public ValueFormatter getValueFormatter() {
public IValueFormatter getValueFormatter() {
if (needsFormatter())
return new DefaultValueFormatter(1);
return mValueFormatter;

6
MPChartLib/src/main/java/com/github/mikephil/charting/data/ChartData.java
View file

@ -5,7 +5,7 @@ import android.graphics.Typeface;
import android.util.Log;
import com.github.mikephil.charting.components.YAxis.AxisDependency;
import com.github.mikephil.charting.formatter.ValueFormatter;
import com.github.mikephil.charting.formatter.IValueFormatter;
import com.github.mikephil.charting.highlight.Highlight;
import com.github.mikephil.charting.interfaces.datasets.IDataSet;
@ -635,11 +635,11 @@ public abstract class ChartData<T extends IDataSet<? extends Entry>> {
}
/**
* Sets a custom ValueFormatter for all DataSets this data object contains.
* Sets a custom IValueFormatter for all DataSets this data object contains.
*
* @param f
*/
public void setValueFormatter(ValueFormatter f) {
public void setValueFormatter(IValueFormatter f) {
if (f == null)
return;
else {

10
MPChartLib/src/main/java/com/github/mikephil/charting/data/LineDataSet.java
View file

@ -6,7 +6,7 @@ import android.graphics.Color;
import android.graphics.DashPathEffect;
import com.github.mikephil.charting.formatter.DefaultFillFormatter;
import com.github.mikephil.charting.formatter.FillFormatter;
import com.github.mikephil.charting.formatter.IFillFormatter;
import com.github.mikephil.charting.interfaces.datasets.ILineDataSet;
import com.github.mikephil.charting.utils.ColorTemplate;
import com.github.mikephil.charting.utils.Utils;
@ -54,7 +54,7 @@ public class LineDataSet extends LineRadarDataSet<Entry> implements ILineDataSet
/**
* formatter for customizing the position of the fill-line
*/
private FillFormatter mFillFormatter = new DefaultFillFormatter();
private IFillFormatter mFillFormatter = new DefaultFillFormatter();
/**
* if true, drawing circles is enabled
@ -377,12 +377,12 @@ public class LineDataSet extends LineRadarDataSet<Entry> implements ILineDataSet
}
/**
* Sets a custom FillFormatter to the chart that handles the position of the
* Sets a custom IFillFormatter to the chart that handles the position of the
* filled-line for each DataSet. Set this to null to use the default logic.
*
* @param formatter
*/
public void setFillFormatter(FillFormatter formatter) {
public void setFillFormatter(IFillFormatter formatter) {
if (formatter == null)
mFillFormatter = new DefaultFillFormatter();
@ -391,7 +391,7 @@ public class LineDataSet extends LineRadarDataSet<Entry> implements ILineDataSet
}
@Override
public FillFormatter getFillFormatter() {
public IFillFormatter getFillFormatter() {
return mFillFormatter;
}

3
MPChartLib/src/main/java/com/github/mikephil/charting/formatter/DefaultAxisValueFormatter.java
View file

@ -7,7 +7,8 @@ import java.text.DecimalFormat;
/**
* Created by philipp on 02/06/16.
*/
public class DefaultAxisValueFormatter implements AxisValueFormatter {
public class DefaultAxisValueFormatter implements IAxisValueFormatter
{
/**
* decimalformat for formatting

3
MPChartLib/src/main/java/com/github/mikephil/charting/formatter/DefaultFillFormatter.java
View file

@ -10,7 +10,8 @@ import com.github.mikephil.charting.interfaces.datasets.ILineDataSet;
*
* @author Philipp Jahoda
*/
public class DefaultFillFormatter implements FillFormatter {
public class DefaultFillFormatter implements IFillFormatter
{
@Override
public float getFillLinePosition(ILineDataSet dataSet, LineDataProvider dataProvider) {

3
MPChartLib/src/main/java/com/github/mikephil/charting/formatter/DefaultValueFormatter.java
View file

@ -12,7 +12,8 @@ import java.text.DecimalFormat;
*
* @author Philipp Jahoda
*/
public class DefaultValueFormatter implements ValueFormatter {
public class DefaultValueFormatter implements IValueFormatter
{
/**
* DecimalFormat for formatting

3
MPChartLib/src/main/java/com/github/mikephil/charting/formatter/AxisValueFormatter.java → MPChartLib/src/main/java/com/github/mikephil/charting/formatter/IAxisValueFormatter.java
View file

@ -7,7 +7,8 @@ import com.github.mikephil.charting.components.AxisBase;
* Custom formatter interface that allows formatting of
* axis labels before they are being drawn.
*/
public interface AxisValueFormatter {
public interface IAxisValueFormatter
{
/**
* Called when a value from an axis is to be formatted

3
MPChartLib/src/main/java/com/github/mikephil/charting/formatter/FillFormatter.java → MPChartLib/src/main/java/com/github/mikephil/charting/formatter/IFillFormatter.java
View file

@ -9,7 +9,8 @@ import com.github.mikephil.charting.interfaces.dataprovider.LineDataProvider;
*
* @author Philipp Jahoda
*/
public interface FillFormatter {
public interface IFillFormatter
{
/**
* Returns the vertical (y-axis) position where the filled-line of the

5
MPChartLib/src/main/java/com/github/mikephil/charting/formatter/ValueFormatter.java → MPChartLib/src/main/java/com/github/mikephil/charting/formatter/IValueFormatter.java
View file

@ -6,12 +6,13 @@ import com.github.mikephil.charting.utils.ViewPortHandler;
/**
* Interface that allows custom formatting of all values inside the chart before they are
* being drawn to the screen. Simply create your own formatting class and let
* it implement ValueFormatter. Then override the getFormattedValue(...) method
* it implement IValueFormatter. Then override the getFormattedValue(...) method
* and return whatever you want.
*
* @author Philipp Jahoda
*/
public interface ValueFormatter {
public interface IValueFormatter
{
/**
* Called when a value (from labels inside the chart) is formatted

7
MPChartLib/src/main/java/com/github/mikephil/charting/formatter/LargeValueFormatter.java
View file

@ -17,7 +17,8 @@ import java.text.DecimalFormat;
* @author Philipp Jahoda
* @author Oleksandr Tyshkovets <olexandr.tyshkovets@gmail.com>
*/
public class LargeValueFormatter implements ValueFormatter, AxisValueFormatter {
public class LargeValueFormatter implements IValueFormatter, IAxisValueFormatter
{
private static String[] SUFFIX = new String[]{
"", "k", "m", "b", "t"
@ -40,13 +41,13 @@ public class LargeValueFormatter implements ValueFormatter, AxisValueFormatter {
mText = appendix;
}
// ValueFormatter
// IValueFormatter
@Override
public String getFormattedValue(float value, Entry entry, int dataSetIndex, ViewPortHandler viewPortHandler) {
return makePretty(value) + mText;
}
// AxisValueFormatter
// IAxisValueFormatter
@Override
public String getFormattedValue(float value, AxisBase axis) {
return makePretty(value) + mText;

9
MPChartLib/src/main/java/com/github/mikephil/charting/formatter/PercentFormatter.java
View file

@ -8,12 +8,13 @@ import com.github.mikephil.charting.utils.ViewPortHandler;
import java.text.DecimalFormat;
/**
* This ValueFormatter is just for convenience and simply puts a "%" sign after
* This IValueFormatter is just for convenience and simply puts a "%" sign after
* each value. (Recommeded for PieChart)
*
* @author Philipp Jahoda
*/
public class PercentFormatter implements ValueFormatter, AxisValueFormatter {
public class PercentFormatter implements IValueFormatter, IAxisValueFormatter
{
protected DecimalFormat mFormat;
@ -30,13 +31,13 @@ public class PercentFormatter implements ValueFormatter, AxisValueFormatter {
this.mFormat = format;
}
// ValueFormatter
// IValueFormatter
@Override
public String getFormattedValue(float value, Entry entry, int dataSetIndex, ViewPortHandler viewPortHandler) {
return mFormat.format(value) + " %";
}
// AxisValueFormatter
// IAxisValueFormatter
@Override
public String getFormattedValue(float value, AxisBase axis) {
return mFormat.format(value) + " %";

3
MPChartLib/src/main/java/com/github/mikephil/charting/formatter/StackedValueFormatter.java
View file

@ -12,7 +12,8 @@ import java.text.DecimalFormat;
* A formatter specifically for stacked BarChart that allows to specify whether the all stack values
* or just the top value should be drawn.
*/
public class StackedValueFormatter implements ValueFormatter {
public class StackedValueFormatter implements IValueFormatter
{
/**
* if true, all stack values of the stacked bar entry are drawn, else only top

6
MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/ChartInterface.java
View file

@ -1,12 +1,10 @@
package com.github.mikephil.charting.interfaces.dataprovider;
import android.graphics.PointF;
import android.graphics.RectF;
import com.github.mikephil.charting.data.ChartData;
import com.github.mikephil.charting.formatter.ValueFormatter;
import com.github.mikephil.charting.formatter.IValueFormatter;
import com.github.mikephil.charting.utils.MPPointF;
import com.github.mikephil.charting.utils.Utils;
/**
* Interface that provides everything there is to know about the dimensions,
@ -63,7 +61,7 @@ public interface ChartInterface {
RectF getContentRect();
ValueFormatter getDefaultValueFormatter();
IValueFormatter getDefaultValueFormatter();
ChartData getData();

6
MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IDataSet.java
View file

@ -5,7 +5,7 @@ import android.graphics.Typeface;
import com.github.mikephil.charting.components.YAxis;
import com.github.mikephil.charting.data.DataSet;
import com.github.mikephil.charting.data.Entry;
import com.github.mikephil.charting.formatter.ValueFormatter;
import com.github.mikephil.charting.formatter.IValueFormatter;
import java.util.List;
@ -294,14 +294,14 @@ public interface IDataSet<T extends Entry> {
*
* @param f
*/
void setValueFormatter(ValueFormatter f);
void setValueFormatter(IValueFormatter f);
/**
* Returns the formatter used for drawing the values inside the chart.
*
* @return
*/
ValueFormatter getValueFormatter();
IValueFormatter getValueFormatter();
/**
* Returns true if the valueFormatter object of this DataSet is null.

7
MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineDataSet.java
View file

@ -1,11 +1,10 @@
package com.github.mikephil.charting.interfaces.datasets;
import android.graphics.DashPathEffect;
import android.graphics.drawable.Drawable;
import com.github.mikephil.charting.data.Entry;
import com.github.mikephil.charting.data.LineDataSet;
import com.github.mikephil.charting.formatter.FillFormatter;
import com.github.mikephil.charting.formatter.IFillFormatter;
/**
* Created by Philpp Jahoda on 21/10/15.
@ -96,9 +95,9 @@ public interface ILineDataSet extends ILineRadarDataSet<Entry> {
boolean isDashedLineEnabled();
/**
* Returns the FillFormatter that is set for this DataSet.
* Returns the IFillFormatter that is set for this DataSet.
*
* @return
*/
FillFormatter getFillFormatter();
IFillFormatter getFillFormatter();
}

6
MPChartLib/src/main/java/com/github/mikephil/charting/renderer/DataRenderer.java
View file

@ -9,7 +9,7 @@ import android.graphics.Paint.Style;
import com.github.mikephil.charting.animation.ChartAnimator;
import com.github.mikephil.charting.data.Entry;
import com.github.mikephil.charting.formatter.ValueFormatter;
import com.github.mikephil.charting.formatter.IValueFormatter;
import com.github.mikephil.charting.highlight.Highlight;
import com.github.mikephil.charting.interfaces.dataprovider.ChartInterface;
import com.github.mikephil.charting.interfaces.datasets.IDataSet;
@ -134,7 +134,7 @@ public abstract class DataRenderer extends Renderer {
public abstract void drawValues(Canvas c);
/**
* Draws the value of the given entry by using the provided ValueFormatter.
* Draws the value of the given entry by using the provided IValueFormatter.
*
* @param c canvas
* @param formatter formatter for custom value-formatting
@ -145,7 +145,7 @@ public abstract class DataRenderer extends Renderer {
* @param y position
* @param color
*/
public void drawValue(Canvas c, ValueFormatter formatter, float value, Entry entry, int dataSetIndex, float x, float y, int color) {
public void drawValue(Canvas c, IValueFormatter formatter, float value, Entry entry, int dataSetIndex, float x, float y, int color) {
mValuePaint.setColor(color);
c.drawText(formatter.getFormattedValue(value, entry, dataSetIndex, mViewPortHandler), x, y, mValuePaint);
}

4
MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.java
View file

@ -10,7 +10,7 @@ import com.github.mikephil.charting.buffer.BarBuffer;
import com.github.mikephil.charting.buffer.HorizontalBarBuffer;
import com.github.mikephil.charting.data.BarData;
import com.github.mikephil.charting.data.BarEntry;
import com.github.mikephil.charting.formatter.ValueFormatter;
import com.github.mikephil.charting.formatter.IValueFormatter;
import com.github.mikephil.charting.highlight.Highlight;
import com.github.mikephil.charting.interfaces.dataprovider.BarDataProvider;
import com.github.mikephil.charting.interfaces.dataprovider.ChartInterface;
@ -165,7 +165,7 @@ public class HorizontalBarChartRenderer extends BarChartRenderer {
applyValueTextStyle(dataSet);
final float halfTextHeight = Utils.calcTextHeight(mValuePaint, "10") / 2f;
ValueFormatter formatter = dataSet.getValueFormatter();
IValueFormatter formatter = dataSet.getValueFormatter();
// get the buffer
BarBuffer buffer = mBarBuffers[i];

5
MPChartLib/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.java
View file

@ -8,7 +8,6 @@ import android.graphics.Paint;
import android.graphics.Paint.Align;
import android.graphics.Paint.Style;
import android.graphics.Path;
import android.graphics.PointF;
import android.graphics.RectF;
import android.os.Build;
import android.text.Layout;
@ -22,7 +21,7 @@ import com.github.mikephil.charting.data.Entry;
import com.github.mikephil.charting.data.PieData;
import com.github.mikephil.charting.data.PieDataSet;
import com.github.mikephil.charting.data.PieEntry;
import com.github.mikephil.charting.formatter.ValueFormatter;
import com.github.mikephil.charting.formatter.IValueFormatter;
import com.github.mikephil.charting.highlight.Highlight;
import com.github.mikephil.charting.interfaces.datasets.IPieDataSet;
import com.github.mikephil.charting.utils.ColorTemplate;
@ -433,7 +432,7 @@ public class PieChartRenderer extends DataRenderer {
float lineHeight = Utils.calcTextHeight(mValuePaint, "Q")
+ Utils.convertDpToPixel(4f);
ValueFormatter formatter = dataSet.getValueFormatter();
IValueFormatter formatter = dataSet.getValueFormatter();
int entryCount = dataSet.getEntryCount();