Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import com.github.mikephil.charting.interfaces.dataprovider.BarDataProvider;
import com.github.mikephil.charting.interfaces.datasets.IBarDataSet;
import com.github.mikephil.charting.renderer.BarChartRenderer;
import com.github.mikephil.charting.renderer.RoundedBarChartRenderer;

import java.util.Locale;

Expand Down Expand Up @@ -50,8 +51,9 @@ public class BarChart extends BarLineChartBase<BarData> implements BarDataProvid
private float mRoundedBarRadius = 0f;

private boolean mFitBars = false;
private boolean mIsOwnRoundedRendererUsed = false;

public BarChart(Context context) {
public BarChart(Context context) {
super(context);
}

Expand All @@ -63,12 +65,17 @@ public BarChart(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
}

protected void setRenderer() {
if (isOwnRoundedRendererUsed())
mRenderer = new RoundedBarChartRenderer(this, mAnimator, mViewPortHandler);
else
mRenderer = new BarChartRenderer(this, mAnimator, mViewPortHandler, mDrawRoundedBars, mRoundedBarRadius);
}

@Override
protected void init() {
super.init();

mRenderer = new BarChartRenderer(this, mAnimator, mViewPortHandler, mDrawRoundedBars, mRoundedBarRadius);

setRenderer();
setHighlighter(new BarHighlighter(this));

getXAxis().setSpaceMin(0.5f);
Expand Down Expand Up @@ -298,4 +305,14 @@ public String getAccessibilityDescription() {
"Data ranges from %s to %s.",
entryCount, entries, minVal, maxVal, minRange, maxRange);
}

@Override
public boolean isOwnRoundedRendererUsed() {
return mIsOwnRoundedRendererUsed;
}

@Override
public void setOwnRoundedRendererUsed(boolean b) {
mIsOwnRoundedRendererUsed = b;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,16 @@ public class CombinedChart extends BarLineChartBase<CombinedData> implements Com

protected DrawOrder[] mDrawOrder;

@Override
public boolean isOwnRoundedRendererUsed() {
return false;
}

@Override
public void setOwnRoundedRendererUsed(boolean b) {
Log.e(LOG_TAG, "CombinedChart does not support rounded bars.");
}

/**
* enum that allows to specify the order in which the different data objects
* for the combined-chart are drawn
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import com.github.mikephil.charting.highlight.HorizontalBarHighlighter;
import com.github.mikephil.charting.interfaces.datasets.IBarDataSet;
import com.github.mikephil.charting.renderer.HorizontalBarChartRenderer;
import com.github.mikephil.charting.renderer.RoundedHorizontalBarChartRenderer;
import com.github.mikephil.charting.renderer.XAxisRendererHorizontalBarChart;
import com.github.mikephil.charting.renderer.YAxisRendererHorizontalBarChart;
import com.github.mikephil.charting.utils.HorizontalViewPortHandler;
Expand Down Expand Up @@ -40,6 +41,14 @@ public HorizontalBarChart(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
}

@Override
protected void setRenderer() {
if (isOwnRoundedRendererUsed())
mRenderer = new RoundedHorizontalBarChartRenderer(this, mAnimator, mViewPortHandler);
else
mRenderer = new HorizontalBarChartRenderer(this, mAnimator, mViewPortHandler);
}

@Override
protected void init() {

Expand All @@ -50,7 +59,6 @@ protected void init() {
mLeftAxisTransformer = new TransformerHorizontalBarChart(mViewPortHandler);
mRightAxisTransformer = new TransformerHorizontalBarChart(mViewPortHandler);

mRenderer = new HorizontalBarChartRenderer(this, mAnimator, mViewPortHandler);
setHighlighter(new HorizontalBarHighlighter(this));

mAxisRendererLeft = new YAxisRendererHorizontalBarChart(mViewPortHandler, mAxisLeft, mLeftAxisTransformer);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ interface BarDataProvider : BarLineScatterCandleBubbleDataProvider {
var isDrawBarShadowEnabled: Boolean
var isDrawValueAboveBarEnabled: Boolean
var isHighlightFullBarEnabled: Boolean
var isOwnRoundedRendererUsed : Boolean
}
Loading
Loading