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

Comment refactoring

Browse source
This commit is contained in:
Philipp Jahoda 2016-06-04 15:15:26 +02:00
parent 565c8a465e
commit 6fd2ffa278
79 changed files with 303 additions and 303 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -65,7 +65,7 @@ public class BarChartActivitySinus extends DemoBase implements OnSeekBarChangeLi
// scaling can now only be done on x- and y-axis separately
mChart.setPinchZoom(false);
// draw shadows for each bar that show the maximum yValue
// draw shadows for each bar that show the maximum value
// mChart.setDrawBarShadow(true);
// mChart.setDrawXLabels(false);

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

@ -72,7 +72,7 @@ public class HorizontalBarChartActivity extends DemoBase implements OnSeekBarCha
// scaling can now only be done on x- and y-axis separately
mChart.setPinchZoom(false);
// draw shadows for each bar that show the maximum yValue
// draw shadows for each bar that show the maximum value
// mChart.setDrawBarShadow(true);
mChart.setDrawGridBackground(false);

2
MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/MyMarkerView.java
View file

@ -50,7 +50,7 @@ public class MyMarkerView extends MarkerView {
@Override
public int getYOffset(float ypos) {
// this will cause the marker-view to be above the selected yValue
// this will cause the marker-view to be above the selected value
return -getHeight();
}
}

2
MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/RadarMarkerView.java
View file

@ -46,7 +46,7 @@ public class RadarMarkerView extends MarkerView {
@Override
public int getYOffset(float ypos) {
// this will cause the marker-view to be above the selected yValue
// this will cause the marker-view to be above the selected value
return -getHeight()-10;
}
}

4
MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/StackedBarsMarkerView.java
View file

@ -37,7 +37,7 @@ public class StackedBarsMarkerView extends MarkerView {
if(be.getYVals() != null) {
// draw the stack yValue
// draw the stack value
tvContent.setText("" + Utils.formatNumber(be.getYVals()[highlight.getStackIndex()], 0, true));
} else {
tvContent.setText("" + Utils.formatNumber(be.getY(), 0, true));
@ -56,7 +56,7 @@ public class StackedBarsMarkerView extends MarkerView {
@Override
public int getYOffset(float ypos) {
// this will cause the marker-view to be above the selected yValue
// this will cause the marker-view to be above the selected value
return -getHeight();
}
}

2
MPChartExample/src/com/xxmassdeveloper/mpchartexample/notimportant/MainActivity.java
View file

@ -73,7 +73,7 @@ public class MainActivity extends Activity implements OnItemClickListener {
objects.add(new ContentItem("Combined Chart",
"Demonstrates how to create a combined chart (bar and line in this case)."));
objects.add(new ContentItem("Pie Chart", "A simple demonstration of the pie chart."));
objects.add(new ContentItem("Pie Chart with yValue lines", "A simple demonstration of the pie chart with polyline notes."));
objects.add(new ContentItem("Pie Chart with value lines", "A simple demonstration of the pie chart with polyline notes."));
objects.add(new ContentItem("Scatter Chart", "A simple demonstration of the scatter chart."));
objects.add(new ContentItem("Bubble Chart", "A simple demonstration of the bubble chart."));
objects.add(new ContentItem("Stacked Bar Chart",

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

@ -50,7 +50,7 @@ public class RealmDatabaseActivityBar extends RealmBaseActivity {
RealmResults<RealmDemoData> result = mRealm.allObjects(RealmDemoData.class);
//RealmBarDataSet<RealmDemoData> set = new RealmBarDataSet<RealmDemoData>(result, "stackValues", "xIndex"); // normal entries
RealmBarDataSet<RealmDemoData> set = new RealmBarDataSet<RealmDemoData>(result, "xValue", "yValue"); // stacked entries
RealmBarDataSet<RealmDemoData> set = new RealmBarDataSet<RealmDemoData>(result, "xValue", "value"); // stacked entries
set.setColors(new int[] {ColorTemplate.rgb("#FF5722"), ColorTemplate.rgb("#03A9F4")});
set.setLabel("Realm BarDataSet");

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

@ -53,7 +53,7 @@ public class RealmDatabaseActivityBubble extends RealmBaseActivity {
RealmResults<RealmDemoData> result = mRealm.allObjects(RealmDemoData.class);
RealmBubbleDataSet<RealmDemoData> set = new RealmBubbleDataSet<RealmDemoData>(result, "xValue", "yValue", "bubbleSize");
RealmBubbleDataSet<RealmDemoData> set = new RealmBubbleDataSet<RealmDemoData>(result, "xValue", "value", "bubbleSize");
set.setLabel("Realm BubbleDataSet");
set.setColors(ColorTemplate.COLORFUL_COLORS, 110);

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

@ -54,7 +54,7 @@ public class RealmDatabaseActivityLine extends RealmBaseActivity {
RealmResults<RealmDemoData> result = mRealm.allObjects(RealmDemoData.class);
RealmLineDataSet<RealmDemoData> set = new RealmLineDataSet<RealmDemoData>(result, "xValue", "yValue");
RealmLineDataSet<RealmDemoData> set = new RealmLineDataSet<RealmDemoData>(result, "xValue", "value");
set.setDrawCubic(false);
set.setLabel("Realm LineDataSet");
set.setDrawCircleHole(false);

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

@ -54,7 +54,7 @@ public class RealmDatabaseActivityPie extends RealmBaseActivity {
RealmResults<RealmDemoData> result = mRealm.allObjects(RealmDemoData.class);
//RealmBarDataSet<RealmDemoData> set = new RealmBarDataSet<RealmDemoData>(result, "stackValues", "xIndex"); // normal entries
RealmPieDataSet<RealmDemoData> set = new RealmPieDataSet<RealmDemoData>(result, "yValue", "label"); // stacked entries
RealmPieDataSet<RealmDemoData> set = new RealmPieDataSet<RealmDemoData>(result, "value", "label"); // stacked entries
set.setColors(ColorTemplate.VORDIPLOM_COLORS);
set.setLabel("Example market share");
set.setSliceSpace(2);

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

@ -56,7 +56,7 @@ public class RealmDatabaseActivityRadar extends RealmBaseActivity {
RealmResults<RealmDemoData> result = mRealm.allObjects(RealmDemoData.class);
//RealmBarDataSet<RealmDemoData> set = new RealmBarDataSet<RealmDemoData>(result, "stackValues", "xIndex"); // normal entries
RealmRadarDataSet<RealmDemoData> set = new RealmRadarDataSet<RealmDemoData>(result, "xValue", "yValue"); // stacked entries
RealmRadarDataSet<RealmDemoData> set = new RealmRadarDataSet<RealmDemoData>(result, "xValue", "value"); // stacked entries
set.setLabel("Realm RadarDataSet");
set.setDrawFilled(true);
set.setColor(ColorTemplate.rgb("#009688"));

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

@ -54,7 +54,7 @@ public class RealmDatabaseActivityScatter extends RealmBaseActivity {
RealmResults<RealmDemoData> result = mRealm.allObjects(RealmDemoData.class);
RealmScatterDataSet<RealmDemoData> set = new RealmScatterDataSet<RealmDemoData>(result, "xValue", "yValue");
RealmScatterDataSet<RealmDemoData> set = new RealmScatterDataSet<RealmDemoData>(result, "xValue", "value");
set.setLabel("Realm ScatterDataSet");
set.setScatterShapeSize(9f);
set.setColor(ColorTemplate.rgb("#CDDC39"));

10
MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarChart.java
View file

@ -32,7 +32,7 @@ public class BarChart extends BarLineChartBase<BarData> implements BarDataProvid
private boolean mDrawValueAboveBar = true;
/**
* if set to true, a grey area is drawn behind each bar that indicates the maximum yValue
* if set to true, a grey area is drawn behind each bar that indicates the maximum value
*/
private boolean mDrawBarShadow = false;
@ -80,7 +80,7 @@ public class BarChart extends BarLineChartBase<BarData> implements BarDataProvid
}
/**
* Returns the Highlight object (contains x-index and DataSet index) of the selected yValue at the given touch
* Returns the Highlight object (contains x-index and DataSet index) of the selected value at the given touch
* point
* inside the BarChart.
*
@ -166,7 +166,7 @@ public class BarChart extends BarLineChartBase<BarData> implements BarDataProvid
}
/**
* If set to true, a grey area is drawn behind each bar that indicates the maximum yValue. Enabling his will reduce
* If set to true, a grey area is drawn behind each bar that indicates the maximum value. Enabling his will reduce
* performance by about 50%.
*
* @param enabled
@ -203,7 +203,7 @@ public class BarChart extends BarLineChartBase<BarData> implements BarDataProvid
// /**
// * Returns the lowest x-index (yValue on the x-axis) that is still visible on the chart.
// * Returns the lowest x-index (value on the x-axis) that is still visible on the chart.
// *
// * @return
// */
@ -220,7 +220,7 @@ public class BarChart extends BarLineChartBase<BarData> implements BarDataProvid
// }
//
// /**
// * Returns the highest x-index (yValue on the x-axis) that is still visible on the chart.
// * Returns the highest x-index (value on the x-axis) that is still visible on the chart.
// *
// * @return
// */

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

@ -50,7 +50,7 @@ public abstract class BarLineChartBase<T extends BarLineScatterCandleBubbleData<
/**
* the maximum number of entries to which values will be drawn
* (entry numbers greater than this yValue will cause yValue-labels to disappear)
* (entry numbers greater than this value will cause value-labels to disappear)
*/
protected int mMaxVisibleCount = 100;
@ -80,7 +80,7 @@ public abstract class BarLineChartBase<T extends BarLineScatterCandleBubbleData<
protected boolean mHighlightPerDragEnabled = true;
/**
* flag that indicates whether the highlight should be full-bar oriented, or single-yValue?
* flag that indicates whether the highlight should be full-bar oriented, or single-value?
*/
protected boolean mHighlightFullBarEnabled = false;
@ -529,7 +529,7 @@ public abstract class BarLineChartBase<T extends BarLineScatterCandleBubbleData<
float xPos = e.getX();
float yPos = e.getY();
// position of the marker depends on selected yValue index and yValue
// position of the marker depends on selected value index and value
float[] pts = new float[]{
xPos, yPos
};
@ -710,7 +710,7 @@ public abstract class BarLineChartBase<T extends BarLineScatterCandleBubbleData<
}
/**
* Sets the minimum scale factor yValue to which can be zoomed out. 1f =
* Sets the minimum scale factor value to which can be zoomed out. 1f =
* fitScreen
*
* @param scaleX
@ -748,7 +748,7 @@ public abstract class BarLineChartBase<T extends BarLineScatterCandleBubbleData<
}
/**
* Limits the maximum and minimum yValue count that can be visible by
* Limits the maximum and minimum value count that can be visible by
* pinching and zooming. e.g. minRange=10, maxRange=100 no less than 10
* values and no more that 100 values can be viewed at once without
* scrolling
@ -950,7 +950,7 @@ public abstract class BarLineChartBase<T extends BarLineScatterCandleBubbleData<
/** CODE BELOW IS GETTERS AND SETTERS */
/**
* Returns the delta-y yValue (y-yValue range) of the specified axis.
* Returns the delta-y value (y-value range) of the specified axis.
*
* @param axis
* @return
@ -1040,7 +1040,7 @@ public abstract class BarLineChartBase<T extends BarLineScatterCandleBubbleData<
}
/**
* @return true the highlight is be full-bar oriented, false if single-yValue
* @return true the highlight is be full-bar oriented, false if single-value
*/
public boolean isHighlightFullBarEnabled() {
return mHighlightFullBarEnabled;
@ -1188,7 +1188,7 @@ public abstract class BarLineChartBase<T extends BarLineScatterCandleBubbleData<
/**
* Returns the Highlight object (contains x-index and DataSet index) of the
* selected yValue at the given touch point inside the Line-, Scatter-, or
* selected value at the given touch point inside the Line-, Scatter-, or
* CandleStick-Chart.
*
* @param x
@ -1232,7 +1232,7 @@ public abstract class BarLineChartBase<T extends BarLineScatterCandleBubbleData<
/**
* Returns y value at the given touch position (must not necessarily be
* a yValue contained in one of the datasets)
* a value contained in one of the datasets)
*
* @param x
* @param y
@ -1273,7 +1273,7 @@ public abstract class BarLineChartBase<T extends BarLineScatterCandleBubbleData<
}
/**
* Returns the lowest x-index (yValue on the x-axis) that is still visible on
* Returns the lowest x-index (value on the x-axis) that is still visible on
* the chart.
*
* @return
@ -1286,7 +1286,7 @@ public abstract class BarLineChartBase<T extends BarLineScatterCandleBubbleData<
}
/**
* Returns the highest x-index (yValue on the x-axis) that is still visible
* Returns the highest x-index (value on the x-axis) that is still visible
* on the chart.
*
* @return

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

@ -90,13 +90,13 @@ public abstract class Chart<T extends ChartData<? extends IDataSet<? extends Ent
/**
* Deceleration friction coefficient in [0 ; 1] interval, higher values
* indicate that speed will decrease slowly, for example if it set to 0, it
* will stop immediately. 1 is an invalid yValue, and will be converted to
* will stop immediately. 1 is an invalid value, and will be converted to
* 0.999f automatically.
*/
private float mDragDecelerationFrictionCoef = 0.9f;
/**
* default yValue-formatter, number of digits depends on provided chart-data
* default value-formatter, number of digits depends on provided chart-data
*/
protected ValueFormatter mDefaultFormatter;
@ -133,7 +133,7 @@ public abstract class Chart<T extends ChartData<? extends IDataSet<? extends Ent
protected Legend mLegend;
/**
* listener that is called when a yValue on the chart is selected
* listener that is called when a value on the chart is selected
*/
protected OnChartValueSelectedListener mSelectionListener;
@ -377,13 +377,13 @@ public abstract class Chart<T extends ChartData<? extends IDataSet<? extends Ent
protected abstract void calculateOffsets();
/**
* calcualtes the y-min and y-max yValue and the y-delta and x-delta yValue
* calcualtes the y-min and y-max value and the y-delta and x-delta value
*/
protected abstract void calcMinMax();
/**
* calculates the required number of digits for the values that might be
* drawn in the chart (if enabled), and creates the default-yValue-formatter
* drawn in the chart (if enabled), and creates the default-value-formatter
*/
protected void calculateFormatter(float min, float max) {
@ -570,7 +570,7 @@ public abstract class Chart<T extends ChartData<? extends IDataSet<? extends Ent
}
/**
* Highlights the yValue at the given x-index in the given DataSet. Provide
* Highlights the value at the given x-index in the given DataSet. Provide
* -1 as the x-index or dataSetIndex to undo all highlighting.
*
* @param xIndex
@ -581,7 +581,7 @@ public abstract class Chart<T extends ChartData<? extends IDataSet<? extends Ent
}
/**
* Highlights the yValue at the given x position in the given DataSet. Provide
* Highlights the value at the given x position in the given DataSet. Provide
* -1 as the dataSetIndex to undo all highlighting.
*
* @param x
@ -607,7 +607,7 @@ public abstract class Chart<T extends ChartData<? extends IDataSet<? extends Ent
}
/**
* Highlights the yValue selected by touch gesture. Unlike
* Highlights the value selected by touch gesture. Unlike
* highlightValues(...), this generates a callback to the
* OnChartValueSelectedListener.
*
@ -678,7 +678,7 @@ public abstract class Chart<T extends ChartData<? extends IDataSet<? extends Ent
/** BELOW CODE IS FOR THE MARKER VIEW */
/**
* if set to true, the marker view is drawn when a yValue is clicked
* if set to true, the marker view is drawn when a value is clicked
*/
protected boolean mDrawMarkerViews = true;
@ -789,7 +789,7 @@ public abstract class Chart<T extends ChartData<? extends IDataSet<? extends Ent
/**
* Deceleration friction coefficient in [0 ; 1] interval, higher values
* indicate that speed will decrease slowly, for example if it set to 0, it
* will stop immediately. 1 is an invalid yValue, and will be converted to
* will stop immediately. 1 is an invalid value, and will be converted to
* 0.999f automatically.
*
* @param newValue
@ -1000,7 +1000,7 @@ public abstract class Chart<T extends ChartData<? extends IDataSet<? extends Ent
}
/**
* returns the current y-max yValue across all DataSets
* returns the current y-max value across all DataSets
*
* @return
*/
@ -1009,7 +1009,7 @@ public abstract class Chart<T extends ChartData<? extends IDataSet<? extends Ent
}
/**
* returns the current y-min yValue across all DataSets
* returns the current y-min value across all DataSets
*
* @return
*/
@ -1238,7 +1238,7 @@ public abstract class Chart<T extends ChartData<? extends IDataSet<? extends Ent
}
/**
* sets the view that is displayed when a yValue is clicked on the chart
* sets the view that is displayed when a value is clicked on the chart
*
* @param v
*/
@ -1277,7 +1277,7 @@ public abstract class Chart<T extends ChartData<? extends IDataSet<? extends Ent
}
/**
* Returns the rectangle that defines the borders of the chart-yValue surface
* Returns the rectangle that defines the borders of the chart-value surface
* (into which the actual values are drawn).
*
* @return

4
MPChartLib/src/main/java/com/github/mikephil/charting/charts/CombinedChart.java
View file

@ -41,7 +41,7 @@ public class CombinedChart extends BarLineChartBase<CombinedData> implements Lin
/**
* if set to true, a grey area is drawn behind each bar that indicates the
* maximum yValue
* maximum value
*/
private boolean mDrawBarShadow = false;
@ -189,7 +189,7 @@ public class CombinedChart extends BarLineChartBase<CombinedData> implements Lin
/**
* If set to true, a grey area is drawn behind each bar that indicates the
* maximum yValue. Enabling his will reduce performance by about 50%.
* maximum value. Enabling his will reduce performance by about 50%.
*
* @param enabled
*/

6
MPChartLib/src/main/java/com/github/mikephil/charting/charts/HorizontalBarChart.java
View file

@ -170,7 +170,7 @@ public class HorizontalBarChart extends BarChart {
}
/**
* Returns the Highlight object (contains x-index and DataSet index) of the selected yValue at the given touch point
* Returns the Highlight object (contains x-index and DataSet index) of the selected value at the given touch point
* inside the BarChart.
*
* @param x
@ -203,7 +203,7 @@ public class HorizontalBarChart extends BarChart {
}
// /**
// * Returns the lowest x-index (yValue on the x-axis) that is still visible on the chart.
// * Returns the lowest x-index (value on the x-axis) that is still visible on the chart.
// *
// * @return
// */
@ -220,7 +220,7 @@ public class HorizontalBarChart extends BarChart {
// }
//
// /**
// * Returns the highest x-index (yValue on the x-axis) that is still visible on the chart.
// * Returns the highest x-index (value on the x-axis) that is still visible on the chart.
// *
// * @return
// */

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

@ -256,7 +256,7 @@ public class PieChart extends PieRadarChartBase<PieData> {
}
/**
* calculates the needed angle for a given yValue
* calculates the needed angle for a given value
*
* @param value
* @return
@ -266,7 +266,7 @@ public class PieChart extends PieRadarChartBase<PieData> {
}
/**
* calculates the needed angle for a given yValue
* calculates the needed angle for a given value
*
* @param value
* @param yValueSum
@ -550,7 +550,7 @@ public class PieChart extends PieRadarChartBase<PieData> {
/**
* Sets the amount of transparency the transparent circle should have 0 = fully transparent,
* 255 = fully opaque.
* Default yValue is 100.
* Default value is 100.
*
* @param alpha 0-255
*/
@ -559,7 +559,7 @@ public class PieChart extends PieRadarChartBase<PieData> {
}
/**
* set this to true to draw the x-yValue text into the pie slices
* set this to true to draw the x-value text into the pie slices
*
* @param enabled
*/
@ -588,7 +588,7 @@ public class PieChart extends PieRadarChartBase<PieData> {
/**
* If this is enabled, values inside the PieChart are drawn in percent and
* not with their original yValue. Values provided for the ValueFormatter to
* not with their original value. Values provided for the ValueFormatter to
* format are then provided in percent.
*
* @param enabled

4
MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieRadarChartBase.java
View file

@ -343,7 +343,7 @@ public abstract class PieRadarChartBase<T extends ChartData<? extends IDataSet<?
/**
* gets the raw version of the current rotation angle of the pie chart the
* returned yValue could be any yValue, negative or positive, outside of the
* returned value could be any value, negative or positive, outside of the
* 360 degrees. this is used when working with rotation direction, mainly by
* gestures and animations.
*
@ -442,7 +442,7 @@ public abstract class PieRadarChartBase<T extends ChartData<? extends IDataSet<?
/**
* Returns an array of SelectionDetail objects for the given x-index. The SelectionDetail
* objects give information about the yValue at the selected index and the
* objects give information about the value at the selected index and the
* DataSet it belongs to. INFORMATION: This method does calculations at
* runtime. Do not over-use in performance critical situations.
*

8
MPChartLib/src/main/java/com/github/mikephil/charting/charts/RadarChart.java
View file

@ -242,7 +242,7 @@ public class RadarChart extends PieRadarChartBase<RadarData> {
}
/**
* Sets the transparency (alpha) yValue for all web lines, default: 150, 255
* Sets the transparency (alpha) value for all web lines, default: 150, 255
* = 100% opaque, 0 = 100% transparent
*
* @param alpha
@ -252,7 +252,7 @@ public class RadarChart extends PieRadarChartBase<RadarData> {
}
/**
* Returns the alpha yValue for all web lines.
* Returns the alpha value for all web lines.
*
* @return
*/
@ -339,14 +339,14 @@ public class RadarChart extends PieRadarChartBase<RadarData> {
}
/**
* Returns the maximum yValue this chart can display on it's y-axis.
* Returns the maximum value this chart can display on it's y-axis.
*/
public float getYChartMax() {
return mYAxis.mAxisMaximum;
}
/**
* Returns the minimum yValue this chart can display on it's y-axis.
* Returns the minimum value this chart can display on it's y-axis.
*/
public float getYChartMin() {
return mYAxis.mAxisMinimum;

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

@ -65,7 +65,7 @@ public abstract class AxisBase extends ComponentBase {
/**
* When true, axis labels are controlled by the `granularity` property.
* When false, axis values could possibly be repeated.
* This could happen if two adjacent axis values are rounded to same yValue.
* This could happen if two adjacent axis values are rounded to same value.
* If using granularity this could be avoided by having fewer axis values visible.
*/
protected boolean mGranularityEnabled = false;
@ -108,12 +108,12 @@ public abstract class AxisBase extends ComponentBase {
protected boolean mDrawLimitLineBehindData = false;
/**
* flag indicating that the axis-min yValue has been customized
* flag indicating that the axis-min value has been customized
*/
protected boolean mCustomAxisMin = false;
/**
* flag indicating that the axis-max yValue has been customized
* flag indicating that the axis-max value has been customized
*/
protected boolean mCustomAxisMax = false;
@ -341,7 +341,7 @@ public abstract class AxisBase extends ComponentBase {
}
/**
* Enabled/disable granularity control on axis yValue intervals. If enabled, the axis
* Enabled/disable granularity control on axis value intervals. If enabled, the axis
* interval is not allowed to go below a certain granularity. Default: false
*
* @param enabled
@ -538,7 +538,7 @@ public abstract class AxisBase extends ComponentBase {
}
/**
* By calling this method, any custom maximum yValue that has been previously set is reseted,
* By calling this method, any custom maximum value that has been previously set is reseted,
* and the calculation is
* done automatically.
*/
@ -547,7 +547,7 @@ public abstract class AxisBase extends ComponentBase {
}
/**
* Returns true if the axis max yValue has been customized (and is not calculated automatically)
* Returns true if the axis max value has been customized (and is not calculated automatically)
*
* @return
*/
@ -556,7 +556,7 @@ public abstract class AxisBase extends ComponentBase {
}
/**
* By calling this method, any custom minimum yValue that has been previously set is reseted,
* By calling this method, any custom minimum value that has been previously set is reseted,
* and the calculation is
* done automatically.
*/
@ -565,7 +565,7 @@ public abstract class AxisBase extends ComponentBase {
}
/**
* Returns true if the axis min yValue has been customized (and is not calculated automatically)
* Returns true if the axis min value has been customized (and is not calculated automatically)
*
* @return
*/
@ -574,11 +574,11 @@ public abstract class AxisBase extends ComponentBase {
}
/**
* Set a custom minimum yValue for this axis. If set, this yValue will not be calculated
* Set a custom minimum value for this axis. If set, this value will not be calculated
* automatically depending on
* the provided data. Use resetAxisMinValue() to undo this. Do not forget to call
* setStartAtZero(false) if you use
* this method. Otherwise, the axis-minimum yValue will still be forced to 0.
* this method. Otherwise, the axis-minimum value will still be forced to 0.
*
* @param min
*/
@ -589,7 +589,7 @@ public abstract class AxisBase extends ComponentBase {
}
/**
* Set a custom maximum yValue for this axis. If set, this yValue will not be calculated
* 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.
*
@ -605,12 +605,12 @@ public abstract class AxisBase extends ComponentBase {
* Calculates the minimum / maximum and range values of the axis with the given
* minimum and maximum values from the chart data.
*
* @param dataMin the min yValue according to chart data
* @param dataMax the max yValue according to chart data
* @param dataMin the min value according to chart data
* @param dataMax the max value according to chart data
*/
public void calculate(float dataMin, float dataMax) {
// if custom, use yValue as is, else use data yValue
// if custom, use value as is, else use data value
float min = mCustomAxisMin ? mAxisMinimum : dataMin;
float max = mCustomAxisMax ? mAxisMaximum : dataMax;

2
MPChartLib/src/main/java/com/github/mikephil/charting/components/Legend.java
View file

@ -76,7 +76,7 @@ public class Legend extends ComponentBase {
private String[] mExtraLabels;
/**
* Are the legend labels/colors a custom yValue or auto calculated? If false,
* Are the legend labels/colors a custom value or auto calculated? If false,
* then it's auto, if true, then custom. default false (automatic legend)
*/
private boolean mIsLegendCustom = false;

14
MPChartLib/src/main/java/com/github/mikephil/charting/components/LimitLine.java
View file

@ -17,7 +17,7 @@ import com.github.mikephil.charting.utils.Utils;
*/
public class LimitLine extends ComponentBase {
/** limit / maximum (the y-yValue or xIndex) */
/** limit / maximum (the y-value or xIndex) */
private float mLimit = 0f;
/** the width of the limit line */
@ -46,7 +46,7 @@ public class LimitLine extends ComponentBase {
/**
* Constructor with limit.
*
* @param limit - the position (the yValue) on the y-axis (y-yValue) or x-axis
* @param limit - the position (the value) on the y-axis (y-value) or x-axis
* (xIndex) where this line should appear
*/
public LimitLine(float limit) {
@ -56,7 +56,7 @@ public class LimitLine extends ComponentBase {
/**
* Constructor with limit and label.
*
* @param limit - the position (the yValue) on the y-axis (y-yValue) or x-axis
* @param limit - the position (the value) on the y-axis (y-value) or x-axis
* (xIndex) where this line should appear
* @param label - provide "" if no label is required
*/
@ -157,7 +157,7 @@ public class LimitLine extends ComponentBase {
}
/**
* Sets the color of the yValue-text that is drawn next to the LimitLine.
* Sets the color of the value-text that is drawn next to the LimitLine.
* Default: Paint.Style.FILL_AND_STROKE
*
* @param style
@ -167,7 +167,7 @@ public class LimitLine extends ComponentBase {
}
/**
* Returns the color of the yValue-text that is drawn next to the LimitLine.
* Returns the color of the value-text that is drawn next to the LimitLine.
*
* @return
*/
@ -176,7 +176,7 @@ public class LimitLine extends ComponentBase {
}
/**
* Sets the position of the LimitLine yValue label (either on the right or on
* Sets the position of the LimitLine value label (either on the right or on
* the left edge of the chart). Not supported for RadarChart.
*
* @param pos
@ -186,7 +186,7 @@ public class LimitLine extends ComponentBase {
}
/**
* Returns the position of the LimitLine label (yValue).
* Returns the position of the LimitLine label (value).
*
* @return
*/

4
MPChartLib/src/main/java/com/github/mikephil/charting/components/MarkerView.java
View file

@ -68,7 +68,7 @@ public abstract class MarkerView extends RelativeLayout {
*
* @param e The Entry the MarkerView belongs to. This can also be any subclass of Entry, like BarEntry or
* CandleEntry, simply cast it at runtime.
* @param highlight the highlight object contains information about the highlighted yValue such as it's dataset-index, the
* @param highlight the highlight object contains information about the highlighted value such as it's dataset-index, the
* selected range or stack-index (only stacked bar entries).
*/
public abstract void refreshContent(Entry e, Highlight highlight);
@ -84,7 +84,7 @@ public abstract class MarkerView extends RelativeLayout {
/**
* Use this to return the desired position offset you wish the MarkerView to have on the y-axis. By returning
* -getHeight() you will cause the MarkerView to be above the selected yValue.
* -getHeight() you will cause the MarkerView to be above the selected value.
*
* @param ypos the position on the y-axis in pixels where the marker is drawn
* @return

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

@ -10,7 +10,7 @@ import com.github.mikephil.charting.utils.Utils;
* modify it. Do not
* access public variables directly. Be aware that not all features the YLabels class provides
* are suitable for the
* RadarChart. Customizations that affect the yValue range of the axis need to be applied before
* RadarChart. Customizations that affect the value range of the axis need to be applied before
* setting data for the
* chart.
*
@ -44,12 +44,12 @@ public class YAxis extends AxisBase {
protected float mZeroLineWidth = 1f;
/**
* axis space from the largest yValue to the top in percent of the total axis range
* axis space from the largest value to the top in percent of the total axis range
*/
protected float mSpacePercentTop = 10f;
/**
* axis space from the smallest yValue to the bottom in percent of the total axis range
* axis space from the smallest value to the bottom in percent of the total axis range
*/
protected float mSpacePercentBottom = 10f;
@ -346,7 +346,7 @@ public class YAxis extends AxisBase {
@Override
public void calculate(float dataMin, float dataMax) {
// if custom, use yValue as is, else use data yValue
// if custom, use value as is, else use data value
float min = mCustomAxisMin ? mAxisMinimum : dataMin;
float max = mCustomAxisMax ? mAxisMaximum : dataMax;

12
MPChartLib/src/main/java/com/github/mikephil/charting/data/BarDataSet.java
View file

@ -11,7 +11,7 @@ import java.util.List;
public class BarDataSet extends BarLineScatterCandleBubbleDataSet<BarEntry> implements IBarDataSet {
/**
* the maximum number of bars that are stacked upon each other, this yValue
* the maximum number of bars that are stacked upon each other, this value
* is calculated from the Entries that are added to the DataSet
*/
private int mStackSize = 1;
@ -26,12 +26,12 @@ public class BarDataSet extends BarLineScatterCandleBubbleDataSet<BarEntry> impl
private int mBarBorderColor = Color.BLACK;
/**
* the alpha yValue used to draw the highlight indicator bar
* the alpha value used to draw the highlight indicator bar
*/
private int mHighLightAlpha = 120;
/**
* the overall entry count, including counting each stack-yValue individually
* the overall entry count, including counting each stack-value individually
*/
private int mEntryCountStacks = 0;
@ -170,7 +170,7 @@ public class BarDataSet extends BarLineScatterCandleBubbleDataSet<BarEntry> impl
}
/**
* returns the overall entry count, including counting each stack-yValue
* returns the overall entry count, including counting each stack-value
* individually
*
* @return
@ -181,7 +181,7 @@ public class BarDataSet extends BarLineScatterCandleBubbleDataSet<BarEntry> impl
/**
* Sets the color used for drawing the bar-shadows. The bar shadows is a
* surface behind the bar that indicates the maximum yValue. Don't for get to
* surface behind the bar that indicates the maximum value. Don't for get to
* use getResources().getColor(...) to set this. Or Color.rgb(...).
*
* @param color
@ -236,7 +236,7 @@ public class BarDataSet extends BarLineScatterCandleBubbleDataSet<BarEntry> impl
}
/**
* Set the alpha yValue (transparency) that is used for drawing the highlight
* Set the alpha value (transparency) that is used for drawing the highlight
* indicator bar. min = 0 (fully transparent), max = 255 (fully opaque)
*
* @param alpha

4
MPChartLib/src/main/java/com/github/mikephil/charting/data/BarEntry.java
View file

@ -84,7 +84,7 @@ public class BarEntry extends Entry {
}
/**
* Returns the stacked values this BarEntry represents, or null, if only a single yValue is represented (then, use
* Returns the stacked values this BarEntry represents, or null, if only a single value is represented (then, use
* getY()).
*
* @return
@ -105,7 +105,7 @@ public class BarEntry extends Entry {
}
/**
* Returns the yValue of this BarEntry. If the entry is stacked, it returns the positive sum of all values.
* Returns the value of this BarEntry. If the entry is stacked, it returns the positive sum of all values.
*
* @return
*/

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

@ -42,7 +42,7 @@ public abstract class BaseDataSet<T extends Entry> implements IDataSet<T> {
protected YAxis.AxisDependency mAxisDependency = YAxis.AxisDependency.LEFT;
/**
* if true, yValue highlightning is enabled
* if true, value highlightning is enabled
*/
protected boolean mHighlightEnabled = true;
@ -52,7 +52,7 @@ public abstract class BaseDataSet<T extends Entry> implements IDataSet<T> {
protected transient ValueFormatter mValueFormatter;
/**
* the typeface used for the yValue text
* the typeface used for the value text
*/
protected Typeface mValueTypeface;
@ -62,7 +62,7 @@ public abstract class BaseDataSet<T extends Entry> implements IDataSet<T> {
protected boolean mDrawValues = true;
/**
* the size of the yValue-text labels
* the size of the value-text labels
*/
protected float mValueTextSize = 17f;
@ -196,7 +196,7 @@ public abstract class BaseDataSet<T extends Entry> implements IDataSet<T> {
}
/**
* Sets a color with a specific alpha yValue.
* Sets a color with a specific alpha value.
*
* @param color
* @param alpha from 0-255
@ -206,7 +206,7 @@ public abstract class BaseDataSet<T extends Entry> implements IDataSet<T> {
}
/**
* Sets colors with a specific alpha yValue.
* Sets colors with a specific alpha value.
*
* @param colors
* @param alpha

4
MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseEntry.java
View file

@ -25,7 +25,7 @@ public abstract class BaseEntry {
}
/**
* Returns the y yValue of this Entry.
* Returns the y value of this Entry.
*
* @return
*/
@ -34,7 +34,7 @@ public abstract class BaseEntry {
}
/**
* Sets the y-yValue for the Entry.
* Sets the y-value for the Entry.
*
* @param y
*/

12
MPChartLib/src/main/java/com/github/mikephil/charting/data/BubbleEntry.java
View file

@ -4,7 +4,7 @@ package com.github.mikephil.charting.data;
import android.annotation.SuppressLint;
/**
* Subclass of Entry that holds a yValue for one entry in a BubbleChart. Bubble
* Subclass of Entry that holds a value for one entry in a BubbleChart. Bubble
* chart implementation: Copyright 2015 Pierre-Marc Airoldi Licensed under
* Apache License 2.0
*
@ -13,14 +13,14 @@ import android.annotation.SuppressLint;
@SuppressLint("ParcelCreator")
public class BubbleEntry extends Entry {
/** size yValue */
/** size value */
private float mSize = 0f;
/**
* Constructor.
*
* @param x The yValue on the x-axis.
* @param y The yValue on the y-axis.
* @param x The value on the x-axis.
* @param y The value on the y-axis.
* @param size The size of the bubble.
*/
public BubbleEntry(float x, float y, float size) {
@ -31,8 +31,8 @@ public class BubbleEntry extends Entry {
/**
* Constructor.
*
* @param x The yValue on the x-axis.
* @param y The yValue on the y-axis.
* @param x The value on the x-axis.
* @param y The value on the y-axis.
* @param size The size of the bubble.
* @param data Spot for additional data this Entry represents.
*/

34
MPChartLib/src/main/java/com/github/mikephil/charting/data/CandleEntry.java
View file

@ -11,26 +11,26 @@ import android.annotation.SuppressLint;
@SuppressLint("ParcelCreator")
public class CandleEntry extends Entry {
/** shadow-high yValue */
/** shadow-high value */
private float mShadowHigh = 0f;
/** shadow-low yValue */
/** shadow-low value */
private float mShadowLow = 0f;
/** close yValue */
/** close value */
private float mClose = 0f;
/** open yValue */
/** open value */
private float mOpen = 0f;
/**
* Constructor.
*
* @param x The yValue on the x-axis.
* @param shadowH The (shadow) high yValue.
* @param shadowL The (shadow) low yValue.
* @param open The open yValue.
* @param close The close yValue.
* @param x The value on the x-axis.
* @param shadowH The (shadow) high value.
* @param shadowL The (shadow) low value.
* @param open The open value.
* @param close The close value.
*/
public CandleEntry(float x, float shadowH, float shadowL, float open, float close) {
super(x, (shadowH + shadowL) / 2f);
@ -44,9 +44,9 @@ public class CandleEntry extends Entry {
/**
* Constructor.
*
* @param x The yValue on the x-axis.
* @param shadowH The (shadow) high yValue.
* @param shadowL The (shadow) low yValue.
* @param x The value on the x-axis.
* @param shadowH The (shadow) high value.
* @param shadowL The (shadow) low value.
* @param open
* @param close
* @param data Spot for additional data this Entry represents.
@ -81,7 +81,7 @@ public class CandleEntry extends Entry {
}
/**
* Returns the center yValue of the candle. (Middle yValue between high and
* Returns the center value of the candle. (Middle value between high and
* low)
*/
@Override
@ -98,7 +98,7 @@ public class CandleEntry extends Entry {
}
/**
* Returns the upper shadows highest yValue.
* Returns the upper shadows highest value.
*
* @return
*/
@ -111,7 +111,7 @@ public class CandleEntry extends Entry {
}
/**
* Returns the lower shadows lowest yValue.
* Returns the lower shadows lowest value.
*
* @return
*/
@ -124,7 +124,7 @@ public class CandleEntry extends Entry {
}
/**
* Returns the bodys close yValue.
* Returns the bodys close value.
*
* @return
*/
@ -137,7 +137,7 @@ public class CandleEntry extends Entry {
}
/**
* Returns the bodys open yValue.
* Returns the bodys open value.
*
* @return
*/

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

@ -23,22 +23,22 @@ import java.util.List;
public abstract class ChartData<T extends IDataSet<? extends Entry>> {
/**
* maximum y-yValue in the yValue array across all axes
* maximum y-value in the value array across all axes
*/
protected float mYMax = 0.0f;
/**
* the minimum y-yValue in the yValue array across all axes
* the minimum y-value in the value array across all axes
*/
protected float mYMin = 0.0f;
/**
* maximum x-yValue in the yValue array
* maximum x-value in the value array
*/
protected float mXMax = 0f;
/**
* minimum x-yValue in the yValue array
* minimum x-value in the value array
*/
protected float mXMin = 0f;
@ -87,7 +87,7 @@ public abstract class ChartData<T extends IDataSet<? extends Entry>> {
/**
* performs all kinds of initialization calculations, such as min-max and
* yValue count and sum
* value count and sum
*/
protected void init() {
@ -227,7 +227,7 @@ public abstract class ChartData<T extends IDataSet<? extends Entry>> {
}
/**
* Returns the smallest y-yValue the data object contains.
* Returns the smallest y-value the data object contains.
*
* @return
*/
@ -236,7 +236,7 @@ public abstract class ChartData<T extends IDataSet<? extends Entry>> {
}
/**
* Returns the minimum y-yValue for the specified axis.
* Returns the minimum y-value for the specified axis.
*
* @param axis
* @return
@ -249,7 +249,7 @@ public abstract class ChartData<T extends IDataSet<? extends Entry>> {
}
/**
* Returns the greatest y-yValue the data object contains.
* Returns the greatest y-value the data object contains.
*
* @return
*/
@ -258,7 +258,7 @@ public abstract class ChartData<T extends IDataSet<? extends Entry>> {
}
/**
* Returns the maximum y-yValue for the specified axis.
* Returns the maximum y-value for the specified axis.
*
* @param axis
* @return
@ -271,7 +271,7 @@ public abstract class ChartData<T extends IDataSet<? extends Entry>> {
}
/**
* Returns the minimum x-yValue this data object contains.
* Returns the minimum x-value this data object contains.
*
* @return
*/
@ -280,7 +280,7 @@ public abstract class ChartData<T extends IDataSet<? extends Entry>> {
}
/**
* Returns the maximum x-yValue this data object contains.
* Returns the maximum x-value this data object contains.
*
* @return
*/
@ -372,8 +372,8 @@ public abstract class ChartData<T extends IDataSet<? extends Entry>> {
// if (highlight.getDataSetIndex() >= mDataSets.size())
// return null;
// else {
// // The yValue of the highlighted entry could be NaN -
// // if we are not interested in highlighting a specific yValue.
// // The value of the highlighted entry could be NaN -
// // if we are not interested in highlighting a specific value.
//
// List<?> entries = mDataSets.get(highlight.getDataSetIndex())
// .getEntriesForXPos(highlight.getX());
@ -765,7 +765,7 @@ public abstract class ChartData<T extends IDataSet<? extends Entry>> {
}
/**
* Sets the color of the yValue-text (color in which the yValue-labels are
* Sets the color of the value-text (color in which the value-labels are
* drawn) for all DataSets this data object contains.
*
* @param color
@ -777,7 +777,7 @@ public abstract class ChartData<T extends IDataSet<? extends Entry>> {
}
/**
* Sets the same list of yValue-colors for all DataSets this
* Sets the same list of value-colors for all DataSets this
* data object contains.
*
* @param colors
@ -789,7 +789,7 @@ public abstract class ChartData<T extends IDataSet<? extends Entry>> {
}
/**
* Sets the Typeface for all yValue-labels for all DataSets this data object
* Sets the Typeface for all value-labels for all DataSets this data object
* contains.
*
* @param tf
@ -801,7 +801,7 @@ public abstract class ChartData<T extends IDataSet<? extends Entry>> {
}
/**
* Sets the size (in dp) of the yValue-text for all DataSets this data object
* Sets the size (in dp) of the value-text for all DataSets this data object
* contains.
*
* @param size
@ -813,7 +813,7 @@ public abstract class ChartData<T extends IDataSet<? extends Entry>> {
}
/**
* Enables / disables drawing values (yValue-text) for all DataSets this data
* Enables / disables drawing values (value-text) for all DataSets this data
* object contains.
*
* @param enabled

4
MPChartLib/src/main/java/com/github/mikephil/charting/data/CombinedData.java
View file

@ -131,8 +131,8 @@ public class CombinedData extends BarLineScatterCandleBubbleData<IBarLineScatter
if (highlight.getDataSetIndex() >= data.getDataSetCount())
return null;
else {
// The yValue of the highlighted entry could be NaN -
// if we are not interested in highlighting a specific yValue.
// The value of the highlighted entry could be NaN -
// if we are not interested in highlighting a specific value.
List<?> entries = data.getDataSetByIndex(highlight.getDataSetIndex())
.getEntriesForXPos(highlight.getX());

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

@ -20,22 +20,22 @@ public abstract class DataSet<T extends Entry> extends BaseDataSet<T> {
protected List<T> mValues = null;
/**
* maximum y-yValue in the yValue array
* maximum y-value in the value array
*/
protected float mYMax = 0.0f;
/**
* minimum y-yValue in the yValue array
* minimum y-value in the value array
*/
protected float mYMin = 0.0f;
/**
* maximum x-yValue in the yValue array
* maximum x-value in the value array
*/
protected float mXMax = 0.0f;
/**
* minimum x-yValue in the yValue array
* minimum x-value in the value array
*/
protected float mXMin = 0.0f;

18
MPChartLib/src/main/java/com/github/mikephil/charting/data/Entry.java
View file

@ -7,7 +7,7 @@ import android.os.Parcelable;
/**
* Class representing one entry in the chart. Might contain multiple values.
* Might only contain a single yValue depending on the used constructor.
* Might only contain a single value depending on the used constructor.
*
* @author Philipp Jahoda
*/
@ -23,8 +23,8 @@ public class Entry extends BaseEntry implements Parcelable {
/**
* A Entry represents one single entry in the chart.
*
* @param x the x yValue
* @param y the y yValue (the actual yValue of the entry)
* @param x the x value
* @param y the y value (the actual value of the entry)
*/
public Entry(float x, float y) {
super(y);
@ -34,8 +34,8 @@ public class Entry extends BaseEntry implements Parcelable {
/**
* A Entry represents one single entry in the chart.
*
* @param x the x yValue
* @param y the y yValue (the actual yValue of the entry)
* @param x the x value
* @param y the y value (the actual value of the entry)
* @param data Spot for additional data this Entry represents.
*/
public Entry(float x, float y, Object data) {
@ -44,7 +44,7 @@ public class Entry extends BaseEntry implements Parcelable {
}
/**
* Returns the x-yValue of this Entry object.
* Returns the x-value of this Entry object.
*
* @return
*/
@ -53,7 +53,7 @@ public class Entry extends BaseEntry implements Parcelable {
}
/**
* Sets the x-yValue of this Entry object.
* Sets the x-value of this Entry object.
*
* @param x
*/
@ -72,7 +72,7 @@ public class Entry extends BaseEntry implements Parcelable {
}
/**
* Compares yValue, xIndex and data of the entries. Returns true if entries
* Compares value, xIndex and data of the entries. Returns true if entries
* are equal in those points, false if not. Does not check by hash-code like
* it's done by the "equals" method.
*
@ -97,7 +97,7 @@ public class Entry extends BaseEntry implements Parcelable {
}
/**
* returns a string representation of the entry containing x-index and yValue
* returns a string representation of the entry containing x-index and value
*/
@Override
public String toString() {

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

@ -25,10 +25,10 @@ public class LineDataSet extends LineRadarDataSet<Entry> implements ILineDataSet
/** the color of the inner circles */
private int mCircleColorHole = Color.WHITE;
/** the radius of the circle-shaped yValue indicators */
/** the radius of the circle-shaped value indicators */
private float mCircleRadius = 8f;
/** the hole radius of the circle-shaped yValue indicators */
/** the hole radius of the circle-shaped value indicators */
private float mCircleHoleRadius = 4f;
/** sets the intensity of the cubic lines */
@ -155,7 +155,7 @@ public class LineDataSet extends LineRadarDataSet<Entry> implements ILineDataSet
}
/**
* sets the size (radius) of the circle shpaed yValue indicators,
* sets the size (radius) of the circle shpaed value indicators,
* default size = 4f
*
* This method is deprecated because of unclarity. Use setCircleRadius instead.

2
MPChartLib/src/main/java/com/github/mikephil/charting/data/LineRadarDataSet.java
View file

@ -84,7 +84,7 @@ public abstract class LineRadarDataSet<T extends Entry> extends LineScatterCandl
}
/**
* sets the alpha yValue (transparency) that is used for filling the line
* sets the alpha value (transparency) that is used for filling the line
* surface (0-255), default: 85
*
* @param alpha

2
MPChartLib/src/main/java/com/github/mikephil/charting/data/filter/Approximator.java
View file

@ -163,7 +163,7 @@ public class Approximator {
* epsilon (tolerance)
*
* @param entries
* @param epsilon as y-yValue
* @param epsilon as y-value
* @param start
* @param end
*/

8
MPChartLib/src/main/java/com/github/mikephil/charting/data/realm/base/RealmBaseDataSet.java
View file

@ -28,22 +28,22 @@ public abstract class RealmBaseDataSet<T extends RealmObject, S extends Entry> e
protected List<S> mValues;
/**
* maximum y-yValue in the y-yValue array
* maximum y-value in the y-value array
*/
protected float mYMax = 0.0f;
/**
* the minimum y-yValue in the y-yValue array
* the minimum y-value in the y-value array
*/
protected float mYMin = 0.0f;
/**
* maximum x-yValue in the yValue array
* maximum x-value in the value array
*/
protected float mXMax = 0.0f;
/**
* minimum x-yValue in the yValue array
* minimum x-value in the value array
*/
protected float mXMin = 0.0f;

2
MPChartLib/src/main/java/com/github/mikephil/charting/data/realm/base/RealmLineRadarDataSet.java
View file

@ -82,7 +82,7 @@ public abstract class RealmLineRadarDataSet<T extends RealmObject> extends Realm
}
/**
* sets the alpha yValue (transparency) that is used for filling the line
* sets the alpha value (transparency) that is used for filling the line
* surface (0-255), default: 85
*
* @param alpha

8
MPChartLib/src/main/java/com/github/mikephil/charting/data/realm/implementation/RealmBarDataSet.java
View file

@ -21,7 +21,7 @@ public class RealmBarDataSet<T extends RealmObject> extends RealmBarLineScatterC
private String mStackValueFieldName;
/**
* the maximum number of bars that are stacked upon each other, this yValue
* the maximum number of bars that are stacked upon each other, this value
* is calculated from the Entries that are added to the DataSet
*/
private int mStackSize = 1;
@ -36,7 +36,7 @@ public class RealmBarDataSet<T extends RealmObject> extends RealmBarLineScatterC
private int mBarBorderColor = Color.BLACK;
/**
* the alpha yValue used to draw the highlight indicator bar
* the alpha value used to draw the highlight indicator bar
*/
private int mHighLightAlpha = 120;
@ -181,7 +181,7 @@ public class RealmBarDataSet<T extends RealmObject> extends RealmBarLineScatterC
/**
* Sets the color used for drawing the bar-shadows. The bar shadows is a
* surface behind the bar that indicates the maximum yValue. Don't for get to
* surface behind the bar that indicates the maximum value. Don't for get to
* use getResources().getColor(...) to set this. Or Color.rgb(...).
*
* @param color
@ -236,7 +236,7 @@ public class RealmBarDataSet<T extends RealmObject> extends RealmBarLineScatterC
}
/**
* Set the alpha yValue (transparency) that is used for drawing the highlight
* Set the alpha value (transparency) that is used for drawing the highlight
* indicator bar. min = 0 (fully transparent), max = 255 (fully opaque)
*
* @param alpha

4
MPChartLib/src/main/java/com/github/mikephil/charting/data/realm/implementation/RealmBubbleDataSet.java
View file

@ -25,7 +25,7 @@ public class RealmBubbleDataSet<T extends RealmObject> extends RealmBarLineScatt
* Constructor for creating a CandleDataSet with realm data.
*
* @param result the queried results from the realm database
* @param yValuesField the name of the field in your data object that represents the y-yValue
* @param yValuesField the name of the field in your data object that represents the y-value
* @param sizeField the name of the field in your data object that represents the bubble size
*/
public RealmBubbleDataSet(RealmResults<T> result, String yValuesField, String sizeField) {
@ -40,7 +40,7 @@ public class RealmBubbleDataSet<T extends RealmObject> extends RealmBarLineScatt
* Constructor for creating a CandleDataSet with realm data.
*
* @param result the queried results from the realm database
* @param yValuesField the name of the field in your data object that represents the y-yValue
* @param yValuesField the name of the field in your data object that represents the y-value
* @param xIndexField the name of the field in your data object that represents the x-index
* @param sizeField the name of the field in your data object that represents the bubble size
*/

8
MPChartLib/src/main/java/com/github/mikephil/charting/data/realm/implementation/RealmLineDataSet.java
View file

@ -37,11 +37,11 @@ public class RealmLineDataSet<T extends RealmObject> extends RealmLineRadarDataS
private int mCircleColorHole = Color.WHITE;
/**
* the radius of the circle-shaped yValue indicators
* the radius of the circle-shaped value indicators
*/
private float mCircleRadius = 8f;
/** the hole radius of the circle-shaped yValue indicators */
/** the hole radius of the circle-shaped value indicators */
private float mCircleHoleRadius = 4f;
/**
@ -70,7 +70,7 @@ public class RealmLineDataSet<T extends RealmObject> extends RealmLineRadarDataS
* Constructor for creating a LineDataSet with realm data.
*
* @param result the queried results from the realm database
* @param yValuesField the name of the field in your data object that represents the y-yValue
* @param yValuesField the name of the field in your data object that represents the y-value
*/
public RealmLineDataSet(RealmResults<T> result, String yValuesField) {
super(result, yValuesField);
@ -142,7 +142,7 @@ public class RealmLineDataSet<T extends RealmObject> extends RealmLineRadarDataS
}
/**
* sets the size (radius) of the circle shpaed yValue indicators, default
* sets the size (radius) of the circle shpaed value indicators, default
* size = 4f
*
* @param size

2
MPChartLib/src/main/java/com/github/mikephil/charting/data/realm/implementation/RealmPieDataSet.java
View file

@ -42,7 +42,7 @@ public class RealmPieDataSet<T extends RealmObject> extends RealmBaseDataSet<T,
* Constructor for creating a PieDataSet with realm data.
*
* @param result the queried results from the realm database
* @param yValuesField the name of the field in your data object that represents the y-yValue
* @param yValuesField the name of the field in your data object that represents the y-value
*/
public RealmPieDataSet(RealmResults<T> result, String yValuesField) {
super(result, yValuesField);

2
MPChartLib/src/main/java/com/github/mikephil/charting/data/realm/implementation/RealmRadarDataSet.java
View file

@ -32,7 +32,7 @@ public class RealmRadarDataSet<T extends RealmObject> extends RealmLineRadarData
* Constructor for creating a RadarDataSet with realm data.
*
* @param result the queried results from the realm database
* @param yValuesField the name of the field in your data object that represents the y-yValue
* @param yValuesField the name of the field in your data object that represents the y-value
*/
public RealmRadarDataSet(RealmResults<T> result, String yValuesField) {
super(result, yValuesField);

2
MPChartLib/src/main/java/com/github/mikephil/charting/data/realm/implementation/RealmScatterDataSet.java
View file

@ -44,7 +44,7 @@ public class RealmScatterDataSet<T extends RealmObject> extends RealmLineScatter
* Constructor for creating a ScatterDataSet with realm data.
*
* @param result the queried results from the realm database
* @param yValuesField the name of the field in your data object that represents the y-yValue
* @param yValuesField the name of the field in your data object that represents the y-value
*/
public RealmScatterDataSet(RealmResults<T> result, String yValuesField) {
super(result, yValuesField);

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

@ -20,7 +20,7 @@ public class DefaultAxisValueFormatter implements AxisValueFormatter {
protected int digits = 0;
/**
* Constructor that specifies to how many digits the yValue should be
* Constructor that specifies to how many digits the value should be
* formatted.
*
* @param digits

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

@ -8,7 +8,7 @@ import java.text.DecimalFormat;
/**
* Default formatter used for formatting values inside the chart. Uses a DecimalFormat with
* pre-calculated number of digits (depending on max and min yValue).
* pre-calculated number of digits (depending on max and min value).
*
* @author Philipp Jahoda
*/
@ -18,7 +18,7 @@ public class DefaultValueFormatter implements ValueFormatter {
protected DecimalFormat mFormat;
/**
* Constructor that specifies to how many digits the yValue should be
* Constructor that specifies to how many digits the value should be
* formatted.
*
* @param digits

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

@ -8,7 +8,7 @@ import com.github.mikephil.charting.utils.ViewPortHandler;
import java.text.DecimalFormat;
/**
* Predefined yValue-formatter that formats large numbers in a pretty way.
* Predefined value-formatter that formats large numbers in a pretty way.
* Outputs: 856 = 856; 1000 = 1k; 5821 = 5.8k; 10500 = 10k; 101800 = 102k;
* 2000000 = 2m; 7800000 = 7.8m; 92150000 = 92m; 123200000 = 123m; 9999999 =
* 10m; 1000000000 = 1b; Special thanks to Roman Gromov
@ -53,7 +53,7 @@ public class LargeValueFormatter implements ValueFormatter, AxisValueFormatter {
}
/**
* Set an appendix text to be added at the end of the formatted yValue.
* Set an appendix text to be added at the end of the formatted value.
*
* @param appendix
*/

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

@ -9,7 +9,7 @@ import java.text.DecimalFormat;
/**
* This ValueFormatter is just for convenience and simply puts a "%" sign after
* each yValue. (Recommeded for PieChart)
* each value. (Recommeded for PieChart)
*
* @author Philipp Jahoda
*/

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

@ -10,7 +10,7 @@ import java.text.DecimalFormat;
* Created by Philipp Jahoda on 28/01/16.
* <p/>
* A formatter specifically for stacked BarChart that allows to specify whether the all stack values
* or just the top yValue should be drawn.
* or just the top value should be drawn.
*/
public class StackedValueFormatter implements ValueFormatter {
@ -20,7 +20,7 @@ public class StackedValueFormatter implements ValueFormatter {
private boolean mDrawWholeStack;
/**
* a string that should be appended behind the yValue
* a string that should be appended behind the value
*/
private String mAppendix;
@ -30,7 +30,7 @@ public class StackedValueFormatter implements ValueFormatter {
* Constructor.
*
* @param drawWholeStack if true, all stack values of the stacked bar entry are drawn, else only top
* @param appendix a string that should be appended behind the yValue
* @param appendix a string that should be appended behind the value
* @param decimals the number of decimal digits to use
*/
public StackedValueFormatter(boolean drawWholeStack, String appendix, int decimals) {
@ -68,7 +68,7 @@ public class StackedValueFormatter implements ValueFormatter {
}
}
// return the "proposed" yValue
// return the "proposed" value
return mFormat.format(value) + mAppendix;
}
}

6
MPChartLib/src/main/java/com/github/mikephil/charting/formatter/ValueFormatter.java
View file

@ -14,12 +14,12 @@ import com.github.mikephil.charting.utils.ViewPortHandler;
public interface ValueFormatter {
/**
* Called when a yValue (from labels inside the chart) is formatted
* Called when a value (from labels inside the chart) is formatted
* before being drawn. For performance reasons, avoid excessive calculations
* and memory allocations inside this method.
*
* @param value the yValue to be formatted
* @param entry the entry the yValue belongs to - in e.g. BarChart, this is of class BarEntry
* @param value the value to be formatted
* @param entry the entry the value belongs to - in e.g. BarChart, this is of class BarEntry
* @param dataSetIndex the index of the DataSet the entry in focus belongs to
* @param viewPortHandler provides information about the current chart state (scale, translation, ...)
* @return the formatted label ready for being drawn

4
MPChartLib/src/main/java/com/github/mikephil/charting/highlight/BarHighlighter.java
View file

@ -51,7 +51,7 @@ public class BarHighlighter extends ChartHighlighter<BarDataProvider> {
}
/**
* This method creates the Highlight object that also indicates which yValue of a stacked BarEntry has been
* This method creates the Highlight object that also indicates which value of a stacked BarEntry has been
* selected.
*
* @param selectionDetail the selection detail to work with looking for stacked values
@ -97,7 +97,7 @@ public class BarHighlighter extends ChartHighlighter<BarDataProvider> {
}
/**
* Returns the index of the closest yValue inside the values array / ranges (stacked barchart) to the yValue
* Returns the index of the closest value inside the values array / ranges (stacked barchart) to the value
* given as
* a parameter.
*

4
MPChartLib/src/main/java/com/github/mikephil/charting/highlight/ChartHighlighter.java
View file

@ -55,7 +55,7 @@ public class ChartHighlighter<T extends BarLineScatterCandleBubbleDataProvider>
*/
protected PointD getValsForTouch(float x, float y) {
// take any transformer to determine the x-axis yValue
// take any transformer to determine the x-axis value
PointD pos = mChart.getTransformer(YAxis.AxisDependency.LEFT).getValuesByTouchPoint(x, y);
return pos;
}
@ -154,7 +154,7 @@ public class ChartHighlighter<T extends BarLineScatterCandleBubbleDataProvider>
}
/**
* Returns the SelectionDetail of the DataSet that contains the closest yValue on the
* Returns the SelectionDetail of the DataSet that contains the closest value on the
* y-axis.
*
* @param valsAtIndex all the values at a specific index

52
MPChartLib/src/main/java/com/github/mikephil/charting/highlight/Highlight.java
View file

@ -2,25 +2,25 @@
package com.github.mikephil.charting.highlight;
/**
* Contains information needed to determine the highlighted yValue.
* Contains information needed to determine the highlighted value.
*
* @author Philipp Jahoda
*/
public class Highlight {
/** the x-yValue of the highlighted yValue */
/** the x-value of the highlighted value */
private float mX = Float.NaN;
/** the y-yValue of the highlighted yValue */
/** the y-value of the highlighted value */
private float mY = Float.NaN;
/** the index of the data object - in case it refers to more than one */
private int mDataIndex;
/** the index of the dataset the highlighted yValue is in */
/** the index of the dataset the highlighted value is in */
private int mDataSetIndex;
/** index which yValue of a stacked bar entry is highlighted, default -1 */
/** index which value of a stacked bar entry is highlighted, default -1 */
private int mStackIndex = -1;
/** the range of the bar that is selected (only for stacked-barchart) */
@ -29,10 +29,10 @@ public class Highlight {
/**
* constructor
*
* @param x the x-yValue of the highlighted yValue
* @param y the y-yValue of the highlighted yValue
* @param dataIndex the index of the Data the highlighted yValue belongs to
* @param dataSetIndex the index of the DataSet the highlighted yValue belongs to
* @param x the x-value of the highlighted value
* @param y the y-value of the highlighted value
* @param dataIndex the index of the Data the highlighted value belongs to
* @param dataSetIndex the index of the DataSet the highlighted value belongs to
*/
public Highlight(float x, float y, int dataIndex, int dataSetIndex) {
this.mX = x;
@ -43,11 +43,11 @@ public class Highlight {
/**
* Constructor, only used for stacked-barchart.
*
* @param x the x-yValue of the highlighted yValue on the x-axis
* @param y the y-yValue of the highlighted yValue
* @param dataIndex the index of the Data the highlighted yValue belongs to
* @param dataSetIndex the index of the DataSet the highlighted yValue belongs to
* @param stackIndex references which yValue of a stacked-bar entry has been
* @param x the x-value of the highlighted value on the x-axis
* @param y the y-value of the highlighted value
* @param dataIndex the index of the Data the highlighted value belongs to
* @param dataSetIndex the index of the DataSet the highlighted value belongs to
* @param stackIndex references which value of a stacked-bar entry has been
* selected
*/
public Highlight(float x, float y, int dataIndex, int dataSetIndex, int stackIndex) {
@ -58,13 +58,13 @@ public class Highlight {
/**
* Constructor, only used for stacked-barchart.
*
* @param x the index of the highlighted yValue on the x-axis
* @param y the y-yValue of the highlighted yValue
* @param dataIndex the index of the Data the highlighted yValue belongs to
* @param dataSetIndex the index of the DataSet the highlighted yValue belongs to
* @param stackIndex references which yValue of a stacked-bar entry has been
* @param x the index of the highlighted value on the x-axis
* @param y the y-value of the highlighted value
* @param dataIndex the index of the Data the highlighted value belongs to
* @param dataSetIndex the index of the DataSet the highlighted value belongs to
* @param stackIndex references which value of a stacked-bar entry has been
* selected
* @param range the range the selected stack-yValue is in
* @param range the range the selected stack-value is in
*/
public Highlight(float x, float y, int dataIndex, int dataSetIndex, int stackIndex, Range range) {
this(x, y, dataIndex, dataSetIndex, stackIndex);
@ -75,14 +75,14 @@ public class Highlight {
* Constructor, only used for stacked-barchart.
*
* @param x the x-value of the highlighted value on the x-axis
* @param dataSetIndex the index of the DataSet the highlighted yValue belongs to
* @param dataSetIndex the index of the DataSet the highlighted value belongs to
*/
public Highlight(float x, int dataSetIndex) {
this(x, Float.NaN, 0, dataSetIndex, -1);
}
/**
* returns the x-yValue of the highlighted yValue
* returns the x-value of the highlighted value
*
* @return
*/
@ -91,7 +91,7 @@ public class Highlight {
}
/**
* returns the y-yValue of the highlighted yValue
* returns the y-value of the highlighted value
*
* @return
*/
@ -109,7 +109,7 @@ public class Highlight {
}
/**
* returns the index of the DataSet the highlighted yValue is in
* returns the index of the DataSet the highlighted value is in
*
* @return
*/
@ -119,7 +119,7 @@ public class Highlight {
/**
* Only needed if a stacked-barchart entry was highlighted. References the
* selected yValue within the stacked-entry.
* selected value within the stacked-entry.
*
* @return
*/
@ -128,7 +128,7 @@ public class Highlight {
}
/**
* Returns the range of values the selected yValue of a stacked bar is in. (this is only relevant for stacked-barchart)
* Returns the range of values the selected value of a stacked bar is in. (this is only relevant for stacked-barchart)
* @return
*/
public Range getRange() {

4
MPChartLib/src/main/java/com/github/mikephil/charting/highlight/Range.java
View file

@ -1,7 +1,7 @@
package com.github.mikephil.charting.highlight;
/**
* Created by Philipp Jahoda on 24/07/15. Class that represents the range of one yValue in a stacked bar entry. e.g.
* Created by Philipp Jahoda on 24/07/15. Class that represents the range of one value in a stacked bar entry. e.g.
* stack values are -10, 5, 20 -> then ranges are (-10 - 0, 0 - 5, 5 - 25).
*/
public final class Range {
@ -15,7 +15,7 @@ public final class Range {
}
/**
* Returns true if this range contains (if the yValue is in between) the given yValue, false if not.
* Returns true if this range contains (if the value is in between) the given value, false if not.
*
* @param value
* @return

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

@ -24,7 +24,7 @@ public interface IBarDataSet extends IBarLineScatterCandleBubbleDataSet<BarEntry
/**
* Returns the color used for drawing the bar-shadows. The bar shadows is a
* surface behind the bar that indicates the maximum yValue.
* surface behind the bar that indicates the maximum value.
*
* @return
*/
@ -46,7 +46,7 @@ public interface IBarDataSet extends IBarLineScatterCandleBubbleDataSet<BarEntry
int getBarBorderColor();
/**
* Returns the alpha yValue (transparency) that is used for drawing the
* Returns the alpha value (transparency) that is used for drawing the
* highlight indicator.
*
* @return
@ -55,7 +55,7 @@ public interface IBarDataSet extends IBarLineScatterCandleBubbleDataSet<BarEntry
/**
* Returns the labels used for the different yValue-stacks in the legend.
* Returns the labels used for the different value-stacks in the legend.
* This is only relevant for stacked bar entries.
*
* @return

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

@ -17,28 +17,28 @@ public interface IDataSet<T extends Entry> {
/** ###### ###### DATA RELATED METHODS ###### ###### */
/**
* returns the minimum y-yValue this DataSet holds
* returns the minimum y-value this DataSet holds
*
* @return
*/
float getYMin();
/**
* returns the maximum y-yValue this DataSet holds
* returns the maximum y-value this DataSet holds
*
* @return
*/
float getYMax();
/**
* returns the minimum x-yValue this DataSet holds
* returns the minimum x-value this DataSet holds
*
* @return
*/
float getXMin();
/**
* returns the maximum x-yValue this DataSet holds
* returns the maximum x-value this DataSet holds
*
* @return
*/
@ -124,8 +124,8 @@ public interface IDataSet<T extends Entry> {
int getEntryIndex(T e);
/**
* Returns the yValue of the Entry object at the given xVal. Returns
* Float.NaN if no yValue is at the given xVal. INFORMATION: This method
* Returns the value of the Entry object at the given xVal. Returns
* Float.NaN if no value is at the given xVal. INFORMATION: This method
* does calculations at runtime. Do not over-use in performance critical
* situations.
*
@ -136,7 +136,7 @@ public interface IDataSet<T extends Entry> {
/**
* Returns all of the y values of the Entry objects at the given xPos. Returns
* Float.NaN if no yValue is at the given xPos. INFORMATION: This method
* Float.NaN if no value is at the given xPos. INFORMATION: This method
* does calculations at runtime. Do not over-use in performance critical
* situations.
*
@ -160,7 +160,7 @@ public interface IDataSet<T extends Entry> {
* Adds an Entry to the DataSet dynamically.
* Entries are added to the end of the list.
* This will also recalculate the current minimum and maximum
* values of the DataSet and the yValue-sum.
* values of the DataSet and the value-sum.
*
* @param e
*/
@ -169,7 +169,7 @@ public interface IDataSet<T extends Entry> {
/**
* Removes an Entry from the DataSets entries array. This will also
* recalculate the current minimum and maximum values of the DataSet and the
* yValue-sum. Returns true if an Entry was removed, false if no Entry could
* value-sum. Returns true if an Entry was removed, false if no Entry could
* be removed.
*
* @param e
@ -180,7 +180,7 @@ public interface IDataSet<T extends Entry> {
* Adds an Entry to the DataSet dynamically.
* Entries are added to their appropriate index respective to it's x-index.
* This will also recalculate the current minimum and maximum
* values of the DataSet and the yValue-sum.
* values of the DataSet and the value-sum.
*
* @param e
*/
@ -289,7 +289,7 @@ public interface IDataSet<T extends Entry> {
boolean isHighlightEnabled();
/**
* If set to true, yValue highlighting is enabled which means that values can
* If set to true, value highlighting is enabled which means that values can
* be highlighted programmatically or by touch gesture.
*
* @param enabled
@ -315,7 +315,7 @@ public interface IDataSet<T extends Entry> {
ValueFormatter getValueFormatter();
/**
* Sets the color the yValue-labels of this DataSet should have.
* Sets the color the value-labels of this DataSet should have.
*
* @param color
*/
@ -329,14 +329,14 @@ public interface IDataSet<T extends Entry> {
void setValueTextColors(List<Integer> colors);
/**
* Sets a Typeface for the yValue-labels of this DataSet.
* Sets a Typeface for the value-labels of this DataSet.
*
* @param tf
*/
void setValueTypeface(Typeface tf);
/**
* Sets the text-size of the yValue-labels of this DataSet in dp.
* Sets the text-size of the value-labels of this DataSet in dp.
*
* @param size
*/
@ -382,7 +382,7 @@ public interface IDataSet<T extends Entry> {
void setDrawValues(boolean enabled);
/**
* Returns true if y-yValue drawing is enabled, false if not
* Returns true if y-value drawing is enabled, false if not
*
* @return
*/

2
MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineRadarDataSet.java
View file

@ -24,7 +24,7 @@ public interface ILineRadarDataSet<T extends Entry> extends ILineScatterCandleRa
Drawable getFillDrawable();
/**
* Returns the alpha yValue that is used for filling the line surface,
* Returns the alpha value that is used for filling the line surface,
* default: 85
*
* @return

2
MPChartLib/src/main/java/com/github/mikephil/charting/listener/ChartTouchListener.java
View file

@ -83,7 +83,7 @@ public abstract class ChartTouchListener<T extends Chart<?>> extends GestureDete
}
/**
* Sets the last yValue that was highlighted via touch.
* Sets the last value that was highlighted via touch.
*
* @param high
*/

2
MPChartLib/src/main/java/com/github/mikephil/charting/listener/OnChartValueSelectedListener.java
View file

@ -12,7 +12,7 @@ import com.github.mikephil.charting.highlight.Highlight;
public interface OnChartValueSelectedListener {
/**
* Called when a yValue has been selected inside the chart.
* Called when a value has been selected inside the chart.
*
* @param e The selected Entry.
* @param dataSetIndex The index in the datasets array of the data object

8
MPChartLib/src/main/java/com/github/mikephil/charting/renderer/AxisRenderer.java
View file

@ -112,8 +112,8 @@ public abstract class AxisRenderer extends Renderer {
/**
* Computes the axis values.
*
* @param min - the minimum yValue in the data object for this axis
* @param max - the maximum yValue in the data object for this axis
* @param min - the minimum value in the data object for this axis
* @param max - the maximum value in the data object for this axis
*/
public void computeAxis(float min, float max, boolean inverted) {
@ -157,7 +157,7 @@ public abstract class AxisRenderer extends Renderer {
return;
}
// Find out how much spacing (in y yValue space) between axis values
// Find out how much spacing (in y value space) between axis values
double rawInterval = range / labelCount;
double interval = Utils.roundToNextSignificant(rawInterval);
@ -226,7 +226,7 @@ public abstract class AxisRenderer extends Renderer {
for (f = first, i = 0; i < n; f += interval, ++i) {
if (f == 0.0) // Fix for negative zero case (Where yValue == -0.0, and 0.0 == -0.0)
if (f == 0.0) // Fix for negative zero case (Where value == -0.0, and 0.0 == -0.0)
f = 0.0;
mAxis.mEntries[i] = (float) f;

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

@ -135,7 +135,7 @@ public class BarChartRenderer extends DataRenderer {
if (!mViewPortHandler.isInBoundsRight(buffer.buffer[j]))
break;
// Set the color for the currently drawn yValue. If the index
// Set the color for the currently drawn value. If the index
// is out of bounds, reuse colors.
mRenderPaint.setColor(dataSet.getColor(j / 4));
c.drawRect(buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
@ -207,7 +207,7 @@ public class BarChartRenderer extends DataRenderer {
boolean isInverted = mChart.isInverted(dataSet.getAxisDependency());
// calculate the correct offset depending on the draw position of
// the yValue
// the value
float valueTextHeight = Utils.calcTextHeight(mValuePaint, "8");
posOffset = (drawValueAboveBar ? -valueOffsetPlus : valueTextHeight + valueOffsetPlus);
negOffset = (drawValueAboveBar ? valueTextHeight + valueOffsetPlus : -valueOffsetPlus);

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

@ -67,7 +67,7 @@ public abstract class DataRenderer extends Renderer {
/**
* Returns the Paint object this renderer uses for drawing the values
* (yValue-text).
* (value-text).
*
* @return
*/
@ -95,7 +95,7 @@ public abstract class DataRenderer extends Renderer {
}
/**
* Applies the required styling (provided by the DataSet) to the yValue-paint
* Applies the required styling (provided by the DataSet) to the value-paint
* object.
*
* @param set
@ -128,12 +128,12 @@ public abstract class DataRenderer extends Renderer {
public abstract void drawValues(Canvas c);
/**
* Draws the yValue of the given entry by using the provided ValueFormatter.
* Draws the value of the given entry by using the provided ValueFormatter.
*
* @param c canvas
* @param formatter formatter for custom yValue-formatting
* @param value the yValue to be drawn
* @param entry the entry the yValue belongs to
* @param formatter formatter for custom value-formatting
* @param value the value to be drawn
* @param entry the entry the value belongs to
* @param dataSetIndex the index of the DataSet the drawn Entry belongs to
* @param x position
* @param y position

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

@ -85,7 +85,7 @@ public class HorizontalBarChartRenderer extends BarChartRenderer {
buffer.buffer[j + 3], mShadowPaint);
}
// Set the color for the currently drawn yValue. If the index
// Set the color for the currently drawn value. If the index
// is out of bounds, reuse colors.
mRenderPaint.setColor(dataSet.getColor(j / 4));
c.drawRect(buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
@ -148,7 +148,7 @@ public class HorizontalBarChartRenderer extends BarChartRenderer {
float val = e.getY();
String formattedValue = formatter.getFormattedValue(val, e, i, mViewPortHandler);
// calculate the correct offset depending on the draw position of the yValue
// calculate the correct offset depending on the draw position of the value
float valueTextWidth = Utils.calcTextWidth(mValuePaint, formattedValue);
posOffset = (drawValueAboveBar ? valueOffsetPlus : -(valueTextWidth + valueOffsetPlus));
negOffset = (drawValueAboveBar ? -(valueTextWidth + valueOffsetPlus) : valueOffsetPlus);
@ -162,7 +162,7 @@ public class HorizontalBarChartRenderer extends BarChartRenderer {
y + halfTextHeight, dataSet.getValueTextColor(j / 2));
}
// if each yValue of a potential stack should be drawn
// if each value of a potential stack should be drawn
} else {
Transformer trans = mChart.getTransformer(dataSet.getAxisDependency());
@ -194,7 +194,7 @@ public class HorizontalBarChartRenderer extends BarChartRenderer {
float val = e.getY();
String formattedValue = formatter.getFormattedValue(val, e, i, mViewPortHandler);
// calculate the correct offset depending on the draw position of the yValue
// calculate the correct offset depending on the draw position of the value
float valueTextWidth = Utils.calcTextWidth(mValuePaint, formattedValue);
posOffset = (drawValueAboveBar ? valueOffsetPlus : -(valueTextWidth + valueOffsetPlus));
negOffset = (drawValueAboveBar ? -(valueTextWidth + valueOffsetPlus) : valueOffsetPlus);
@ -238,7 +238,7 @@ public class HorizontalBarChartRenderer extends BarChartRenderer {
float val = vals[k / 2];
String formattedValue = formatter.getFormattedValue(val, e, i, mViewPortHandler);
// calculate the correct offset depending on the draw position of the yValue
// calculate the correct offset depending on the draw position of the value
float valueTextWidth = Utils.calcTextWidth(mValuePaint, formattedValue);
posOffset = (drawValueAboveBar ? valueOffsetPlus : -(valueTextWidth + valueOffsetPlus));
negOffset = (drawValueAboveBar ? -(valueTextWidth + valueOffsetPlus) : valueOffsetPlus);

2
MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.java
View file

@ -29,7 +29,7 @@ public class LineChartRenderer extends LineRadarRenderer {
protected LineDataProvider mChart;
/**
* paint for the inner circle of the yValue indicators
* paint for the inner circle of the value indicators
*/
protected Paint mCirclePaintInner;

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

@ -199,7 +199,7 @@ public class PieChartRenderer extends DataRenderer {
int visibleAngleCount = 0;
for (int j = 0; j < entryCount; j++) {
// draw only if the yValue is greater than zero
// draw only if the value is greater than zero
if ((Math.abs(dataSet.getEntryForIndex(j).getY()) > 0.000001)) {
visibleAngleCount++;
}
@ -214,7 +214,7 @@ public class PieChartRenderer extends DataRenderer {
Entry e = dataSet.getEntryForIndex(j);
// draw only if the yValue is greater than zero
// draw only if the value is greater than zero
if ((Math.abs(e.getY()) > 0.000001)) {
if (!mChart.needsHighlight((int) e.getX(),
@ -712,7 +712,7 @@ public class PieChartRenderer extends DataRenderer {
final int entryCount = set.getEntryCount();
int visibleAngleCount = 0;
for (int j = 0; j < entryCount; j++) {
// draw only if the yValue is greater than zero
// draw only if the value is greater than zero
if ((Math.abs(set.getEntryForIndex(j).getY()) > 0.000001)) {
visibleAngleCount++;
}
@ -897,7 +897,7 @@ public class PieChartRenderer extends DataRenderer {
Entry e = dataSet.getEntryForIndex(j);
// draw only if the yValue is greater than zero
// draw only if the value is greater than zero
if ((Math.abs(e.getY()) > 0.000001)) {
float x = (float) ((r - circleRadius)

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

@ -83,7 +83,7 @@ public class RadarChartRenderer extends LineRadarRenderer {
float sliceangle = mChart.getSliceAngle();
// calculate the factor that is needed for transforming the yValue to
// calculate the factor that is needed for transforming the value to
// pixels
float factor = mChart.getFactor();
@ -157,7 +157,7 @@ public class RadarChartRenderer extends LineRadarRenderer {
float sliceangle = mChart.getSliceAngle();
// calculate the factor that is needed for transforming the yValue to
// calculate the factor that is needed for transforming the value to
// pixels
float factor = mChart.getFactor();
@ -198,7 +198,7 @@ public class RadarChartRenderer extends LineRadarRenderer {
float sliceangle = mChart.getSliceAngle();
// calculate the factor that is needed for transforming the yValue to
// calculate the factor that is needed for transforming the value to
// pixels
float factor = mChart.getFactor();
float rotationangle = mChart.getRotationAngle();

2
MPChartLib/src/main/java/com/github/mikephil/charting/renderer/Renderer.java
View file

@ -21,7 +21,7 @@ public abstract class Renderer {
}
/**
* Returns true if the specified yValue fits in between the provided min
* Returns true if the specified value fits in between the provided min
* and max bounds, false if not.
*
* @param val

2
MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRenderer.java
View file

@ -309,7 +309,7 @@ public class XAxisRenderer extends AxisRenderer {
public void renderLimitLineLabel(Canvas c, LimitLine limitLine, float[] position, float yOffset) {
String label = limitLine.getLabel();
// if drawing the limit-yValue label is enabled
// if drawing the limit-value label is enabled
if (label != null && !label.equals("")) {
mLimitLinePaint.setStyle(limitLine.getTextStyle());

2
MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererHorizontalBarChart.java
View file

@ -249,7 +249,7 @@ public class XAxisRendererHorizontalBarChart extends XAxisRenderer {
String label = l.getLabel();
// if drawing the limit-yValue label is enabled
// if drawing the limit-value label is enabled
if (label != null && !label.equals("")) {
mLimitLinePaint.setStyle(l.getTextStyle());

2
MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererRadarChart.java
View file

@ -34,7 +34,7 @@ public class XAxisRendererRadarChart extends XAxisRenderer {
float sliceangle = mChart.getSliceAngle();
// calculate the factor that is needed for transforming the yValue to
// calculate the factor that is needed for transforming the value to
// pixels
float factor = mChart.getFactor();

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

@ -55,7 +55,7 @@ public class YAxisRenderer extends AxisRenderer {
// return;
// }
//
// // Find out how much spacing (in y yValue space) between axis values
// // Find out how much spacing (in y value space) between axis values
// double rawInterval = range / labelCount;
// double interval = Utils.roundToNextSignificant(rawInterval);
//
@ -125,7 +125,7 @@ public class YAxisRenderer extends AxisRenderer {
//
// for (f = first, i = 0; i < n; f += interval, ++i) {
//
// if (f == 0.0) // Fix for negative zero case (Where yValue == -0.0, and 0.0 == -0.0)
// if (f == 0.0) // Fix for negative zero case (Where value == -0.0, and 0.0 == -0.0)
// f = 0.0;
//
// mYAxis.mEntries[i] = (float) f;
@ -352,7 +352,7 @@ public class YAxisRenderer extends AxisRenderer {
String label = l.getLabel();
// if drawing the limit-yValue label is enabled
// if drawing the limit-value label is enabled
if (label != null && !label.equals("")) {
mLimitLinePaint.setStyle(l.getTextStyle());

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

@ -30,8 +30,8 @@ public class YAxisRendererHorizontalBarChart extends YAxisRenderer {
/**
* Computes the axis values.
*
* @param yMin - the minimum y-yValue in the data object for this axis
* @param yMax - the maximum y-yValue in the data object for this axis
* @param yMin - the minimum y-value in the data object for this axis
* @param yMax - the maximum y-value in the data object for this axis
*/
@Override
public void computeAxis(float yMin, float yMax, boolean inverted) {
@ -231,7 +231,7 @@ public class YAxisRendererHorizontalBarChart extends YAxisRenderer {
String label = l.getLabel();
// if drawing the limit-yValue label is enabled
// if drawing the limit-value label is enabled
if (label != null && !label.equals("")) {
mLimitLinePaint.setStyle(l.getTextStyle());

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

@ -37,7 +37,7 @@ public class YAxisRendererRadarChart extends YAxisRenderer {
return;
}
// Find out how much spacing (in y yValue space) between axis values
// Find out how much spacing (in y value space) between axis values
double rawInterval = range / labelCount;
double interval = Utils.roundToNextSignificant(rawInterval);
@ -108,7 +108,7 @@ public class YAxisRendererRadarChart extends YAxisRenderer {
for (f = first, i = 0; i < n; f += interval, ++i) {
if (f == 0.0) // Fix for negative zero case (Where yValue == -0.0, and 0.0 == -0.0)
if (f == 0.0) // Fix for negative zero case (Where value == -0.0, and 0.0 == -0.0)
f = 0.0;
mAxis.mEntries[i] = (float) f;
@ -180,7 +180,7 @@ public class YAxisRendererRadarChart extends YAxisRenderer {
float sliceangle = mChart.getSliceAngle();
// calculate the factor that is needed for transforming the yValue to
// calculate the factor that is needed for transforming the value to
// pixels
float factor = mChart.getFactor();

4
MPChartLib/src/main/java/com/github/mikephil/charting/utils/SelectionDetail.java
View file

@ -3,9 +3,9 @@ package com.github.mikephil.charting.utils;
import com.github.mikephil.charting.interfaces.datasets.IDataSet;
/**
* Class that encapsulates information of a yValue that has been
* Class that encapsulates information of a value that has been
* selected/highlighted and its DataSet index. The SelectionDetail objects give
* information about the yValue at the selected index and the DataSet it belongs
* information about the value at the selected index and the DataSet it belongs
* to. Needed only for highlighting onTouch().
*
* @author Philipp Jahoda

8
MPChartLib/src/main/java/com/github/mikephil/charting/utils/Transformer.java
View file

@ -246,7 +246,7 @@ public class Transformer {
/**
* transform a path with all the given matrices VERY IMPORTANT: keep order
* to yValue-touch-offset
* to value-touch-offset
*
* @param path
*/
@ -271,7 +271,7 @@ public class Transformer {
/**
* Transform an array of points with all matrices. VERY IMPORTANT: Keep
* matrix order "yValue-touch-offset" when transforming.
* matrix order "value-touch-offset" when transforming.
*
* @param pts
*/
@ -374,7 +374,7 @@ public class Transformer {
Matrix tmp = new Matrix();
// invert all matrixes to convert back to the original yValue
// invert all matrixes to convert back to the original value
mMatrixOffset.invert(tmp);
tmp.mapPoints(pixels);
@ -414,7 +414,7 @@ public class Transformer {
}
/**
* Returns the x and y coordinates (pixels) for a given x and y yValue in the chart.
* Returns the x and y coordinates (pixels) for a given x and y value in the chart.
*
* @param x
* @param y

14
MPChartLib/src/main/java/com/github/mikephil/charting/utils/Utils.java
View file

@ -89,9 +89,9 @@ public abstract class Utils {
* This method converts dp unit to equivalent pixels, depending on device
* density. NEEDS UTILS TO BE INITIALIZED BEFORE USAGE.
*
* @param dp A yValue in dp (density independent pixels) unit. Which we need
* @param dp A value in dp (density independent pixels) unit. Which we need
* to convert into pixels
* @return A float yValue to represent px equivalent to dp depending on
* @return A float value to represent px equivalent to dp depending on
* device density
*/
public static float convertDpToPixel(float dp) {
@ -117,8 +117,8 @@ public abstract class Utils {
* This method converts device specific pixels to density independent
* pixels. NEEDS UTILS TO BE INITIALIZED BEFORE USAGE.
*
* @param px A yValue in px (pixels) unit. Which we need to convert into db
* @return A float yValue to represent dp equivalent to px yValue
* @param px A value in px (pixels) unit. Which we need to convert into db
* @return A float value to represent dp equivalent to px value
*/
public static float convertPixelsToDp(float px) {
@ -382,7 +382,7 @@ public abstract class Utils {
}
/**
* Returns the index of the DataSet that contains the closest yValue on the
* Returns the index of the DataSet that contains the closest value on the
* y-axis. This is needed for highlighting. This will return -Integer.MAX_VALUE if failure.
*
* @param valsAtIndex all the values at a specific index
@ -400,7 +400,7 @@ public abstract class Utils {
}
/**
* Returns the SelectionDetail of the DataSet that contains the closest yValue on the
* Returns the SelectionDetail of the DataSet that contains the closest value on the
* y-axis.
*
* @param valsAtIndex all the values at a specific index
@ -721,7 +721,7 @@ public abstract class Utils {
*/
public static double granularity(float range, int labelCount) {
// Find out how much spacing (in y yValue space) between axis values
// Find out how much spacing (in y value space) between axis values
double rawInterval = range / labelCount;
double interval = Utils.roundToNextSignificant(rawInterval);

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

@ -28,22 +28,22 @@ public class ViewPortHandler {
protected float mChartHeight = 0f;
/**
* minimum scale yValue on the y-axis
* minimum scale value on the y-axis
*/
private float mMinScaleY = 1f;
/**
* maximum scale yValue on the y-axis
* maximum scale value on the y-axis
*/
private float mMaxScaleY = Float.MAX_VALUE;
/**
* minimum scale yValue on the x-axis
* minimum scale value on the x-axis
*/
private float mMinScaleX = 1f;
/**
* maximum scale yValue on the x-axis
* maximum scale value on the x-axis
*/
private float mMaxScaleX = Float.MAX_VALUE;
@ -329,7 +329,7 @@ public class ViewPortHandler {
}
/**
* Centers the viewport around the specified position (x-index and y-yValue)
* Centers the viewport around the specified position (x-index and y-value)
* in the chart. Centering the viewport outside the bounds of the chart is
* not possible. Makes most sense in combination with the
* setScaleMinima(...) method.