Skip to content

Some renderer in Kotlin #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hannesa2 merged 1 commit into from
Apr 6, 2025
Merged

Some renderer in Kotlin #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
553 changes: 0 additions & 553 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.java
View file
Open in desktop

This file was deleted.

560 changes: 560 additions & 0 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.kt
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/CombinedChartRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import com.github.mikephil.charting.data.ChartData;
import com.github.mikephil.charting.data.CombinedData;
import com.github.mikephil.charting.highlight.Highlight;
import com.github.mikephil.charting.interfaces.dataprovider.BarLineScatterCandleBubbleDataProvider;
import com.github.mikephil.charting.utils.ViewPortHandler;

import java.lang.ref.WeakReference;
Expand Down Expand Up @@ -115,9 +114,9 @@ public void drawHighlighted(Canvas c, Highlight[] indices) {
ChartData data = null;

if (renderer instanceof BarChartRenderer)
data = ((BarChartRenderer)renderer).mChart.getBarData();
data = ((BarChartRenderer)renderer).chart.getBarData();
else if (renderer instanceof LineChartRenderer)
data = ((LineChartRenderer)renderer).mChart.getLineData();
data = ((LineChartRenderer)renderer).chart.getLineData();
else if (renderer instanceof CandleStickChartRenderer)
data = ((CandleStickChartRenderer)renderer).mChart.getCandleData();
else if (renderer instanceof ScatterChartRenderer)
Expand Down
50 changes: 25 additions & 25 deletions ...rtLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ public HorizontalBarChartRenderer(BarDataProvider chart, ChartAnimator animator,
@Override
public void initBuffers() {

BarData barData = mChart.getBarData();
mBarBuffers = new HorizontalBarBuffer[barData.getDataSetCount()];
BarData barData = chart.getBarData();
barBuffers = new HorizontalBarBuffer[barData.getDataSetCount()];

for (int i = 0; i < mBarBuffers.length; i++) {
for (int i = 0; i < barBuffers.length; i++) {
IBarDataSet set = barData.getDataSetByIndex(i);
mBarBuffers[i] = new HorizontalBarBuffer(set.getEntryCount() * 4 * (set.isStacked() ? set.getStackSize() : 1),
barBuffers[i] = new HorizontalBarBuffer(set.getEntryCount() * 4 * (set.isStacked() ? set.getStackSize() : 1),
barData.getDataSetCount(), set.isStacked());
}
}
Expand All @@ -56,21 +56,21 @@ public void initBuffers() {
@Override
protected void drawDataSet(Canvas c, IBarDataSet dataSet, int index) {

Transformer trans = mChart.getTransformer(dataSet.getAxisDependency());
Transformer trans = chart.getTransformer(dataSet.getAxisDependency());

mBarBorderPaint.setColor(dataSet.getBarBorderColor());
mBarBorderPaint.setStrokeWidth(Utils.convertDpToPixel(dataSet.getBarBorderWidth()));
barBorderPaint.setColor(dataSet.getBarBorderColor());
barBorderPaint.setStrokeWidth(Utils.convertDpToPixel(dataSet.getBarBorderWidth()));

final boolean drawBorder = dataSet.getBarBorderWidth() > 0.f;

float phaseX = mAnimator.getPhaseX();
float phaseY = mAnimator.getPhaseY();

// draw the bar shadow before the values
if (mChart.isDrawBarShadowEnabled()) {
mShadowPaint.setColor(dataSet.getBarShadowColor());
if (chart.isDrawBarShadowEnabled()) {
shadowPaint.setColor(dataSet.getBarShadowColor());

BarData barData = mChart.getBarData();
BarData barData = chart.getBarData();

final float barWidth = barData.getBarWidth();
final float barWidthHalf = barWidth / 2.0f;
Expand Down Expand Up @@ -100,24 +100,24 @@ protected void drawDataSet(Canvas c, IBarDataSet dataSet, int index) {
mBarShadowRectBuffer.left = mViewPortHandler.contentLeft();
mBarShadowRectBuffer.right = mViewPortHandler.contentRight();

c.drawRect(mBarShadowRectBuffer, mShadowPaint);
c.drawRect(mBarShadowRectBuffer, shadowPaint);
}
}

// initialize the buffer
BarBuffer buffer = mBarBuffers[index];
BarBuffer buffer = barBuffers[index];
buffer.setPhases(phaseX, phaseY);
buffer.setDataSet(index);
buffer.setInverted(mChart.isInverted(dataSet.getAxisDependency()));
buffer.setBarWidth(mChart.getBarData().getBarWidth());
buffer.setInverted(chart.isInverted(dataSet.getAxisDependency()));
buffer.setBarWidth(chart.getBarData().getBarWidth());

buffer.feed(dataSet);

trans.pointValuesToPixel(buffer.buffer);

final boolean isCustomFill = dataSet.getFills() != null && !dataSet.getFills().isEmpty();
final boolean isSingleColor = dataSet.getColors().size() == 1;
final boolean isInverted = mChart.isInverted(dataSet.getAxisDependency());
final boolean isInverted = chart.isInverted(dataSet.getAxisDependency());

if (isSingleColor) {
mRenderPaint.setColor(dataSet.getColor());
Expand Down Expand Up @@ -156,24 +156,24 @@ protected void drawDataSet(Canvas c, IBarDataSet dataSet, int index) {

if (drawBorder) {
c.drawRect(buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
buffer.buffer[j + 3], mBarBorderPaint);
buffer.buffer[j + 3], barBorderPaint);
}
}
}

@Override
public void drawValues(Canvas c) {
// if values are drawn
if (isDrawingValuesAllowed(mChart)) {
if (isDrawingValuesAllowed(chart)) {

List<IBarDataSet> dataSets = mChart.getBarData().getDataSets();
List<IBarDataSet> dataSets = chart.getBarData().getDataSets();

final float valueOffsetPlus = Utils.convertDpToPixel(5f);
float posOffset = 0f;
float negOffset = 0f;
final boolean drawValueAboveBar = mChart.isDrawValueAboveBarEnabled();
final boolean drawValueAboveBar = chart.isDrawValueAboveBarEnabled();

for (int i = 0; i < mChart.getBarData().getDataSetCount(); i++) {
for (int i = 0; i < chart.getBarData().getDataSetCount(); i++) {

IBarDataSet dataSet = dataSets.get(i);
if (dataSet.getEntryCount() == 0) {
Expand All @@ -183,7 +183,7 @@ public void drawValues(Canvas c) {
continue;
}

boolean isInverted = mChart.isInverted(dataSet.getAxisDependency());
boolean isInverted = chart.isInverted(dataSet.getAxisDependency());

// apply the text-styling defined by the DataSet
applyValueTextStyle(dataSet);
Expand All @@ -192,7 +192,7 @@ public void drawValues(Canvas c) {
IValueFormatter formatter = dataSet.getValueFormatter();

// get the buffer
BarBuffer buffer = mBarBuffers[i];
BarBuffer buffer = barBuffers[i];

final float phaseY = mAnimator.getPhaseY();

Expand Down Expand Up @@ -265,7 +265,7 @@ public void drawValues(Canvas c) {
// if each value of a potential stack should be drawn
} else {

Transformer trans = mChart.getTransformer(dataSet.getAxisDependency());
Transformer trans = chart.getTransformer(dataSet.getAxisDependency());

int bufferIndex = 0;
int index = 0;
Expand Down Expand Up @@ -441,9 +441,9 @@ protected void prepareBarHighlight(float x, float y1, float y2, float barWidthHa
float left = y1;
float right = y2;

mBarRect.set(left, top, right, bottom);
barRect.set(left, top, right, bottom);

trans.rectToPixelPhaseHorizontal(mBarRect, mAnimator.getPhaseY());
trans.rectToPixelPhaseHorizontal(barRect, mAnimator.getPhaseY());
}

@Override
Expand Down
Loading
Loading