Improvements to example
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivity.java
index 448b0f8..410ffbd 100644
--- a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivity.java
+++ b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/BarChartActivity.java
@@ -224,7 +224,7 @@
private void setData(int count, float range) {
- float start = 1f;
+ float start = 0f;
mChart.getXAxis().setAxisMinValue(start);
mChart.getXAxis().setAxisMaxValue(start + count + 2);
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/ScrollViewActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/ScrollViewActivity.java
index f04d843..617a25b 100644
--- a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/ScrollViewActivity.java
+++ b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/ScrollViewActivity.java
@@ -45,6 +45,7 @@
mChart.getLegend().setEnabled(false);
setData(10);
+ mChart.setFitBars(true);
}
private void setData(int count) {
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/StackedBarActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/StackedBarActivity.java
index 24038ac..ae17135 100644
--- a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/StackedBarActivity.java
+++ b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/StackedBarActivity.java
@@ -210,6 +210,7 @@
mChart.setData(data);
}
+ mChart.setFitBars(true);
mChart.invalidate();
}
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/DayAxisValueFormatter.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/DayAxisValueFormatter.java
index 4299f48..11e411a 100644
--- a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/DayAxisValueFormatter.java
+++ b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/DayAxisValueFormatter.java
@@ -26,9 +26,6 @@
int days = (int) value;
- if (days == 0)
- return "";
-
int year = determineYear(days);
int month = determineMonth(days);
@@ -72,7 +69,7 @@
break;
}
- return dayOfMonth + appendix + " " + monthName;
+ return dayOfMonth == 0 ? "" : dayOfMonth + appendix + " " + monthName;
}
}
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/fragments/ComplexityFragment.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/fragments/ComplexityFragment.java
index 8213f4f..98b904b 100644
--- a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/fragments/ComplexityFragment.java
+++ b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/fragments/ComplexityFragment.java
@@ -41,7 +41,6 @@
YAxis leftAxis = mChart.getAxisLeft();
leftAxis.setTypeface(tf);
- leftAxis.setAxisMinValue(0f); // this replaces setStartAtZero(true)
mChart.getAxisRight().setEnabled(false);
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/fragments/SimpleFragment.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/fragments/SimpleFragment.java
index 2e837b1..3d4d989 100644
--- a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/fragments/SimpleFragment.java
+++ b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/fragments/SimpleFragment.java
@@ -54,7 +54,7 @@
// entries = FileUtils.loadEntriesFromAssets(getActivity().getAssets(), "stacked_bars.txt");
for(int j = 0; j < count; j++) {
- entries.add(new BarEntry((float) (Math.random() * range) + range / 4, j));
+ entries.add(new BarEntry(j, (float) (Math.random() * range) + range / 4));
}
BarDataSet ds = new BarDataSet(entries, getLabel(i));
@@ -78,7 +78,7 @@
ArrayList<Entry> entries = new ArrayList<Entry>();
for(int j = 0; j < count; j++) {
- entries.add(new Entry((float) (Math.random() * range) + range / 4, j));
+ entries.add(new Entry(j, (float) (Math.random() * range) + range / 4));
}
ScatterDataSet ds = new ScatterDataSet(entries, getLabel(i));
@@ -122,11 +122,6 @@
protected LineData generateLineData() {
-// DataSet ds1 = new DataSet(n, "O(n)");
-// DataSet ds2 = new DataSet(nlogn, "O(nlogn)");
-// DataSet ds3 = new DataSet(nsquare, "O(n\u00B2)");
-// DataSet ds4 = new DataSet(nthree, "O(n\u00B3)");
-
ArrayList<ILineDataSet> sets = new ArrayList<ILineDataSet>();
LineDataSet ds1 = new LineDataSet(FileUtils.loadEntriesFromAssets(getActivity().getAssets(), "sine.txt"), "Sine function");
@@ -145,13 +140,6 @@
sets.add(ds1);
sets.add(ds2);
-// sets.add(FileUtils.dataSetFromAssets(getActivity().getAssets(), "n.txt"));
-// sets.add(FileUtils.dataSetFromAssets(getActivity().getAssets(), "nlogn.txt"));
-// sets.add(FileUtils.dataSetFromAssets(getActivity().getAssets(), "square.txt"));
-// sets.add(FileUtils.dataSetFromAssets(getActivity().getAssets(), "three.txt"));
-
- int max = Math.max(sets.get(0).getEntryCount(), sets.get(1).getEntryCount());
-
LineData d = new LineData(sets);
d.setValueTypeface(tf);
return d;
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/FileUtils.java b/MPChartLib/src/main/java/com/github/mikephil/charting/utils/FileUtils.java
index dac8573..5aff51f 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/FileUtils.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/utils/FileUtils.java
@@ -122,7 +122,7 @@
String[] split = line.split("#");
if (split.length <= 2) {
- entries.add(new Entry(Float.parseFloat(split[0]), Integer.parseInt(split[1])));
+ entries.add(new Entry(Float.parseFloat(split[1]), Float.parseFloat(split[0])));
} else {
float[] vals = new float[split.length - 1];
