Skip to content

Commit 657567b

Browse files
committed
Minor changes.
1 parent be4ea0e commit 657567b

3 files changed

Lines changed: 4 additions & 40 deletions

File tree

MPChartExample/res/menu/combined.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,5 @@
99
android:id="@+id/actionToggleBarValues"
1010
android:title="Toggle bar Values">
1111
</item>
12-
<item
13-
android:id="@+id/actionToggleBarYDependency"
14-
android:title="Toggle bar Y Axis dependency">
15-
</item>
16-
<item
17-
android:id="@+id/actionToggleLineYDependency"
18-
android:title="Toggle line Y Axis dependency">
19-
</item>
2012

2113
</menu>

MPChartExample/src/com/xxmassdeveloper/mpchartexample/CombinedChartActivity.java

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ public class CombinedChartActivity extends DemoBase {
3232

3333
private CombinedChart mChart;
3434
private final int itemcount = 12;
35-
private final int maxYLeft = 40;
36-
private final int maxYRight = 60;
3735

3836
@Override
3937
protected void onCreate(Bundle savedInstanceState) {
@@ -48,11 +46,9 @@ protected void onCreate(Bundle savedInstanceState) {
4846

4947
YAxis rightAxis = mChart.getAxisRight();
5048
rightAxis.setDrawGridLines(false);
51-
rightAxis.setAxisMaxValue(maxYRight);
5249

5350
YAxis leftAxis = mChart.getAxisLeft();
5451
leftAxis.setDrawGridLines(false);
55-
leftAxis.setAxisMaxValue(maxYLeft);
5652

5753
XAxis xAxis = mChart.getXAxis();
5854
xAxis.setPosition(XAxisPosition.BOTH_SIDED);
@@ -74,9 +70,8 @@ private LineData generateLineData() {
7470

7571
ArrayList<Entry> entries = new ArrayList<Entry>();
7672

77-
int minValue = 5;
7873
for (int index = 0; index < itemcount; index++)
79-
entries.add(new Entry(getRandom(maxYLeft - minValue, minValue), index));
74+
entries.add(new Entry(getRandom(15, 10), index));
8075

8176
LineDataSet set = new LineDataSet(entries, "Line DataSet");
8277
set.setColor(Color.rgb(240, 238, 70));
@@ -100,15 +95,14 @@ private BarData generateBarData() {
10095

10196
ArrayList<BarEntry> entries = new ArrayList<BarEntry>();
10297

103-
int minValue = 20;
10498
for (int index = 0; index < itemcount; index++)
105-
entries.add(new BarEntry(getRandom(maxYRight - minValue, minValue), index));
99+
entries.add(new BarEntry(getRandom(15, 30), index));
106100

107101
BarDataSet set = new BarDataSet(entries, "Bar DataSet");
108102
set.setColor(Color.rgb(60, 220, 78));
109103
d.addDataSet(set);
110104

111-
set.setAxisDependency(YAxis.AxisDependency.RIGHT);
105+
set.setAxisDependency(YAxis.AxisDependency.LEFT);
112106

113107
return d;
114108
}
@@ -177,28 +171,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
177171
set.setDrawValues(!set.isDrawValuesEnabled());
178172
}
179173

180-
mChart.invalidate();
181-
break;
182-
}
183-
case R.id.actionToggleBarYDependency: {
184-
for (DataSet<?> set : mChart.getData().getDataSets()) {
185-
if(set instanceof BarDataSet) {
186-
YAxis.AxisDependency newAxisDependency = set.getAxisDependency().equals(YAxis.AxisDependency.LEFT) ? YAxis.AxisDependency.RIGHT : YAxis.AxisDependency.LEFT;
187-
set.setAxisDependency(newAxisDependency);
188-
}
189-
}
190-
191-
mChart.invalidate();
192-
break;
193-
}
194-
case R.id.actionToggleLineYDependency: {
195-
for (DataSet<?> set : mChart.getData().getDataSets()) {
196-
if(set instanceof LineDataSet) {
197-
YAxis.AxisDependency newAxisDependency = set.getAxisDependency().equals(YAxis.AxisDependency.LEFT) ? YAxis.AxisDependency.RIGHT : YAxis.AxisDependency.LEFT;
198-
set.setAxisDependency(newAxisDependency);
199-
}
200-
}
201-
202174
mChart.invalidate();
203175
break;
204176
}

MPChartLib/src/com/github/mikephil/charting/charts/Chart.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public abstract class Chart<T extends ChartData<? extends DataSet<? extends Entr
6262
public static final String LOG_TAG = "MPAndroidChart";
6363

6464
/** flag that indicates if logging is enabled or not */
65-
protected boolean mLogEnabled = true;
65+
protected boolean mLogEnabled = false;
6666

6767
/**
6868
* object that holds all data that was originally set for the chart, before

0 commit comments

Comments
 (0)