Skip to content

Commit 7cdadaa

Browse files
PhilJayPhilJay
committed
Started fixing the example-project.
1 parent a3bf076 commit 7cdadaa

13 files changed

Lines changed: 133 additions & 213 deletions

‎MPChartExample/res/menu/bar.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313
android:id="@+id/actionToggleHighlightArrow"
1414
android:title="Toggle Highlight Arrow">
1515
</item>
16-
<item
17-
android:id="@+id/actionToggle3D"
18-
android:title="Toggle 3D">
19-
</item>
2016
<item
2117
android:id="@+id/animateX"
2218
android:title="Animate X">

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

Lines changed: 28 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@
1111
import android.widget.Toast;
1212

1313
import com.github.mikephil.charting.charts.BarChart;
14+
import com.github.mikephil.charting.components.XAxis;
15+
import com.github.mikephil.charting.components.XAxis.XLabelPosition;
1416
import com.github.mikephil.charting.data.BarData;
1517
import com.github.mikephil.charting.data.BarDataSet;
1618
import com.github.mikephil.charting.data.BarEntry;
19+
import com.github.mikephil.charting.data.DataSet;
1720
import com.github.mikephil.charting.data.filter.Approximator;
1821
import com.github.mikephil.charting.data.filter.Approximator.ApproximatorType;
1922
import com.github.mikephil.charting.utils.ColorTemplate;
20-
import com.github.mikephil.charting.utils.XLabels;
21-
import com.github.mikephil.charting.utils.XLabels.XLabelPosition;
2223
import com.xxmassdeveloper.mpchartexample.notimportant.DemoBase;
2324

2425
import java.util.ArrayList;
@@ -46,49 +47,41 @@ protected void onCreate(Bundle savedInstanceState) {
4647
mSeekBarY.setOnSeekBarChangeListener(this);
4748

4849
mChart = (BarChart) findViewById(R.id.chart1);
49-
50-
mChart.setDrawYValues(false);
5150

52-
mChart.setUnit(" €");
5351
mChart.setDescription("");
54-
55-
mChart.setDrawYValues(true);
5652

5753
// if more than 60 entries are displayed in the chart, no values will be
5854
// drawn
5955
mChart.setMaxVisibleValueCount(60);
6056

61-
// disable 3D
62-
mChart.set3DEnabled(false);
6357
// scaling can now only be done on x- and y-axis separately
6458
mChart.setPinchZoom(false);
6559

6660
mChart.setDrawBarShadow(false);
67-
61+
6862
mChart.setDrawVerticalGrid(false);
6963
mChart.setDrawHorizontalGrid(false);
7064
mChart.setDrawGridBackground(false);
7165

72-
XLabels xLabels = mChart.getXLabels();
73-
xLabels.setPosition(XLabelPosition.BOTTOM);
74-
xLabels.setCenterXLabelText(true);
75-
xLabels.setSpaceBetweenLabels(0);
66+
XAxis xAxis = mChart.getXAxis();
67+
xAxis.setPosition(XLabelPosition.BOTTOM);
68+
xAxis.setCenterXLabelText(true);
69+
xAxis.setSpaceBetweenLabels(0);
7670

77-
mChart.setDrawYLabels(false);
78-
mChart.setDrawLegend(false);
71+
mChart.setDrawLegend(false);
7972

8073
// setting data
8174
mSeekBarX.setProgress(10);
8275
mSeekBarY.setProgress(100);
83-
76+
8477
// add a nice and smooth animation
8578
mChart.animateY(2500);
8679

87-
// Legend l = mChart.getLegend();
88-
// l.setPosition(LegendPosition.BELOW_CHART_CENTER);
89-
// l.setFormSize(8f);
90-
// l.setFormToTextSpace(4f);
91-
// l.setXEntrySpace(6f);
80+
// Legend l = mChart.getLegend();
81+
// l.setPosition(LegendPosition.BELOW_CHART_CENTER);
82+
// l.setFormSize(8f);
83+
// l.setFormToTextSpace(4f);
84+
// l.setXEntrySpace(6f);
9285

9386
// mChart.setDrawLegend(false);
9487
}
@@ -104,18 +97,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
10497

10598
switch (item.getItemId()) {
10699
case R.id.actionToggleValues: {
107-
if (mChart.isDrawYValuesEnabled())
108-
mChart.setDrawYValues(false);
109-
else
110-
mChart.setDrawYValues(true);
111-
mChart.invalidate();
112-
break;
113-
}
114-
case R.id.actionToggle3D: {
115-
if (mChart.is3DEnabled())
116-
mChart.set3DEnabled(false);
117-
else
118-
mChart.set3DEnabled(true);
100+
101+
for (DataSet<?> set : mChart.getData().getDataSets())
102+
set.setDrawValues(!set.isDrawValuesEnabled());
103+
119104
mChart.invalidate();
120105
break;
121106
}
@@ -154,12 +139,12 @@ public boolean onOptionsItemSelected(MenuItem item) {
154139
break;
155140
}
156141
case R.id.actionToggleAdjustXLegend: {
157-
XLabels xLabels = mChart.getXLabels();
142+
XAxis xAxis = mChart.getXAxis();
158143

159-
if (xLabels.isAdjustXLabelsEnabled())
160-
xLabels.setAdjustXLabels(false);
144+
if (xAxis.isAdjustXLabelsEnabled())
145+
xAxis.setAdjustXLabels(false);
161146
else
162-
xLabels.setAdjustXLabels(true);
147+
xAxis.setAdjustXLabels(true);
163148

164149
mChart.invalidate();
165150
break;
@@ -210,19 +195,20 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
210195

211196
ArrayList<BarEntry> yVals1 = new ArrayList<BarEntry>();
212197

213-
for (int i = 0; i < mSeekBarX.getProgress()+1; i++) {
198+
for (int i = 0; i < mSeekBarX.getProgress() + 1; i++) {
214199
float mult = (mSeekBarY.getProgress() + 1);
215200
float val1 = (float) (Math.random() * mult) + mult / 3;
216201
yVals1.add(new BarEntry((int) val1, i));
217202
}
218-
203+
219204
ArrayList<String> xVals = new ArrayList<String>();
220-
for (int i = 0; i < mSeekBarX.getProgress()+1; i++) {
221-
xVals.add((int) yVals1.get(i).getVal() + " " + mChart.getUnit());
205+
for (int i = 0; i < mSeekBarX.getProgress() + 1; i++) {
206+
xVals.add((int) yVals1.get(i).getVal() + "");
222207
}
223208

224209
BarDataSet set1 = new BarDataSet(yVals1, "Data Set");
225210
set1.setColors(ColorTemplate.VORDIPLOM_COLORS);
211+
set1.setDrawValues(false);
226212

227213
ArrayList<BarDataSet> dataSets = new ArrayList<BarDataSet>();
228214
dataSets.add(set1);

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

Lines changed: 15 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,20 @@
1616
import android.widget.Toast;
1717

1818
import com.github.mikephil.charting.charts.BarChart;
19+
import com.github.mikephil.charting.components.Legend;
20+
import com.github.mikephil.charting.components.Legend.LegendPosition;
21+
import com.github.mikephil.charting.components.XAxis;
22+
import com.github.mikephil.charting.components.XAxis.XLabelPosition;
23+
import com.github.mikephil.charting.components.YAxis.AxisDependency;
24+
import com.github.mikephil.charting.components.YAxis;
1925
import com.github.mikephil.charting.data.BarData;
2026
import com.github.mikephil.charting.data.BarDataSet;
2127
import com.github.mikephil.charting.data.BarEntry;
28+
import com.github.mikephil.charting.data.DataSet;
2229
import com.github.mikephil.charting.data.Entry;
2330
import com.github.mikephil.charting.data.filter.Approximator;
2431
import com.github.mikephil.charting.data.filter.Approximator.ApproximatorType;
2532
import com.github.mikephil.charting.interfaces.OnChartValueSelectedListener;
26-
import com.github.mikephil.charting.utils.Legend;
27-
import com.github.mikephil.charting.utils.Legend.LegendPosition;
28-
import com.github.mikephil.charting.utils.XLabels;
29-
import com.github.mikephil.charting.utils.XLabels.XLabelPosition;
30-
import com.github.mikephil.charting.utils.YLabels;
31-
import com.github.mikephil.charting.utils.YLabels.YLabelPosition;
3233
import com.xxmassdeveloper.mpchartexample.notimportant.DemoBase;
3334

3435
import java.util.ArrayList;
@@ -55,9 +56,6 @@ protected void onCreate(Bundle savedInstanceState) {
5556

5657
mChart = (BarChart) findViewById(R.id.chart1);
5758
mChart.setOnChartValueSelectedListener(this);
58-
59-
// enable the drawing of values
60-
mChart.setDrawYValues(true);
6159

6260
mChart.setDrawValueAboveBar(true);
6361

@@ -67,16 +65,11 @@ protected void onCreate(Bundle savedInstanceState) {
6765
// drawn
6866
mChart.setMaxVisibleValueCount(60);
6967

70-
// disable 3D
71-
mChart.set3DEnabled(false);
72-
7368
// scaling can now only be done on x- and y-axis separately
7469
mChart.setPinchZoom(false);
7570

7671
// draw shadows for each bar that show the maximum value
7772
// mChart.setDrawBarShadow(true);
78-
79-
mChart.setUnit(" €");
8073

8174
// mChart.setDrawXLabels(false);
8275

@@ -94,15 +87,15 @@ protected void onCreate(Bundle savedInstanceState) {
9487

9588
Typeface tf = Typeface.createFromAsset(getAssets(), "OpenSans-Regular.ttf");
9689

97-
XLabels xl = mChart.getXLabels();
90+
XAxis xl = mChart.getXAxis();
9891
xl.setPosition(XLabelPosition.BOTTOM);
9992
xl.setCenterXLabelText(true);
10093
xl.setTypeface(tf);
10194

102-
YLabels yl = mChart.getYLabels();
95+
YAxis yl = mChart.getAxisLeft();
10396
yl.setTypeface(tf);
10497
yl.setLabelCount(8);
105-
yl.setPosition(YLabelPosition.BOTH_SIDED);
98+
// yl.setPosition(YLabelPosition.BOTH_SIDED);
10699

107100
mChart.setValueTypeface(tf);
108101

@@ -134,18 +127,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
134127

135128
switch (item.getItemId()) {
136129
case R.id.actionToggleValues: {
137-
if (mChart.isDrawYValuesEnabled())
138-
mChart.setDrawYValues(false);
139-
else
140-
mChart.setDrawYValues(true);
141-
mChart.invalidate();
142-
break;
143-
}
144-
case R.id.actionToggle3D: {
145-
if (mChart.is3DEnabled())
146-
mChart.set3DEnabled(false);
147-
else
148-
mChart.set3DEnabled(true);
130+
for (DataSet<?> set : mChart.getData().getDataSets())
131+
set.setDrawValues(!set.isDrawValuesEnabled());
132+
149133
mChart.invalidate();
150134
break;
151135
}
@@ -197,7 +181,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
197181
break;
198182
}
199183
case R.id.actionToggleAdjustXLegend: {
200-
XLabels xLabels = mChart.getXLabels();
184+
XAxis xLabels = mChart.getXAxis();
201185

202186
if (xLabels.isAdjustXLabelsEnabled())
203187
xLabels.setAdjustXLabels(false);
@@ -288,7 +272,7 @@ public void onValueSelected(Entry e, int dataSetIndex) {
288272
return;
289273

290274
RectF bounds = mChart.getBarBounds((BarEntry) e);
291-
PointF position = mChart.getPosition(e);
275+
PointF position = mChart.getPosition(e, AxisDependency.LEFT);
292276

293277
Log.i("bounds", bounds.toString());
294278
Log.i("position", position.toString());

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

Lines changed: 14 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,17 @@
1313
import android.widget.TextView;
1414

1515
import com.github.mikephil.charting.charts.BarChart;
16+
import com.github.mikephil.charting.components.Legend;
17+
import com.github.mikephil.charting.components.Legend.LegendPosition;
18+
import com.github.mikephil.charting.components.XAxis;
19+
import com.github.mikephil.charting.components.YAxis;
1620
import com.github.mikephil.charting.data.BarData;
1721
import com.github.mikephil.charting.data.BarDataSet;
1822
import com.github.mikephil.charting.data.BarEntry;
23+
import com.github.mikephil.charting.data.DataSet;
1924
import com.github.mikephil.charting.data.Entry;
2025
import com.github.mikephil.charting.interfaces.OnChartValueSelectedListener;
2126
import com.github.mikephil.charting.utils.LargeValueFormatter;
22-
import com.github.mikephil.charting.utils.Legend;
23-
import com.github.mikephil.charting.utils.Legend.LegendPosition;
24-
import com.github.mikephil.charting.utils.XLabels;
25-
import com.github.mikephil.charting.utils.YLabels;
2627
import com.xxmassdeveloper.mpchartexample.notimportant.DemoBase;
2728

2829
import java.util.ArrayList;
@@ -52,9 +53,6 @@ protected void onCreate(Bundle savedInstanceState) {
5253
mChart = (BarChart) findViewById(R.id.chart1);
5354
mChart.setOnChartValueSelectedListener(this);
5455
mChart.setDescription("");
55-
56-
// disable the drawing of values
57-
mChart.setDrawYValues(false);
5856

5957
// scaling can now only be done on x- and y-axis separately
6058
mChart.setPinchZoom(false);
@@ -85,11 +83,11 @@ protected void onCreate(Bundle savedInstanceState) {
8583
l.setPosition(LegendPosition.RIGHT_OF_CHART_INSIDE);
8684
l.setTypeface(tf);
8785

88-
XLabels xl = mChart.getXLabels();
86+
XAxis xl = mChart.getXAxis();
8987
xl.setCenterXLabelText(true);
9088
xl.setTypeface(tf);
9189

92-
YLabels yl = mChart.getYLabels();
90+
YAxis yl = mChart.getAxisLeft();
9391
yl.setTypeface(tf);
9492
yl.setFormatter(new LargeValueFormatter());
9593

@@ -107,10 +105,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
107105

108106
switch (item.getItemId()) {
109107
case R.id.actionToggleValues: {
110-
if (mChart.isDrawYValuesEnabled())
111-
mChart.setDrawYValues(false);
112-
else
113-
mChart.setDrawYValues(true);
108+
for (DataSet<?> set : mChart.getData().getDataSets())
109+
set.setDrawValues(!set.isDrawValuesEnabled());
110+
114111
mChart.invalidate();
115112
break;
116113
}
@@ -123,14 +120,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
123120
mChart.invalidate();
124121
break;
125122
}
126-
case R.id.actionToggle3D: {
127-
if (mChart.is3DEnabled())
128-
mChart.set3DEnabled(false);
129-
else
130-
mChart.set3DEnabled(true);
131-
mChart.invalidate();
132-
break;
133-
}
134123
case R.id.actionToggleHighlight: {
135124
if (mChart.isHighlightEnabled())
136125
mChart.setHighlightEnabled(false);
@@ -157,12 +146,12 @@ public boolean onOptionsItemSelected(MenuItem item) {
157146
break;
158147
}
159148
case R.id.actionToggleAdjustXLegend: {
160-
XLabels xLabels = mChart.getXLabels();
149+
XAxis xAxis = mChart.getXAxis();
161150

162-
if (xLabels.isAdjustXLabelsEnabled())
163-
xLabels.setAdjustXLabels(false);
151+
if (xAxis.isAdjustXLabelsEnabled())
152+
xAxis.setAdjustXLabels(false);
164153
else
165-
xLabels.setAdjustXLabels(true);
154+
xAxis.setAdjustXLabels(true);
166155

167156
mChart.invalidate();
168157
break;

0 commit comments

Comments
 (0)