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

Code cleanup and documentation

Browse source
This commit is contained in:
Philipp Jahoda 2016-06-27 12:34:23 +02:00
parent bd5858e8c0
commit 1b4e9be07f
7 changed files with 45 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,9 +16,8 @@ public class ChevronDownShapeRenderer implements ShapeRenderer {
@Override
public void renderShape(
Canvas c, IScatterDataSet dataSet,
ViewPortHandler viewPortHandler, ScatterBuffer buffer, Paint renderPaint, final float shapeSize) {
public void renderShape(Canvas c, IScatterDataSet dataSet, ViewPortHandler viewPortHandler, ScatterBuffer buffer, Paint
renderPaint, final float shapeSize) {
final float shapeHalf = shapeSize / 2f;

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

@ -16,8 +16,8 @@ public class ChevronUpShapeRenderer implements ShapeRenderer {
@Override
public void renderShape(Canvas c, IScatterDataSet dataSet,
ViewPortHandler viewPortHandler, ScatterBuffer buffer, Paint renderPaint, final float shapeSize) {
public void renderShape(Canvas c, IScatterDataSet dataSet, ViewPortHandler viewPortHandler, ScatterBuffer buffer, Paint
renderPaint, final float shapeSize) {
final float shapeHalf = shapeSize / 2f;

30
MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/CircleShapeRenderer.java
View file

@ -15,11 +15,9 @@ import com.github.mikephil.charting.utils.ViewPortHandler;
*/
public class CircleShapeRenderer implements ShapeRenderer {
@Override
public void renderShape(
Canvas c, IScatterDataSet dataSet,
ViewPortHandler mViewPortHandler, ScatterBuffer buffer, Paint mRenderPaint, final float shapeSize) {
public void renderShape(Canvas c, IScatterDataSet dataSet, ViewPortHandler viewPortHandler, ScatterBuffer buffer, Paint
renderPaint, final float shapeSize) {
final float shapeHalf = shapeSize / 2f;
final float shapeHoleSizeHalf = Utils.convertDpToPixel(dataSet.getScatterShapeHoleRadius());
@ -31,43 +29,43 @@ public class CircleShapeRenderer implements ShapeRenderer {
for (int i = 0; i < buffer.size(); i += 2) {
if (!mViewPortHandler.isInBoundsRight(buffer.buffer[i]))
if (!viewPortHandler.isInBoundsRight(buffer.buffer[i]))
break;
if (!mViewPortHandler.isInBoundsLeft(buffer.buffer[i])
|| !mViewPortHandler.isInBoundsY(buffer.buffer[i + 1]))
if (!viewPortHandler.isInBoundsLeft(buffer.buffer[i])
|| !viewPortHandler.isInBoundsY(buffer.buffer[i + 1]))
continue;
mRenderPaint.setColor(dataSet.getColor(i / 2));
renderPaint.setColor(dataSet.getColor(i / 2));
if (shapeSize > 0.0) {
mRenderPaint.setStyle(Paint.Style.STROKE);
mRenderPaint.setStrokeWidth(shapeStrokeSize);
renderPaint.setStyle(Paint.Style.STROKE);
renderPaint.setStrokeWidth(shapeStrokeSize);
c.drawCircle(
buffer.buffer[i],
buffer.buffer[i + 1],
shapeHoleSizeHalf + shapeStrokeSizeHalf,
mRenderPaint);
renderPaint);
if (shapeHoleColor != ColorTemplate.COLOR_NONE) {
mRenderPaint.setStyle(Paint.Style.FILL);
renderPaint.setStyle(Paint.Style.FILL);
mRenderPaint.setColor(shapeHoleColor);
renderPaint.setColor(shapeHoleColor);
c.drawCircle(
buffer.buffer[i],
buffer.buffer[i + 1],
shapeHoleSizeHalf,
mRenderPaint);
renderPaint);
}
} else {
mRenderPaint.setStyle(Paint.Style.FILL);
renderPaint.setStyle(Paint.Style.FILL);
c.drawCircle(
buffer.buffer[i],
buffer.buffer[i + 1],
shapeHalf,
mRenderPaint);
renderPaint);
}
}

21
MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/CrossShapeRenderer.java
View file

@ -16,39 +16,38 @@ public class CrossShapeRenderer implements ShapeRenderer {
@Override
public void renderShape(
Canvas c, IScatterDataSet dataSet,
ViewPortHandler mViewPortHandler, ScatterBuffer buffer, Paint mRenderPaint, final float shapeSize) {
public void renderShape(Canvas c, IScatterDataSet dataSet, ViewPortHandler viewPortHandler, ScatterBuffer buffer, Paint
renderPaint, final float shapeSize) {
final float shapeHalf = shapeSize / 2f;
mRenderPaint.setStyle(Paint.Style.STROKE);
mRenderPaint.setStrokeWidth(Utils.convertDpToPixel(1f));
renderPaint.setStyle(Paint.Style.STROKE);
renderPaint.setStrokeWidth(Utils.convertDpToPixel(1f));
for (int i = 0; i < buffer.size(); i += 2) {
if (!mViewPortHandler.isInBoundsRight(buffer.buffer[i]))
if (!viewPortHandler.isInBoundsRight(buffer.buffer[i]))
break;
if (!mViewPortHandler.isInBoundsLeft(buffer.buffer[i])
|| !mViewPortHandler.isInBoundsY(buffer.buffer[i + 1]))
if (!viewPortHandler.isInBoundsLeft(buffer.buffer[i])
|| !viewPortHandler.isInBoundsY(buffer.buffer[i + 1]))
continue;
mRenderPaint.setColor(dataSet.getColor(i / 2));
renderPaint.setColor(dataSet.getColor(i / 2));
c.drawLine(
buffer.buffer[i] - shapeHalf,
buffer.buffer[i + 1],
buffer.buffer[i] + shapeHalf,
buffer.buffer[i + 1],
mRenderPaint);
renderPaint);
c.drawLine(
buffer.buffer[i],
buffer.buffer[i + 1] - shapeHalf,
buffer.buffer[i],
buffer.buffer[i + 1] + shapeHalf,
mRenderPaint);
renderPaint);
}
}

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

@ -17,11 +17,11 @@ public interface ShapeRenderer {
/**
* Renders the provided ScatterDataSet with a shape.
*
* @param c
* @param dataSet
* @param viewPortHandler
* @param buffer
* @param renderPaint
* @param c Canvas object for drawing the shape
* @param dataSet the DataSet to be drawn
* @param viewPortHandler contains information about the current state of the view
* @param buffer buffer containing the transformed values of all entries in the DataSet
* @param renderPaint Paint object used for styling and drawing
* @param shapeSize
*/
void renderShape(Canvas c, IScatterDataSet dataSet, ViewPortHandler viewPortHandler, ScatterBuffer buffer, Paint

21
MPChartLib/src/main/java/com/github/mikephil/charting/renderer/scatter/XShapeRenderer.java
View file

@ -16,38 +16,37 @@ public class XShapeRenderer implements ShapeRenderer {
@Override
public void renderShape(
Canvas c, IScatterDataSet dataSet,
ViewPortHandler mViewPortHandler, ScatterBuffer buffer, Paint mRenderPaint, final float shapeSize) {
public void renderShape(Canvas c, IScatterDataSet dataSet, ViewPortHandler viewPortHandler, ScatterBuffer buffer, Paint
renderPaint, final float shapeSize) {
final float shapeHalf = shapeSize / 2f;
mRenderPaint.setStyle(Paint.Style.STROKE);
mRenderPaint.setStrokeWidth(Utils.convertDpToPixel(1f));
renderPaint.setStyle(Paint.Style.STROKE);
renderPaint.setStrokeWidth(Utils.convertDpToPixel(1f));
for (int i = 0; i < buffer.size(); i += 2) {
if (!mViewPortHandler.isInBoundsRight(buffer.buffer[i]))
if (!viewPortHandler.isInBoundsRight(buffer.buffer[i]))
break;
if (!mViewPortHandler.isInBoundsLeft(buffer.buffer[i])
|| !mViewPortHandler.isInBoundsY(buffer.buffer[i + 1]))
if (!viewPortHandler.isInBoundsLeft(buffer.buffer[i])
|| !viewPortHandler.isInBoundsY(buffer.buffer[i + 1]))
continue;
mRenderPaint.setColor(dataSet.getColor(i / 2));
renderPaint.setColor(dataSet.getColor(i / 2));
c.drawLine(
buffer.buffer[i] - shapeHalf,
buffer.buffer[i + 1] - shapeHalf,
buffer.buffer[i] + shapeHalf,
buffer.buffer[i + 1] + shapeHalf,
mRenderPaint);
renderPaint);
c.drawLine(
buffer.buffer[i] + shapeHalf,
buffer.buffer[i + 1] - shapeHalf,
buffer.buffer[i] - shapeHalf,
buffer.buffer[i + 1] + shapeHalf,
mRenderPaint);
renderPaint);
}
}

2
MPChartLib/src/main/java/com/github/mikephil/charting/utils/ShapeRendererHandler.java
View file

@ -14,6 +14,7 @@ import java.util.HashMap;
/**
* Created by Philipp Jahoda on 27/06/16.
* Class allowing to determine the corresponding ShapeRenderer for a given ScatterShape.
*/
public final class ShapeRendererHandler {
@ -30,6 +31,7 @@ public final class ShapeRendererHandler {
public ShapeRendererHandler() {
initShapeRenderers();
}
/**
* Returns the corresponding ShapeRenderer for a given ScatterShape.
*