Skip to content

Commit 5e2fb7b

Browse files
committed
Bugfixes and performance boost concerning BarChart.
1 parent fa97f61 commit 5e2fb7b

12 files changed

Lines changed: 537 additions & 161 deletions

File tree

‎MPChartExample/AndroidManifest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
<activity android:name="RealtimeLineChartActivity"></activity>
4949
<activity android:name="CombinedChartActivity"></activity>
5050
<activity android:name="PerformanceLineChart"></activity>
51+
<activity android:name="BarChartActivitySinus"></activity>
5152
</application>
5253

5354
</manifest>
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:layout_width="match_parent"
4+
android:layout_height="match_parent">
5+
6+
<com.github.mikephil.charting.charts.BarChart
7+
android:id="@+id/chart1"
8+
android:layout_width="match_parent"
9+
android:layout_height="match_parent"
10+
android:layout_above="@+id/seekbarValues" />
11+
12+
<SeekBar
13+
android:id="@+id/seekbarValues"
14+
android:layout_width="match_parent"
15+
android:layout_height="wrap_content"
16+
android:layout_alignParentBottom="true"
17+
android:layout_alignParentLeft="true"
18+
android:layout_margin="8dp"
19+
android:layout_marginBottom="35dp"
20+
android:layout_toLeftOf="@+id/tvValueCount"
21+
android:layout_marginRight="5dp"
22+
android:max="750"
23+
android:paddingBottom="12dp" />
24+
25+
<TextView
26+
android:id="@+id/tvValueCount"
27+
android:layout_width="60dp"
28+
android:layout_height="wrap_content"
29+
android:layout_alignBottom="@+id/seekbarValues"
30+
android:layout_alignParentRight="true"
31+
android:text="0"
32+
android:layout_marginBottom="15dp"
33+
android:layout_marginRight="10dp"
34+
android:gravity="right"
35+
android:textAppearance="?android:attr/textAppearanceMedium" />
36+
37+
</RelativeLayout>
Lines changed: 255 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,255 @@
1+
2+
package com.xxmassdeveloper.mpchartexample;
3+
4+
import android.graphics.Color;
5+
import android.graphics.Typeface;
6+
import android.os.Bundle;
7+
import android.view.Menu;
8+
import android.view.MenuItem;
9+
import android.view.WindowManager;
10+
import android.widget.SeekBar;
11+
import android.widget.SeekBar.OnSeekBarChangeListener;
12+
import android.widget.TextView;
13+
import android.widget.Toast;
14+
15+
import com.github.mikephil.charting.charts.BarChart;
16+
import com.github.mikephil.charting.components.Legend;
17+
import com.github.mikephil.charting.components.Legend.LegendForm;
18+
import com.github.mikephil.charting.components.Legend.LegendPosition;
19+
import com.github.mikephil.charting.components.XAxis;
20+
import com.github.mikephil.charting.components.XAxis.XAxisPosition;
21+
import com.github.mikephil.charting.components.YAxis;
22+
import com.github.mikephil.charting.data.BarData;
23+
import com.github.mikephil.charting.data.BarDataSet;
24+
import com.github.mikephil.charting.data.BarEntry;
25+
import com.github.mikephil.charting.data.DataSet;
26+
import com.github.mikephil.charting.data.filter.Approximator;
27+
import com.github.mikephil.charting.data.filter.Approximator.ApproximatorType;
28+
import com.github.mikephil.charting.utils.FileUtils;
29+
import com.xxmassdeveloper.mpchartexample.notimportant.DemoBase;
30+
31+
import java.util.ArrayList;
32+
33+
public class BarChartActivitySinus extends DemoBase implements OnSeekBarChangeListener {
34+
35+
protected BarChart mChart;
36+
private SeekBar mSeekBarX;
37+
private TextView tvX;
38+
39+
private Typeface mTf;
40+
41+
private ArrayList<BarEntry> mSinusData;
42+
43+
@Override
44+
protected void onCreate(Bundle savedInstanceState) {
45+
super.onCreate(savedInstanceState);
46+
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
47+
WindowManager.LayoutParams.FLAG_FULLSCREEN);
48+
setContentView(R.layout.activity_barchart_sinus);
49+
50+
mSinusData = FileUtils.loadBarEntriesFromAssets(getAssets(),"sine.txt");
51+
52+
tvX = (TextView) findViewById(R.id.tvValueCount);
53+
54+
mSeekBarX = (SeekBar) findViewById(R.id.seekbarValues);
55+
56+
mChart = (BarChart) findViewById(R.id.chart1);
57+
58+
mChart.setDrawBarShadow(false);
59+
mChart.setDrawValueAboveBar(true);
60+
61+
mChart.setDescription("");
62+
63+
// if more than 60 entries are displayed in the chart, no values will be
64+
// drawn
65+
mChart.setMaxVisibleValueCount(60);
66+
67+
// scaling can now only be done on x- and y-axis separately
68+
mChart.setPinchZoom(false);
69+
70+
// draw shadows for each bar that show the maximum value
71+
// mChart.setDrawBarShadow(true);
72+
73+
// mChart.setDrawXLabels(false);
74+
75+
mChart.setDrawGridBackground(false);
76+
// mChart.setDrawYLabels(false);
77+
78+
mTf = Typeface.createFromAsset(getAssets(), "OpenSans-Regular.ttf");
79+
80+
XAxis xAxis = mChart.getXAxis();
81+
xAxis.setPosition(XAxisPosition.BOTTOM);
82+
xAxis.setTypeface(mTf);
83+
xAxis.setDrawGridLines(false);
84+
xAxis.setEnabled(false);
85+
86+
YAxis leftAxis = mChart.getAxisLeft();
87+
leftAxis.setTypeface(mTf);
88+
leftAxis.setLabelCount(8);
89+
leftAxis.setStartAtZero(false);
90+
leftAxis.setAxisMinValue(-1.2f);
91+
leftAxis.setAxisMaxValue(1.2f);
92+
93+
YAxis rightAxis = mChart.getAxisRight();
94+
rightAxis.setDrawGridLines(false);
95+
rightAxis.setTypeface(mTf);
96+
rightAxis.setLabelCount(8);
97+
rightAxis.setStartAtZero(false);
98+
rightAxis.setAxisMinValue(-1.2f);
99+
rightAxis.setAxisMaxValue(1.2f);
100+
101+
mSeekBarX.setOnSeekBarChangeListener(this);
102+
mSeekBarX.setProgress(750);
103+
104+
Legend l = mChart.getLegend();
105+
l.setPosition(LegendPosition.BELOW_CHART_LEFT);
106+
l.setForm(LegendForm.SQUARE);
107+
l.setFormSize(9f);
108+
l.setTextSize(11f);
109+
l.setXEntrySpace(4f);
110+
111+
// mChart.setDrawLegend(false);
112+
}
113+
114+
@Override
115+
public boolean onCreateOptionsMenu(Menu menu) {
116+
getMenuInflater().inflate(R.menu.bar, menu);
117+
return true;
118+
}
119+
120+
@Override
121+
public boolean onOptionsItemSelected(MenuItem item) {
122+
123+
switch (item.getItemId()) {
124+
case R.id.actionToggleValues: {
125+
for (DataSet<?> set : mChart.getData().getDataSets())
126+
set.setDrawValues(!set.isDrawValuesEnabled());
127+
128+
mChart.invalidate();
129+
break;
130+
}
131+
case R.id.actionToggleHighlight: {
132+
if (mChart.isHighlightEnabled())
133+
mChart.setHighlightEnabled(false);
134+
else
135+
mChart.setHighlightEnabled(true);
136+
mChart.invalidate();
137+
break;
138+
}
139+
case R.id.actionTogglePinch: {
140+
if (mChart.isPinchZoomEnabled())
141+
mChart.setPinchZoom(false);
142+
else
143+
mChart.setPinchZoom(true);
144+
145+
mChart.invalidate();
146+
break;
147+
}
148+
case R.id.actionToggleHighlightArrow: {
149+
if (mChart.isDrawHighlightArrowEnabled())
150+
mChart.setDrawHighlightArrow(false);
151+
else
152+
mChart.setDrawHighlightArrow(true);
153+
mChart.invalidate();
154+
break;
155+
}
156+
case R.id.actionToggleStartzero: {
157+
mChart.getAxisLeft().setStartAtZero(!mChart.getAxisLeft().isStartAtZeroEnabled());
158+
mChart.getAxisRight().setStartAtZero(!mChart.getAxisRight().isStartAtZeroEnabled());
159+
mChart.notifyDataSetChanged();
160+
mChart.invalidate();
161+
break;
162+
}
163+
case R.id.animateX: {
164+
mChart.animateX(3000);
165+
break;
166+
}
167+
case R.id.animateY: {
168+
mChart.animateY(3000);
169+
break;
170+
}
171+
case R.id.animateXY: {
172+
173+
mChart.animateXY(3000, 3000);
174+
break;
175+
}
176+
case R.id.actionToggleAdjustXLegend: {
177+
XAxis xLabels = mChart.getXAxis();
178+
179+
if (xLabels.isAdjustXLabelsEnabled())
180+
xLabels.setAdjustXLabels(false);
181+
else
182+
xLabels.setAdjustXLabels(true);
183+
184+
mChart.invalidate();
185+
break;
186+
}
187+
case R.id.actionToggleFilter: {
188+
189+
Approximator a = new Approximator(ApproximatorType.DOUGLAS_PEUCKER, 25);
190+
191+
if (!mChart.isFilteringEnabled()) {
192+
mChart.enableFiltering(a);
193+
} else {
194+
mChart.disableFiltering();
195+
}
196+
mChart.invalidate();
197+
break;
198+
}
199+
case R.id.actionSave: {
200+
if (mChart.saveToGallery("title" + System.currentTimeMillis(), 50)) {
201+
Toast.makeText(getApplicationContext(), "Saving SUCCESSFUL!",
202+
Toast.LENGTH_SHORT).show();
203+
} else
204+
Toast.makeText(getApplicationContext(), "Saving FAILED!", Toast.LENGTH_SHORT)
205+
.show();
206+
break;
207+
}
208+
}
209+
return true;
210+
}
211+
212+
@Override
213+
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
214+
215+
tvX.setText("" + (mSeekBarX.getProgress() + 1));
216+
217+
setData(mSeekBarX.getProgress());
218+
mChart.invalidate();
219+
}
220+
221+
@Override
222+
public void onStartTrackingTouch(SeekBar seekBar) {
223+
// TODO Auto-generated method stub
224+
225+
}
226+
227+
@Override
228+
public void onStopTrackingTouch(SeekBar seekBar) {
229+
// TODO Auto-generated method stub
230+
231+
}
232+
233+
private void setData(int count) {
234+
235+
ArrayList<String> xVals = new ArrayList<String>();
236+
237+
ArrayList<BarEntry> entries = new ArrayList<BarEntry>();
238+
239+
for (int i = 0; i < count; i++) {
240+
xVals.add(i+"");
241+
entries.add(mSinusData.get(i));
242+
}
243+
244+
BarDataSet set = new BarDataSet(entries, "Sinus Function");
245+
set.setBarSpacePercent(35f);
246+
set.setColor(Color.rgb(233, 101, 105));
247+
248+
BarData data = new BarData(xVals, set);
249+
data.setValueTextSize(10f);
250+
data.setValueTypeface(mTf);
251+
data.setDrawValues(false);
252+
253+
mChart.setData(data);
254+
}
255+
}

‎MPChartExample/src/com/xxmassdeveloper/mpchartexample/StackedBarActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ protected void onCreate(Bundle savedInstanceState) {
7777
// change the position of the y-labels
7878
YAxis yLabels = mChart.getAxisLeft();
7979
// yLabels.setPosition(YLabelPosition.BOTH_SIDED);
80-
yLabels.setLabelCount(5);
80+
// yLabels.setLabelCount(5);
8181
yLabels.setValueFormatter(new MyValueFormatter());
8282

8383
mChart.getAxisRight().setValueFormatter(new MyValueFormatter());

‎MPChartExample/src/com/xxmassdeveloper/mpchartexample/notimportant/MainActivity.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.xxmassdeveloper.mpchartexample.AnotherBarActivity;
2424
import com.xxmassdeveloper.mpchartexample.BarChartActivity;
2525
import com.xxmassdeveloper.mpchartexample.BarChartActivityMultiDataset;
26+
import com.xxmassdeveloper.mpchartexample.BarChartActivitySinus;
2627
import com.xxmassdeveloper.mpchartexample.CandleStickChartActivity;
2728
import com.xxmassdeveloper.mpchartexample.CombinedChartActivity;
2829
import com.xxmassdeveloper.mpchartexample.CubicLineChartActivity;
@@ -114,6 +115,9 @@ protected void onCreate(Bundle savedInstanceState) {
114115
objects.add(new ContentItem(
115116
"Performance Line Chart",
116117
"Renders up to 30.000 objects smoothly."));
118+
objects.add(new ContentItem(
119+
"Sinus Bar Chart",
120+
"A BarChart plotting the sinus function (~750 values)."));
117121

118122
MyAdapter adapter = new MyAdapter(this, objects);
119123

@@ -227,6 +231,10 @@ public void onItemClick(AdapterView<?> av, View v, int pos, long arg3) {
227231
i = new Intent(this, PerformanceLineChart.class);
228232
startActivity(i);
229233
break;
234+
case 23:
235+
i = new Intent(this, BarChartActivitySinus.class);
236+
startActivity(i);
237+
break;
230238
}
231239

232240
overridePendingTransition(R.anim.move_right_in_activity, R.anim.move_left_out_activity);

‎MPChartLib/src/com/github/mikephil/charting/buffer/BarBuffer.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77

88
public class BarBuffer extends AbstractBuffer<BarEntry> {
99

10-
private float mBarSpace = 0f;
11-
private float mGroupSpace = 0f;
12-
private int mDataSetIndex = 0;
13-
private int mDataSetCount = 1;
14-
private boolean mContainsStacks = false;
10+
protected float mBarSpace = 0f;
11+
protected float mGroupSpace = 0f;
12+
protected int mDataSetIndex = 0;
13+
protected int mDataSetCount = 1;
14+
protected boolean mContainsStacks = false;
1515

1616
public BarBuffer(int size, float groupspace, int dataSetCount, boolean containsStacks) {
1717
super(size);
@@ -28,7 +28,7 @@ public void setDataSet(int index) {
2828
this.mDataSetIndex = index;
2929
}
3030

31-
private void addBar(float left, float top, float right, float bottom) {
31+
protected void addBar(float left, float top, float right, float bottom) {
3232

3333
buffer[index++] = left;
3434
buffer[index++] = top;

0 commit comments

Comments
 (0)