Skip to content

Commit 98e090c

Browse files
PhilJayPhilJay
committed
Minor example adjustments
1 parent 3b0be74 commit 98e090c

4 files changed

Lines changed: 28 additions & 32 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ private void moveOffScreen() {
124124
Display display = getWindowManager().getDefaultDisplay();
125125
int height = display.getHeight(); // deprecated
126126

127-
int offset = (int)(height * 0.65); /* or whatever */
127+
int offset = (int)(height * 0.65); /* percent to move */
128128

129129
RelativeLayout.LayoutParams rlParams =
130130
(RelativeLayout.LayoutParams)mChart.getLayoutParams();

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ protected void onCreate(Bundle savedInstanceState) {
9090
// add a selection listener
9191
mChart.setOnChartValueSelectedListener(this);
9292

93-
setData(3, 100);
93+
setData(4, 100);
9494

9595
mChart.animateY(1400, Easing.EasingOption.EaseInOutQuad);
9696
// mChart.spin(2000, 0, 360);
@@ -179,7 +179,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
179179
@Override
180180
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
181181

182-
tvX.setText("" + (mSeekBarX.getProgress() + 1));
182+
tvX.setText("" + (mSeekBarX.getProgress()));
183183
tvY.setText("" + (mSeekBarY.getProgress()));
184184

185185
setData(mSeekBarX.getProgress(), mSeekBarY.getProgress());
@@ -189,16 +189,15 @@ private void setData(int count, float range) {
189189

190190
float mult = range;
191191

192-
ArrayList<PieEntry> values = new ArrayList<PieEntry>();
192+
ArrayList<PieEntry> entries = new ArrayList<PieEntry>();
193193

194-
// IMPORTANT: In a PieChart, no values (Entry) should have the same
195-
// xIndex (even if from different DataSets), since no values can be
196-
// drawn above each other.
197-
for (int i = 0; i < count + 1; i++) {
198-
values.add(new PieEntry((float) ((Math.random() * mult) + mult / 5), mParties[i % mParties.length]));
194+
// NOTE: The order of the entries when being added to the entries array determines their position around the center of
195+
// the chart.
196+
for (int i = 0; i < count ; i++) {
197+
entries.add(new PieEntry((float) ((Math.random() * mult) + mult / 5), mParties[i % mParties.length]));
199198
}
200199

201-
PieDataSet dataSet = new PieDataSet(values, "Election Results");
200+
PieDataSet dataSet = new PieDataSet(entries, "Election Results");
202201
dataSet.setSliceSpace(3f);
203202
dataSet.setSelectionShift(5f);
204203

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ protected void onCreate(Bundle savedInstanceState) {
9696
// add a selection listener
9797
mChart.setOnChartValueSelectedListener(this);
9898

99-
setData(3, 100);
99+
setData(4, 100);
100100

101101
mChart.animateY(1400, Easing.EasingOption.EaseInOutQuad);
102102
// mChart.spin(2000, 0, 360);
@@ -173,7 +173,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
173173
@Override
174174
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
175175

176-
tvX.setText("" + (mSeekBarX.getProgress() + 1));
176+
tvX.setText("" + (mSeekBarX.getProgress()));
177177
tvY.setText("" + (mSeekBarY.getProgress()));
178178

179179
setData(mSeekBarX.getProgress(), mSeekBarY.getProgress());
@@ -183,16 +183,15 @@ private void setData(int count, float range) {
183183

184184
float mult = range;
185185

186-
ArrayList<PieEntry> yVals1 = new ArrayList<PieEntry>();
186+
ArrayList<PieEntry> entries = new ArrayList<PieEntry>();
187187

188-
// IMPORTANT: In a PieChart, no values (Entry) should have the same
189-
// xIndex (even if from different DataSets), since no values can be
190-
// drawn above each other.
191-
for (int i = 0; i < count + 1; i++) {
192-
yVals1.add(new PieEntry((float) (Math.random() * mult) + mult / 5, mParties[i % mParties.length]));
188+
// NOTE: The order of the entries when being added to the entries array determines their position around the center of
189+
// the chart.
190+
for (int i = 0; i < count; i++) {
191+
entries.add(new PieEntry((float) (Math.random() * mult) + mult / 5, mParties[i % mParties.length]));
193192
}
194193

195-
PieDataSet dataSet = new PieDataSet(yVals1, "Election Results");
194+
PieDataSet dataSet = new PieDataSet(entries, "Election Results");
196195
dataSet.setSliceSpace(3f);
197196
dataSet.setSelectionShift(5f);
198197

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

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ protected void onCreate(Bundle savedInstanceState) {
7777
xAxis.setValueFormatter(new AxisValueFormatter() {
7878

7979
private String[] mActivities = new String[]{"Burger", "Steak", "Salad", "Pasta", "Pizza"};
80+
8081
@Override
8182
public String getFormattedValue(float value, AxisBase axis) {
8283
return mActivities[(int) value % mActivities.length];
@@ -210,23 +211,20 @@ public void setData() {
210211
float min = 20;
211212
int cnt = 5;
212213

213-
ArrayList<RadarEntry> yVals1 = new ArrayList<RadarEntry>();
214-
ArrayList<RadarEntry> yVals2 = new ArrayList<RadarEntry>();
214+
ArrayList<RadarEntry> entries1 = new ArrayList<RadarEntry>();
215+
ArrayList<RadarEntry> entries2 = new ArrayList<RadarEntry>();
215216

216-
// IMPORTANT: In a PieChart, no values (Entry) should have the same
217-
// xIndex (even if from different DataSets), since no values can be
218-
// drawn above each other.
217+
// NOTE: The order of the entries when being added to the entries array determines their position around the center of
218+
// the chart.
219219
for (int i = 0; i < cnt; i++) {
220-
float val = (float) (Math.random() * mult) + min;
221-
yVals1.add(new RadarEntry(val));
222-
}
220+
float val1 = (float) (Math.random() * mult) + min;
221+
entries1.add(new RadarEntry(val1));
223222

224-
for (int i = 0; i < cnt; i++) {
225-
float val = (float) (Math.random() * mult) + min;
226-
yVals2.add(new RadarEntry(val));
223+
float val2 = (float) (Math.random() * mult) + min;
224+
entries2.add(new RadarEntry(val2));
227225
}
228226

229-
RadarDataSet set1 = new RadarDataSet(yVals1, "Last Week");
227+
RadarDataSet set1 = new RadarDataSet(entries1, "Last Week");
230228
set1.setColor(Color.rgb(103, 110, 129));
231229
set1.setFillColor(Color.rgb(103, 110, 129));
232230
set1.setDrawFilled(true);
@@ -235,7 +233,7 @@ public void setData() {
235233
set1.setDrawHighlightCircleEnabled(true);
236234
set1.setDrawHighlightIndicators(false);
237235

238-
RadarDataSet set2 = new RadarDataSet(yVals2, "This Week");
236+
RadarDataSet set2 = new RadarDataSet(entries2, "This Week");
239237
set2.setColor(Color.rgb(121, 162, 175));
240238
set2.setFillColor(Color.rgb(121, 162, 175));
241239
set2.setDrawFilled(true);

0 commit comments

Comments
 (0)