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

Renaming of setAxisMinValue etc to setAxisMinimum for consistency

Browse source
This commit is contained in:
Philipp Jahoda 2016-08-11 12:46:52 +02:00
parent 788539001f
commit e158ef15e2
24 changed files with 79 additions and 63 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

@ -96,7 +96,7 @@ public class BarChartActivity extends DemoBase implements OnSeekBarChangeListene
leftAxis.setValueFormatter(custom);
leftAxis.setPosition(YAxisLabelPosition.OUTSIDE_CHART);
leftAxis.setSpaceTop(15f);
leftAxis.setAxisMinValue(0f); // this replaces setStartAtZero(true)
leftAxis.setAxisMinimum(0f); // this replaces setStartAtZero(true)
YAxis rightAxis = mChart.getAxisRight();
rightAxis.setDrawGridLines(false);
@ -104,7 +104,7 @@ public class BarChartActivity extends DemoBase implements OnSeekBarChangeListene
rightAxis.setLabelCount(8, false);
rightAxis.setValueFormatter(custom);
rightAxis.setSpaceTop(15f);
rightAxis.setAxisMinValue(0f); // this replaces setStartAtZero(true)
rightAxis.setAxisMinimum(0f); // this replaces setStartAtZero(true)
Legend l = mChart.getLegend();
l.setPosition(LegendPosition.BELOW_CHART_LEFT);
@ -228,8 +228,8 @@ public class BarChartActivity extends DemoBase implements OnSeekBarChangeListene
float start = 0f;
mChart.getXAxis().setAxisMinValue(start);
mChart.getXAxis().setAxisMaxValue(start + count + 2);
mChart.getXAxis().setAxisMinimum(start);
mChart.getXAxis().setAxisMaximum(start + count + 2);
ArrayList<BarEntry> yVals1 = new ArrayList<BarEntry>();

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

@ -104,7 +104,7 @@ public class BarChartActivityMultiDataset extends DemoBase implements OnSeekBarC
leftAxis.setValueFormatter(new LargeValueFormatter());
leftAxis.setDrawGridLines(false);
leftAxis.setSpaceTop(30f);
leftAxis.setAxisMinValue(0f); // this replaces setStartAtZero(true)
leftAxis.setAxisMinimum(0f); // this replaces setStartAtZero(true)
mChart.getAxisRight().setEnabled(false);
}
@ -249,8 +249,8 @@ public class BarChartActivityMultiDataset extends DemoBase implements OnSeekBarC
}
mChart.getBarData().setBarWidth(barWidth);
mChart.getXAxis().setAxisMinValue(startYear);
mChart.getXAxis().setAxisMaxValue(mChart.getBarData().getGroupWidth(groupSpace, barSpace) * mSeekBarX.getProgress() + startYear);
mChart.getXAxis().setAxisMinimum(startYear);
mChart.getXAxis().setAxisMaximum(mChart.getBarData().getGroupWidth(groupSpace, barSpace) * mSeekBarX.getProgress() + startYear);
mChart.groupBars(startYear, groupSpace, barSpace);
mChart.invalidate();
}

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

@ -76,8 +76,8 @@ public class BarChartActivitySinus extends DemoBase implements OnSeekBarChangeLi
YAxis leftAxis = mChart.getAxisLeft();
leftAxis.setTypeface(mTfLight);
leftAxis.setLabelCount(6, false);
leftAxis.setAxisMinValue(-2.5f);
leftAxis.setAxisMaxValue(2.5f);
leftAxis.setAxisMinimum(-2.5f);
leftAxis.setAxisMaximum(2.5f);
leftAxis.setGranularityEnabled(true);
leftAxis.setGranularity(0.1f);
@ -85,8 +85,8 @@ public class BarChartActivitySinus extends DemoBase implements OnSeekBarChangeLi
rightAxis.setDrawGridLines(false);
rightAxis.setTypeface(mTfLight);
rightAxis.setLabelCount(6, false);
rightAxis.setAxisMinValue(-2.5f);
rightAxis.setAxisMaxValue(2.5f);
rightAxis.setAxisMinimum(-2.5f);
rightAxis.setAxisMaximum(2.5f);
rightAxis.setGranularity(0.1f);
mSeekBarX.setOnSeekBarChangeListener(this);

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

@ -61,8 +61,8 @@ public class BarChartPositiveNegative extends DemoBase {
xAxis.setDrawAxisLine(false);
xAxis.setTextColor(Color.LTGRAY);
xAxis.setTextSize(13f);
xAxis.setAxisMinValue(0f);
xAxis.setAxisMaxValue(5f);
xAxis.setAxisMinimum(0f);
xAxis.setAxisMaximum(5f);
xAxis.setLabelCount(5);
xAxis.setCenterAxisLabels(true);
xAxis.setGranularity(1f);

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

@ -66,15 +66,15 @@ public class CombinedChartActivity extends DemoBase {
YAxis rightAxis = mChart.getAxisRight();
rightAxis.setDrawGridLines(false);
rightAxis.setAxisMinValue(0f); // this replaces setStartAtZero(true)
rightAxis.setAxisMinimum(0f); // this replaces setStartAtZero(true)
YAxis leftAxis = mChart.getAxisLeft();
leftAxis.setDrawGridLines(false);
leftAxis.setAxisMinValue(0f); // this replaces setStartAtZero(true)
leftAxis.setAxisMinimum(0f); // this replaces setStartAtZero(true)
XAxis xAxis = mChart.getXAxis();
xAxis.setPosition(XAxisPosition.BOTH_SIDED);
xAxis.setAxisMinValue(0f);
xAxis.setAxisMinimum(0f);
xAxis.setGranularity(1f);
xAxis.setValueFormatter(new IAxisValueFormatter() {
@Override
@ -97,7 +97,7 @@ public class CombinedChartActivity extends DemoBase {
data.setData(generateCandleData());
data.setValueTypeface(mTfLight);
xAxis.setAxisMaxValue(data.getXMax() + 0.25f);
xAxis.setAxisMaximum(data.getXMax() + 0.25f);
mChart.setData(data);
mChart.invalidate();

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

@ -51,8 +51,8 @@ public class FilledLineActivity extends DemoBase {
xAxis.setEnabled(false);
YAxis leftAxis = mChart.getAxisLeft();
leftAxis.setAxisMaxValue(900f);
leftAxis.setAxisMinValue(-250f);
leftAxis.setAxisMaximum(900f);
leftAxis.setAxisMinimum(-250f);
leftAxis.setDrawAxisLine(false);
leftAxis.setDrawZeroLine(false);
leftAxis.setDrawGridLines(false);

6
MPChartExample/src/com/xxmassdeveloper/mpchartexample/HorizontalBarChartActivity.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;
@ -87,14 +85,14 @@ public class HorizontalBarChartActivity extends DemoBase implements OnSeekBarCha
yl.setTypeface(mTfLight);
yl.setDrawAxisLine(true);
yl.setDrawGridLines(true);
yl.setAxisMinValue(0f); // this replaces setStartAtZero(true)
yl.setAxisMinimum(0f); // this replaces setStartAtZero(true)
// yl.setInverted(true);
YAxis yr = mChart.getAxisRight();
yr.setTypeface(mTfLight);
yr.setDrawAxisLine(true);
yr.setDrawGridLines(false);
yr.setAxisMinValue(0f); // this replaces setStartAtZero(true)
yr.setAxisMinimum(0f); // this replaces setStartAtZero(true)
// yr.setInverted(true);
setData(12, 50);

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

@ -84,11 +84,11 @@ public class InvertedLineChartActivity extends DemoBase implements OnSeekBarChan
XAxis xl = mChart.getXAxis();
xl.setAvoidFirstLastClipping(true);
xl.setAxisMinValue(0f);
xl.setAxisMinimum(0f);
YAxis leftAxis = mChart.getAxisLeft();
leftAxis.setInverted(true);
leftAxis.setAxisMinValue(0f); // this replaces setStartAtZero(true)
leftAxis.setAxisMinimum(0f); // this replaces setStartAtZero(true)
YAxis rightAxis = mChart.getAxisRight();
rightAxis.setEnabled(false);

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

@ -128,8 +128,8 @@ public class LineChartActivity1 extends DemoBase implements OnSeekBarChangeListe
leftAxis.removeAllLimitLines(); // reset all limit lines to avoid overlapping lines
leftAxis.addLimitLine(ll1);
leftAxis.addLimitLine(ll2);
leftAxis.setAxisMaxValue(200f);
leftAxis.setAxisMinValue(-50f);
leftAxis.setAxisMaximum(200f);
leftAxis.setAxisMinimum(-50f);
//leftAxis.setYOffset(20f);
leftAxis.enableGridDashedLine(10f, 10f, 0f);
leftAxis.setDrawZeroLine(false);

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

@ -107,16 +107,16 @@ public class LineChartActivity2 extends DemoBase implements OnSeekBarChangeListe
YAxis leftAxis = mChart.getAxisLeft();
leftAxis.setTypeface(mTfLight);
leftAxis.setTextColor(ColorTemplate.getHoloBlue());
leftAxis.setAxisMaxValue(200f);
leftAxis.setAxisMinValue(0f);
leftAxis.setAxisMaximum(200f);
leftAxis.setAxisMinimum(0f);
leftAxis.setDrawGridLines(true);
leftAxis.setGranularityEnabled(true);
YAxis rightAxis = mChart.getAxisRight();
rightAxis.setTypeface(mTfLight);
rightAxis.setTextColor(Color.RED);
rightAxis.setAxisMaxValue(900);
rightAxis.setAxisMinValue(-200);
rightAxis.setAxisMaximum(900);
rightAxis.setAxisMinimum(-200);
rightAxis.setDrawGridLines(false);
rightAxis.setDrawZeroLine(false);
rightAxis.setGranularityEnabled(false);

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

@ -110,8 +110,8 @@ public class LineChartTime extends DemoBase implements OnSeekBarChangeListener {
leftAxis.setTextColor(ColorTemplate.getHoloBlue());
leftAxis.setDrawGridLines(true);
leftAxis.setGranularityEnabled(true);
leftAxis.setAxisMinValue(0f);
leftAxis.setAxisMaxValue(170f);
leftAxis.setAxisMinimum(0f);
leftAxis.setAxisMaximum(170f);
leftAxis.setYOffset(-9f);
leftAxis.setTextColor(Color.rgb(255, 192, 56));

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

@ -93,8 +93,8 @@ public class RadarChartActivitry extends DemoBase {
yAxis.setTypeface(mTfLight);
yAxis.setLabelCount(5, false);
yAxis.setTextSize(9f);
yAxis.setAxisMinValue(0f);
yAxis.setAxisMaxValue(80f);
yAxis.setAxisMinimum(0f);
yAxis.setAxisMaximum(80f);
yAxis.setDrawLabels(false);
Legend l = mChart.getLegend();

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

@ -2,7 +2,6 @@
package com.xxmassdeveloper.mpchartexample;
import android.graphics.Color;
import android.graphics.Typeface;
import android.os.Bundle;
import android.util.Log;
import android.view.Menu;
@ -83,8 +82,8 @@ public class RealtimeLineChartActivity extends DemoBase implements
YAxis leftAxis = mChart.getAxisLeft();
leftAxis.setTypeface(mTfLight);
leftAxis.setTextColor(Color.WHITE);
leftAxis.setAxisMaxValue(100f);
leftAxis.setAxisMinValue(0f);
leftAxis.setAxisMaximum(100f);
leftAxis.setAxisMinimum(0f);
leftAxis.setDrawGridLines(true);
YAxis rightAxis = mChart.getAxisRight();

3
MPChartExample/src/com/xxmassdeveloper/mpchartexample/ScatterChartActivity.java
View file

@ -1,7 +1,6 @@
package com.xxmassdeveloper.mpchartexample;
import android.graphics.Typeface;
import android.os.Bundle;
import android.util.Log;
import android.view.Menu;
@ -78,7 +77,7 @@ public class ScatterChartActivity extends DemoBase implements OnSeekBarChangeLis
YAxis yl = mChart.getAxisLeft();
yl.setTypeface(mTfLight);
yl.setAxisMinValue(0f); // this replaces setStartAtZero(true)
yl.setAxisMinimum(0f); // this replaces setStartAtZero(true)
mChart.getAxisRight().setEnabled(false);

2
MPChartExample/src/com/xxmassdeveloper/mpchartexample/StackedBarActivity.java
View file

@ -74,7 +74,7 @@ public class StackedBarActivity extends DemoBase implements OnSeekBarChangeListe
// change the position of the y-labels
YAxis leftAxis = mChart.getAxisLeft();
leftAxis.setValueFormatter(new MyAxisValueFormatter());
leftAxis.setAxisMinValue(0f); // this replaces setStartAtZero(true)
leftAxis.setAxisMinimum(0f); // this replaces setStartAtZero(true)
mChart.getAxisRight().setEnabled(false);
XAxis xLabels = mChart.getXAxis();

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

@ -59,8 +59,8 @@ public class StackedBarActivityNegative extends DemoBase implements
mChart.setHighlightFullBarEnabled(false);
mChart.getAxisLeft().setEnabled(false);
mChart.getAxisRight().setAxisMaxValue(25f);
mChart.getAxisRight().setAxisMinValue(-25f);
mChart.getAxisRight().setAxisMaximum(25f);
mChart.getAxisRight().setAxisMinimum(-25f);
mChart.getAxisRight().setDrawGridLines(false);
mChart.getAxisRight().setDrawZeroLine(true);
mChart.getAxisRight().setLabelCount(7, false);
@ -72,8 +72,8 @@ public class StackedBarActivityNegative extends DemoBase implements
xAxis.setDrawGridLines(false);
xAxis.setDrawAxisLine(false);
xAxis.setTextSize(9f);
xAxis.setAxisMinValue(0f);
xAxis.setAxisMaxValue(110f);
xAxis.setAxisMinimum(0f);
xAxis.setAxisMaximum(110f);
xAxis.setCenterAxisLabels(true);
xAxis.setLabelCount(12);
xAxis.setGranularity(10f);

2
MPChartExample/src/com/xxmassdeveloper/mpchartexample/fragments/BarChartFrag.java
View file

@ -52,7 +52,7 @@ public class BarChartFrag extends SimpleFragment implements OnChartGestureListen
YAxis leftAxis = mChart.getAxisLeft();
leftAxis.setTypeface(tf);
leftAxis.setAxisMinValue(0f); // this replaces setStartAtZero(true)
leftAxis.setAxisMinimum(0f); // this replaces setStartAtZero(true)
mChart.getAxisRight().setEnabled(false);

4
MPChartExample/src/com/xxmassdeveloper/mpchartexample/fragments/SineCosineFragment.java
View file

@ -41,8 +41,8 @@ public class SineCosineFragment extends SimpleFragment {
YAxis leftAxis = mChart.getAxisLeft();
leftAxis.setTypeface(tf);
leftAxis.setAxisMaxValue(1.2f);
leftAxis.setAxisMinValue(-1.2f);
leftAxis.setAxisMaximum(1.2f);
leftAxis.setAxisMinimum(-1.2f);
mChart.getAxisRight().setEnabled(false);

4
MPChartExample/src/com/xxmassdeveloper/mpchartexample/listviewitems/BarChartItem.java
View file

@ -62,13 +62,13 @@ public class BarChartItem extends ChartItem {
leftAxis.setTypeface(mTf);
leftAxis.setLabelCount(5, false);
leftAxis.setSpaceTop(20f);
leftAxis.setAxisMinValue(0f); // this replaces setStartAtZero(true)
leftAxis.setAxisMinimum(0f); // this replaces setStartAtZero(true)
YAxis rightAxis = holder.chart.getAxisRight();
rightAxis.setTypeface(mTf);
rightAxis.setLabelCount(5, false);
rightAxis.setSpaceTop(20f);
rightAxis.setAxisMinValue(0f); // this replaces setStartAtZero(true)
rightAxis.setAxisMinimum(0f); // this replaces setStartAtZero(true)
mChartData.setValueTypeface(mTf);

4
MPChartExample/src/com/xxmassdeveloper/mpchartexample/listviewitems/LineChartItem.java
View file

@ -62,13 +62,13 @@ public class LineChartItem extends ChartItem {
YAxis leftAxis = holder.chart.getAxisLeft();
leftAxis.setTypeface(mTf);
leftAxis.setLabelCount(5, false);
leftAxis.setAxisMinValue(0f); // this replaces setStartAtZero(true)
leftAxis.setAxisMinimum(0f); // this replaces setStartAtZero(true)
YAxis rightAxis = holder.chart.getAxisRight();
rightAxis.setTypeface(mTf);
rightAxis.setLabelCount(5, false);
rightAxis.setDrawGridLines(false);
rightAxis.setAxisMinValue(0f); // this replaces setStartAtZero(true)
rightAxis.setAxisMinimum(0f); // this replaces setStartAtZero(true)
// set data
holder.chart.setData((LineData) mChartData);

2
MPChartExample/src/com/xxmassdeveloper/mpchartexample/realm/RealmDatabaseActivityHorizontalBar.java
View file

@ -34,7 +34,7 @@ public class RealmDatabaseActivityHorizontalBar extends RealmBaseActivity {
mChart = (HorizontalBarChart) findViewById(R.id.chart1);
setup(mChart);
mChart.getAxisLeft().setAxisMinValue(0f);
mChart.getAxisLeft().setAxisMinimum(0f);
mChart.setDrawValueAboveBar(false);
}

4
MPChartExample/src/com/xxmassdeveloper/mpchartexample/realm/RealmDatabaseActivityLine.java
View file

@ -33,8 +33,8 @@ public class RealmDatabaseActivityLine extends RealmBaseActivity {
mChart = (LineChart) findViewById(R.id.chart1);
setup(mChart);
mChart.getAxisLeft().setAxisMaxValue(150f);
mChart.getAxisLeft().setAxisMinValue(0f);
mChart.getAxisLeft().setAxisMaximum(150f);
mChart.getAxisLeft().setAxisMinimum(0f);
mChart.getAxisLeft().setDrawGridLines(false);
mChart.getXAxis().setDrawGridLines(false);
}

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

@ -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,12 +582,22 @@ 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
@ -595,12 +605,22 @@ public abstract class AxisBase extends ComponentBase {
*
* @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.

6
MPChartLib/src/main/java/com/github/mikephil/charting/components/YAxis.java
View file

@ -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();
}
/**